X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..365271b573e3d0ab7512471358f98a589f18c104:/wxPython/contrib/glcanvas/glcanvas.i

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index 826f0c071f..77d209a58e 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"
@@ -19,16 +23,17 @@
 
 #include <wx/glcanvas.h>
 
-    static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas"));
-    static const wxString wxPyEmptyString(wxT(""));
 %}
 
 //---------------------------------------------------------------------------
 
 %import core.i
-%pythoncode { wx = core }
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
+
 
-%include _glcanvas_rename.i
+MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas"));
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
 //---------------------------------------------------------------------------
 
@@ -36,12 +41,12 @@ class wxPalette;
 
 //---------------------------------------------------------------------------
 
+MustHaveApp(wxGLContext);
+
 class wxGLContext : public wxObject {
 public:
 #ifndef __WXMAC__  
-    wxGLContext(bool isRGB, wxGLCanvas *win,
-                const wxPalette& palette = wxNullPalette,
-                const wxGLContext* other = NULL);
+    wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL);
 #else
     %extend {
         wxGLContext(bool isRGB, wxGLCanvas *win,
@@ -55,18 +60,9 @@ public:
 #endif
     ~wxGLContext();
 
-    void SetCurrent();
-    void SetColour(const wxString& colour);
-    void SwapBuffers();
-
-#ifdef __WXGTK__
-    void SetupPixelFormat();
-    void SetupPalette(const wxPalette& palette);
-    wxPalette CreateDefaultPalette();
-    wxPalette* GetPalette();
+#ifndef __WXMAC__  
+    void SetCurrent(const wxGLCanvas& win);
 #endif
-
-    wxWindow* GetWindow();
 };
 
 //---------------------------------------------------------------------------
@@ -111,9 +107,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,
@@ -121,8 +119,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,
@@ -131,10 +129,13 @@ public:
                     long style = 0,
                     const wxString& name = wxPyGLCanvasNameStr,
                     int *attribList = NULL,
-                    const wxPalette& palette = wxNullPalette );
-
+                    const wxPalette& palette = wxNullPalette ));
 
+    %nokwargs SetCurrent;
     void SetCurrent();
+#ifndef __WXMAC__
+    void SetCurrent(const wxGLContext& RC);
+#endif
     void SetColour(const wxString& colour);
     void SwapBuffers();
 
@@ -146,6 +147,8 @@ public:
     wxPalette CreateDefaultPalette();
     wxPalette* GetPalette();
 #endif
+
+    %property(Context, GetContext, doc="See `GetContext`");
 };