For Python 2.2 builds

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index 049c8e9581a22471dc1426fb69ca029af924965f..d473e40801dd6d8590c2d2350f66d34804547d52 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -52,9 +52,12 @@ class wxGLCanvas;
 
 //---------------------------------------------------------------------------
 
-class wxGLContext {
+class wxGLContext : public wxObject {
 public:
-    wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);
+#ifndef __WXMAC__  //  fix this?
+    wxGLContext(bool isRGB, wxGLCanvas *win,
+                const wxPalette& palette = wxNullPalette);
+#endif
     ~wxGLContext();
 
     void SetCurrent();
@@ -93,7 +96,7 @@ public:
 
 
 
-class wxGLCanvas : public wxScrolledWindow {
+class wxGLCanvas : public wxWindow {
 public:
     wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxDefaultPosition,
@@ -102,13 +105,35 @@ public:
                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();
+
+#ifdef __WXMSW__
+    void SetupPixelFormat(int *attribList = NULL);
+    void SetupPalette(const wxPalette& palette);
+    wxPalette CreateDefaultPalette();
+    wxPalette* GetPalette();
+#endif
 };