wxUniversal STL-ification.

[wxWidgets.git] / wxPython / contrib / glcanvas / gtk / glcanvas.cpp

diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas.cpp b/wxPython/contrib/glcanvas/gtk/glcanvas.cpp
index aba8e8edbec8d3b3b66e20ad613961c940ce2474..1d077db43c3e2d1a969725ddcf3bb1b98bddc1bd 100644 (file)
--- a/wxPython/contrib/glcanvas/gtk/glcanvas.cpp
+++ b/wxPython/contrib/glcanvas/gtk/glcanvas.cpp
@@ -55,6 +55,11 @@ extern PyObject *SWIG_newvarlink(void);
 #define SWIG_name    "glcanvasc"
 
 #include "wxPython.h"
+
+#ifdef __WXMAC__  // avoid a bug in Carbon headers
+#define scalb scalbn
+#endif
+
 #ifdef __WXMSW__
 #include "myglcanvas.h"
 #else
@@ -939,9 +944,6 @@ SWIGEXPORT(void) initglcanvasc() {
         PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_ALPHA", PyInt_FromLong((long) WX_GL_MIN_ACCUM_ALPHA));
 
 
-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();
-
 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)