correction for Mac OS compilation

[wxWidgets.git] / wxPython / contrib / glcanvas / glcanvas.i

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index 247137b5a17b9afe21b375b2e73ee5a6dba74b26..30be533da8d077b08b03c4f7a87048525545782d 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -14,8 +14,13 @@
 %module glcanvas
 
 %{
-#include "helpers.h"
+#include "export.h"
+#ifdef __WXMSW__
+#include "myglcanvas.h"
+#else
 #include <wx/glcanvas.h>
+#endif
+
 %}
 
 //---------------------------------------------------------------------------
@@ -35,14 +40,6 @@
 %extern events.i
 
 
-%{
-#if defined(__WXMSW__)
-    static wxString wxPyEmptyStr("");
-    static wxPoint  wxPyDefaultPosition(-1, -1);
-    static wxSize   wxPyDefaultSize(-1, -1);
-#endif
-%}
-
 %pragma(python) code = "import wx"
 
 //---------------------------------------------------------------------------
@@ -55,7 +52,7 @@ class wxGLCanvas;
 
 //---------------------------------------------------------------------------
 
-class wxGLContext {
+class wxGLContext : public wxObject {
 public:
     wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);
     ~wxGLContext();
@@ -99,8 +96,8 @@ public:
 class wxGLCanvas : public wxScrolledWindow {
 public:
     wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
-               const wxPoint& pos = wxPyDefaultPosition,
-               const wxSize& size = wxPyDefaultSize, long style = 0,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize, long style = 0,
                const char* name = "GLCanvas",
                int *attribList = NULL,
                const wxPalette& palette = wxNullPalette);