Some refinements to my experimental RPM builder script and spec

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index bb5620d85725b8cb93ca23c34d3168a63e54d9fb..3b15de59f96d5dcf1dbf1c298fccc66673ce77d3 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -14,7 +14,7 @@
 %module glcanvas
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #ifdef __WXMSW__
 #include "myglcanvas.h"
 #else
@@ -42,6 +42,14 @@
 
 %pragma(python) code = "import wx"
 
+//----------------------------------------------------------------------
+
+%{
+    // Put some wx default wxChar* values into wxStrings.
+    static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas"));
+    static const wxString wxPyEmptyString(wxT(""));
+%}
+
 //---------------------------------------------------------------------------
 
 class wxPalette;
@@ -121,7 +129,7 @@ public:
     wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize, long style = 0,
-               const char* name = "GLCanvas",
+               const wxString& name = wxPyGLCanvasNameStr,
                int *attribList = NULL,
                const wxPalette& palette = wxNullPalette);
 
@@ -132,7 +140,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
-                    const char* name = "GLCanvas",
+                    const wxString& name = wxPyGLCanvasNameStr,
                     int *attribList = NULL,
                     const wxPalette& palette = wxNullPalette );