haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove wx-3.1 only constructor from HIDPI_GL_CANVAS wrapper.

This commit is contained in:
Bernhard Stegmaier 2017-12-17 22:50:15 +01:00 committed by Maciej Suminski
parent 0135d11412
commit 02d1b2611e
2 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/gal/hidpi_gl_canvas.cpp
View File

@ -27,19 +27,6 @@
#include <gal/hidpi_gl_canvas.h> #include <gal/hidpi_gl_canvas.h>
HIDPI_GL_CANVAS::HIDPI_GL_CANVAS( wxWindow *parent,
const wxGLAttributes& dispAttrs,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
const wxString& name,
const wxPalette& palette ) :
wxGLCanvas( parent, dispAttrs, id, pos, size, style, name, palette )
{
initialize();
}
HIDPI_GL_CANVAS::HIDPI_GL_CANVAS( wxWindow *parent, HIDPI_GL_CANVAS::HIDPI_GL_CANVAS( wxWindow *parent,
wxWindowID id, wxWindowID id,
const int *attribList, const int *attribList,
@ -50,7 +37,9 @@ HIDPI_GL_CANVAS::HIDPI_GL_CANVAS( wxWindow *parent,
const wxPalette& palette ) : const wxPalette& palette ) :
wxGLCanvas( parent, id, attribList, pos, size, style, name, palette ) wxGLCanvas( parent, id, attribList, pos, size, style, name, palette )
{ {
initialize(); #ifdef RETINA_OPENGL_PATCH
SetViewWantsBestResolution( true );
#endif
} }
@ -77,11 +66,3 @@ float HIDPI_GL_CANVAS::GetBackingScaleFactor() const
return 1.0f; return 1.0f;
#endif #endif
} }
void HIDPI_GL_CANVAS::initialize()
{
#ifdef RETINA_OPENGL_PATCH
SetViewWantsBestResolution( true );
#endif
}

17
include/gal/hidpi_gl_canvas.h
View File

@ -40,16 +40,6 @@
class HIDPI_GL_CANVAS : public wxGLCanvas class HIDPI_GL_CANVAS : public wxGLCanvas
{ {
public: public:
// wxGLCanvas constructor
HIDPI_GL_CANVAS( wxWindow *parent,
const wxGLAttributes& dispAttrs,
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxGLCanvasName,
const wxPalette& palette = wxNullPalette );
// wxGLCanvas constructor // wxGLCanvas constructor
HIDPI_GL_CANVAS( wxWindow *parent, HIDPI_GL_CANVAS( wxWindow *parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
@ -66,13 +56,6 @@ public:
// wxGLCanvas override (with patch applied) or default value of 1.0 // wxGLCanvas override (with patch applied) or default value of 1.0
virtual float GetBackingScaleFactor() const; virtual float GetBackingScaleFactor() const;
private:
/**
* @brief Common initialization
*/
void initialize();
}; };
#endif // HIDPI_GL_CANVAS_H #endif // HIDPI_GL_CANVAS_H