From 02d1b2611e2acc0ab25d2dd9ee08cd6e61438450 Mon Sep 17 00:00:00 2001
From: Bernhard Stegmaier <stegmaier@sw-systems.de>
Date: Sun, 17 Dec 2017 22:50:15 +0100
Subject: [PATCH] Remove wx-3.1 only constructor from HIDPI_GL_CANVAS wrapper.
---
common/gal/hidpi_gl_canvas.cpp | 25 +++----------------------
include/gal/hidpi_gl_canvas.h | 17 -----------------
2 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/common/gal/hidpi_gl_canvas.cpp b/common/gal/hidpi_gl_canvas.cpp
index 2714797799..b867c7cb0f 100644
--- a/common/gal/hidpi_gl_canvas.cpp
+++ b/common/gal/hidpi_gl_canvas.cpp
@@ -27,19 +27,6 @@
#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,
wxWindowID id,
const int *attribList,
@@ -50,7 +37,9 @@ HIDPI_GL_CANVAS::HIDPI_GL_CANVAS( wxWindow *parent,
const wxPalette& 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;
#endif
}
-
-
-void HIDPI_GL_CANVAS::initialize()
-{
-#ifdef RETINA_OPENGL_PATCH
- SetViewWantsBestResolution( true );
-#endif
-}
diff --git a/include/gal/hidpi_gl_canvas.h b/include/gal/hidpi_gl_canvas.h
index e740cc8fb6..21ad331506 100644
--- a/include/gal/hidpi_gl_canvas.h
+++ b/include/gal/hidpi_gl_canvas.h
@@ -40,16 +40,6 @@
class HIDPI_GL_CANVAS : public wxGLCanvas
{
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
HIDPI_GL_CANVAS( wxWindow *parent,
wxWindowID id = wxID_ANY,
@@ -66,13 +56,6 @@ public:
// wxGLCanvas override (with patch applied) or default value of 1.0
virtual float GetBackingScaleFactor() const;
-
-
-private:
- /**
- * @brief Common initialization
- */
- void initialize();
};
#endif // HIDPI_GL_CANVAS_H