Add wxCONTROL_FLAT

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index a8f7da4d85531854aa9046cd27f8ab476608b2a0..682735ded024e66fcd0f0df53837a9c36d790332 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -35,9 +35,6 @@
 MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas"));
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
-
-%include _glcanvas_rename.i
-
 //---------------------------------------------------------------------------
 
 class wxPalette;
@@ -48,35 +45,12 @@ MustHaveApp(wxGLContext);
 
 class wxGLContext : public wxObject {
 public:
-#ifndef __WXMAC__  
-    wxGLContext(bool isRGB, wxGLCanvas *win,
-                const wxPalette& palette = wxNullPalette,
-                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(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();
 };
 
 //---------------------------------------------------------------------------
@@ -101,7 +75,7 @@ enum {
 };
 
 
-%typemap(in) int *attribList (int *temp) {
+%typemap(in) const int *attribList (int *temp) {
     int i;
     if (PySequence_Check($input)) {
         int size = PyObject_Length($input);
@@ -126,13 +100,24 @@ MustHaveApp(wxGLCanvas);
 class wxGLCanvas : public wxWindow {
 public:
     %pythonAppend wxGLCanvas   "self._setOORInfo(self)"
-    wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
+    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);
 
+    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,
@@ -142,22 +127,27 @@ public:
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
                     const wxString& name = wxPyGLCanvasNameStr,
-                    int *attribList = NULL,
+                    const int *attribList = NULL,
                     const wxPalette& palette = wxNullPalette ));
 
-
-    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`");
 };