Second phase of OOR completed. (Original python object return for

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index 247137b5a17b9afe21b375b2e73ee5a6dba74b26..ebb39d526a251032395f0a95967c563190982796 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,9 +52,10 @@ class wxGLCanvas;
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-class wxGLContext {
+class wxGLContext : public wxObject {

 public:
 public:

-    wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);
+    wxGLContext(bool isRGB, wxGLCanvas *win,
+                const wxPalette& palette = wxNullPalette);

     ~wxGLContext();
 
     void SetCurrent();
     ~wxGLContext();
 
     void SetCurrent();


@@ -99,19 +97,41 @@ public:
 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",
                int *attribList = NULL,
                const wxPalette& palette = wxNullPalette);
 
                const char* name = "GLCanvas",
                int *attribList = NULL,
                const wxPalette& palette = wxNullPalette);
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %name(wxGLCanvasWithContext)
+        wxGLCanvas( wxWindow *parent,
+                    const wxGLContext *shared = NULL,
+                    wxWindowID id = -1,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long style = 0,
+                    const char* name = "GLCanvas",
+                    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)"

 
     void SetCurrent();
     void SetColour(const char *colour);
     void SwapBuffers();
 
     wxGLContext* GetContext();
 
     void SetCurrent();
     void SetColour(const char *colour);
     void SwapBuffers();
 
     wxGLContext* GetContext();

+
+#ifdef __WXMSW__
+    void SetupPixelFormat(int *attribList = NULL);
+    void SetupPalette(const wxPalette& palette);
+    wxPalette CreateDefaultPalette();
+    wxPalette* GetPalette();
+#endif

 };
 
 
 };