X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e4a197e4c60e461b8068b0619692ea083e30b8b..41b2b34b1b163a621bb3aa3bc702f5b37cd45749:/wxPython/contrib/glcanvas/glcanvas.i?ds=sidebyside

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index cdd8e7fbff..682735ded0 100644
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -11,75 +11,46 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-%module glcanvas
+%define DOCSTRING
+"`GLCanvas` provides an OpenGL Context on a `wx.Window`."
+%enddef
+
+%module(package="wx", docstring=DOCSTRING) glcanvas
 
 %{
-#include "wxPython.h"
-#ifdef __WXMSW__
-#include "myglcanvas.h"
-#else
+#include "wx/wxPython/wxPython.h"
+#include "wx/wxPython/pyclasses.h"
+
 #include <wx/glcanvas.h>
-#endif
 
 %}
 
 //---------------------------------------------------------------------------
 
-%include typemaps.i
-%include my_typemaps.i
-
-%extern wx.i
-%extern windows.i
-%extern windows2.i
-%extern windows3.i
-%extern frames.i
-%extern _defs.i
-%extern misc.i
-%extern gdi.i
-%extern controls.i
-%extern events.i
-
-
-%pragma(python) code = "import wx"
+%import core.i
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
 
-//----------------------------------------------------------------------
 
-%{
-    // Put some wx default wxChar* values into wxStrings.
-    static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas"));
-    static const wxString wxPyEmptyString(wxT(""));
-%}
+MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas"));
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
 //---------------------------------------------------------------------------
 
 class wxPalette;
-class wxWindow;
-class wxSize;
-class wxPoint;
-class wxGLCanvas;
 
 //---------------------------------------------------------------------------
 
+MustHaveApp(wxGLContext);
+
 class wxGLContext : public wxObject {
 public:
-#ifndef __WXMAC__  //  fix this?
-    wxGLContext(bool isRGB, wxGLCanvas *win,
-                const wxPalette& palette = wxNullPalette);
-#endif
+    wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL);
     ~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();
 };
 
 //---------------------------------------------------------------------------
@@ -104,36 +75,51 @@ enum {
 };
 
 
-%typemap(python, in) int *attribList (int *temp) {
+%typemap(in) const int *attribList (int *temp) {
     int i;
-    if (PySequence_Check($source)) {
-        int size = PyObject_Length($source);
+    if (PySequence_Check($input)) {
+        int size = PyObject_Length($input);
         temp = new int[size+1]; // (int*)malloc((size + 1) * sizeof(int));
         for (i = 0; i < size; i++) {
-            temp[i] = PyInt_AsLong(PySequence_GetItem($source, i));
+            temp[i] = PyInt_AsLong(PySequence_GetItem($input, i));
         }
         temp[size] = 0;
-        $target = temp;
+        $1 = temp;
     }
 }
 
-%typemap(python, freearg) int *attribList
+%typemap(freearg) int *attribList
 {
-    delete [] $source;
+    delete [] $1;
 }
 
 
 
+MustHaveApp(wxGLCanvas);
+
 class wxGLCanvas : public wxWindow {
 public:
-    wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
+    %pythonAppend wxGLCanvas   "self._setOORInfo(self)"
+    wxGLCanvas(wxWindow *parent,
+               wxWindowID id = -1,
+               const int *attribList = NULL,
                const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize, long style = 0,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
                const wxString& name = wxPyGLCanvasNameStr,
-               int *attribList = NULL,
                const wxPalette& palette = wxNullPalette);
 
-    %name(wxGLCanvasWithContext)
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxGLCanvasName,
+                const int *attribList = NULL,
+                const wxPalette& palette = wxNullPalette);
+    
+    %pythonAppend wxGLCanvas   "val._setOORInfo(val)"
+    %RenameCtor(GLCanvasWithContext, 
         wxGLCanvas( wxWindow *parent,
                     const wxGLContext *shared = NULL,
                     wxWindowID id = -1,
@@ -141,27 +127,27 @@ public:
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
                     const wxString& name = wxPyGLCanvasNameStr,
-                    int *attribList = NULL,
-                    const wxPalette& palette = wxNullPalette );
-
-//      bool Create(wxWindow *parent, wxWindowID id,
-//                  const wxPoint& pos, const wxSize& size, long style, const wxString& name);
+                    const int *attribList = NULL,
+                    const wxPalette& palette = wxNullPalette ));
 
-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
-    %pragma(python) addtomethod = "wxGLCanvasWithContext:val._setOORInfo(self)"
-
-    void SetCurrent();
+    %nokwargs SetCurrent;
+    void SetCurrent(const wxGLContext& context);
     void SetColour(const wxString& colour);
     void SwapBuffers();
 
+    // deprecated...
     wxGLContext* GetContext();
+    void SetCurrent();
 
+    
 #ifdef __WXMSW__
-    void SetupPixelFormat(int *attribList = NULL);
+//     void SetupPixelFormat(int *attribList = NULL);
     void SetupPalette(const wxPalette& palette);
     wxPalette CreateDefaultPalette();
     wxPalette* GetPalette();
 #endif
+
+    %property(Context, GetContext, doc="See `GetContext`");
 };
 
 
@@ -169,9 +155,6 @@ public:
 
 %init %{
 
-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();
-
 %}
 
 //---------------------------------------------------------------------------