X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/137b5242b1834999da2883c7a68fbde28c6fba37..71aba8333cc915afff9e740c944f7fa7247abacb:/wxPython/contrib/glcanvas/glcanvas.i

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index b51b3fb5f1..f1f23d3fad 100644
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -14,7 +14,12 @@
 %module glcanvas
 
 %{
-#include "export.h"
+#include "wxPython.h"
+
+#ifdef __WXMAC__  // avoid a bug in Carbon headers
+#define scalb scalbn
+#endif
+
 #ifdef __WXMSW__
 #include "myglcanvas.h"
 #else
@@ -69,7 +74,7 @@ public:
     ~wxGLContext();
 
     void SetCurrent();
-    void SetColour(const char *colour);
+    void SetColour(const wxString& colour);
     void SwapBuffers();
 
 #ifdef __WXGTK__
@@ -151,7 +156,7 @@ public:
     %pragma(python) addtomethod = "wxGLCanvasWithContext:val._setOORInfo(self)"
 
     void SetCurrent();
-    void SetColour(const char *colour);
+    void SetColour(const wxString& colour);
     void SwapBuffers();
 
     wxGLContext* GetContext();
@@ -169,9 +174,6 @@ public:
 
 %init %{
 
-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();
-
 %}
 
 //---------------------------------------------------------------------------