corrected CodeWarrior project target names and generated application names

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index b4d789ab94e08da15522d9f823b6308dd37753f3..30be533da8d077b08b03c4f7a87048525545782d 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -14,8 +14,13 @@
 %module glcanvas
 
 %{
 %module glcanvas
 
 %{

-#include "helpers.h"
+#include "export.h"
+#ifdef __WXMSW__
+#include "myglcanvas.h"
+#else

 #include <wx/glcanvas.h>
 #include <wx/glcanvas.h>

+#endif
+

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


@@ -35,14 +40,6 @@
 %extern events.i
 
 
 %extern events.i
 
 

-%{
-#if defined(__WXMSW__)
-    static wxString wxPyEmptyStr("");
-    static wxPoint  wxPyDefaultPosition(-1, -1);
-    static wxSize   wxPyDefaultSize(-1, -1);
-#endif
-%}
-

 %pragma(python) code = "import wx"
 
 //---------------------------------------------------------------------------
 %pragma(python) code = "import wx"
 
 //---------------------------------------------------------------------------


@@ -55,7 +52,7 @@ class wxGLCanvas;
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-class wxGLContext {
+class wxGLContext : public wxObject {

 public:
     wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);
     ~wxGLContext();
 public:
     wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);
     ~wxGLContext();


@@ -76,13 +73,33 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+%typemap(python, in) int *attribList (int *temp) {
+    int i;
+    if (PySequence_Check($source)) {
+        int size = PyObject_Length($source);
+        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[size] = 0;
+        $target = temp;
+    }
+}
+
+%typemap(python, freearg) int *attribList
+{
+    delete [] $source;
+}
+
+
+

 class wxGLCanvas : public wxScrolledWindow {
 public:
     wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
 class wxGLCanvas : public wxScrolledWindow {
 public:
     wxGLCanvas(wxWindow *parent, wxWindowID id = -1,

-               const wxPoint& pos = wxPyDefaultPosition,
-               const wxSize& size = wxPyDefaultSize, long style = 0,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize, long style = 0,

                const char* name = "GLCanvas",
                const char* name = "GLCanvas",

-               int *attribList = 0,
+               int *attribList = NULL,

                const wxPalette& palette = wxNullPalette);
 
     %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
                const wxPalette& palette = wxNullPalette);
 
     %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"