No need to use wxPyMake_wxObject for wxImageList. There are no

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index cdd8e7fbff1da96ebd1ad95cfbdfbaa4ad320c25..1cdf22827693e3910047c7e5249eccdfa77f1c2b 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -11,75 +11,58 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

-%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>
 #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
+%import core.i
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }

 
 
 
 

-%pragma(python) code = "import wx"
-
-//----------------------------------------------------------------------
-
-%{
-    // 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 wxPalette;

-class wxWindow;
-class wxSize;
-class wxPoint;
-class wxGLCanvas;

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+MustHaveApp(wxGLContext);
+

 class wxGLContext : public wxObject {
 public:
 class wxGLContext : public wxObject {
 public:

-#ifndef __WXMAC__  //  fix this?
-    wxGLContext(bool isRGB, wxGLCanvas *win,
-                const wxPalette& palette = wxNullPalette);
+#ifndef __WXMAC__  
+    wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL);
+#else
+    %extend {
+        wxGLContext(bool isRGB, wxGLCanvas *win,
+                    const wxPalette& palette = wxNullPalette,
+                    const wxGLContext* other = NULL) {
+            AGLPixelFormat fmt;  // TODO: How should this be initialized?
+            return new wxGLContext(fmt, win, palette, other);
+        }
+    }
+

 #endif
     ~wxGLContext();
 
 #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
 #endif

-
-    wxWindow* GetWindow();

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -104,28 +87,31 @@ enum {
 };
 
 
 };
 
 

-%typemap(python, in) int *attribList (int *temp) {
+%typemap(in) int *attribList (int *temp) {

     int i;
     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 = 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;
         }
         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:
 class wxGLCanvas : public wxWindow {
 public:

+    %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,


@@ -133,7 +119,8 @@ public:
                int *attribList = NULL,
                const wxPalette& palette = wxNullPalette);
 
                int *attribList = NULL,
                const wxPalette& palette = wxNullPalette);
 

-    %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,


@@ -142,15 +129,13 @@ 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 );
-
-//      bool Create(wxWindow *parent, wxWindowID id,
-//                  const wxPoint& pos, const wxSize& size, long style, const wxString& name);
-
-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
-    %pragma(python) addtomethod = "wxGLCanvasWithContext:val._setOORInfo(self)"
+                    const wxPalette& palette = wxNullPalette ));

 
 

+#ifdef __WXMAC__

     void SetCurrent();
     void SetCurrent();

+#else
+    void SetCurrent(const wxGLContext& RC);
+#endif

     void SetColour(const wxString& colour);
     void SwapBuffers();
 
     void SetColour(const wxString& colour);
     void SwapBuffers();
 


@@ -162,6 +147,8 @@ public:
     wxPalette CreateDefaultPalette();
     wxPalette* GetPalette();
 #endif
     wxPalette CreateDefaultPalette();
     wxPalette* GetPalette();
 #endif

+
+    %property(Context, GetContext, doc="See `GetContext`");

 };
 
 
 };
 
 


@@ -169,9 +156,6 @@ public:
 
 %init %{
 
 
 %init %{
 

-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();
-

 %}
 
 //---------------------------------------------------------------------------
 %}
 
 //---------------------------------------------------------------------------