X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/089142a562148d69dbccfba669b66eff78a7f5b5..728f972bcef8d6b01f5f67cb77060d23098d8877:/wxPython/contrib/glcanvas/glcanvas.i?ds=sidebyside

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index 43fb6b8c57..a8f7da4d85 100644
--- 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"
@@ -24,7 +28,8 @@
 //---------------------------------------------------------------------------
 
 %import core.i
-%pythoncode { wx = core }
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
 
 
 MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas"));
@@ -39,6 +44,8 @@ class wxPalette;
 
 //---------------------------------------------------------------------------
 
+MustHaveApp(wxGLContext);
+
 class wxGLContext : public wxObject {
 public:
 #ifndef __WXMAC__  
@@ -114,9 +121,11 @@ enum {
 
 
 
+MustHaveApp(wxGLCanvas);
+
 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,
@@ -124,8 +133,8 @@ public:
                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,
@@ -134,7 +143,7 @@ public:
                     long style = 0,
                     const wxString& name = wxPyGLCanvasNameStr,
                     int *attribList = NULL,
-                    const wxPalette& palette = wxNullPalette );
+                    const wxPalette& palette = wxNullPalette ));
 
 
     void SetCurrent();