default style for statusbars varies by platform

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index 826f0c071f2416c26db5336214b722eb8f81694e..6f6f3708fa4651dbd6d17f6248769c62fafaf8b6 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -19,8 +19,6 @@
 
 #include <wx/glcanvas.h>
 
 
 #include <wx/glcanvas.h>
 

-    static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas"));
-    static const wxString wxPyEmptyString(wxT(""));

 %}
 
 //---------------------------------------------------------------------------
 %}
 
 //---------------------------------------------------------------------------


@@ -28,6 +26,11 @@
 %import core.i
 %pythoncode { wx = core }
 
 %import core.i
 %pythoncode { wx = core }
 

+
+MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas"));
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+
+

 %include _glcanvas_rename.i
 
 //---------------------------------------------------------------------------
 %include _glcanvas_rename.i
 
 //---------------------------------------------------------------------------


@@ -113,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,


@@ -121,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,