fixed paste error

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index 2698732dbd039ad9a4ed60582a51f94adb86a7a9..a8f7da4d85531854aa9046cd27f8ab476608b2a0 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -11,7 +11,11 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

-%module glcanvas
+%define DOCSTRING
+"`GLCanvas` provides an OpenGL Context on a `wx.Window`."
+%enddef
+
+%module(package="wx", docstring=DOCSTRING) glcanvas

 
 %{
 #include "wx/wxPython/wxPython.h"
 
 %{
 #include "wx/wxPython/wxPython.h"


@@ -24,10 +28,11 @@
 //---------------------------------------------------------------------------
 
 %import core.i
 //---------------------------------------------------------------------------
 
 %import core.i

-%pythoncode { wx = core }
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }

 
 
 
 

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

 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
 
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
 


@@ -39,6 +44,8 @@ class wxPalette;
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+MustHaveApp(wxGLContext);
+

 class wxGLContext : public wxObject {
 public:
 #ifndef __WXMAC__  
 class wxGLContext : public wxObject {
 public:
 #ifndef __WXMAC__  


@@ -114,9 +121,11 @@ enum {
 
 
 
 
 
 

+MustHaveApp(wxGLCanvas);
+

 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 +133,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)"
+    %RenameCtor(GLCanvasWithContext, 

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


@@ -134,7 +143,7 @@ public:
                     long style = 0,
                     const wxString& name = wxPyGLCanvasNameStr,
                     int *attribList = NULL,
                     long style = 0,
                     const wxString& name = wxPyGLCanvasNameStr,
                     int *attribList = NULL,

-                    const wxPalette& palette = wxNullPalette );
+                    const wxPalette& palette = wxNullPalette ));

 
 
     void SetCurrent();
 
 
     void SetCurrent();