Some ifdef's to correct compile problems on wxMac

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index 2698732dbd039ad9a4ed60582a51f94adb86a7a9..6f6f3708fa4651dbd6d17f6248769c62fafaf8b6 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -27,7 +27,7 @@
 %pythoncode { wx = core }
 
 
 %pythoncode { wx = core }
 
 

-MAKE_CONST_WXSTRING2(GLCanvasNameStr, "GLCanvas");
+MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas"));

 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
 
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
 


@@ -116,7 +116,7 @@ enum {
 
 class wxGLCanvas : public wxWindow {
 public:
 
 class wxGLCanvas : public wxWindow {
 public:

-    %addtofunc wxGLCanvas   "self._setOORInfo(self)"
+    %pythonAppend wxGLCanvas   "self._setOORInfo(self)"

     wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize, long style = 0,
     wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize, long style = 0,


@@ -124,8 +124,8 @@ public:
                int *attribList = NULL,
                const wxPalette& palette = wxNullPalette);
 
                int *attribList = NULL,
                const wxPalette& palette = wxNullPalette);
 

-    %addtofunc wxGLCanvas   "val._setOORInfo(val)"
-    %name(wxGLCanvasWithContext)
+    %pythonAppend wxGLCanvas   "val._setOORInfo(val)"
+    %name(GLCanvasWithContext)

         wxGLCanvas( wxWindow *parent,
                     const wxGLContext *shared = NULL,
                     wxWindowID id = -1,
         wxGLCanvas( wxWindow *parent,
                     const wxGLContext *shared = NULL,
                     wxWindowID id = -1,