reSWIGged

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index a8f7da4d85531854aa9046cd27f8ab476608b2a0..56d111e7da5f859ddbcedac8ec040a624217f1fe 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;
@@ -49,9 +46,7 @@ MustHaveApp(wxGLContext);
 class wxGLContext : public wxObject {
 public:
 #ifndef __WXMAC__  
-    wxGLContext(bool isRGB, wxGLCanvas *win,
-                const wxPalette& palette = wxNullPalette,
-                const wxGLContext* other = NULL);
+    wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL);
 #else
     %extend {
         wxGLContext(bool isRGB, wxGLCanvas *win,
@@ -65,18 +60,9 @@ public:
 #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
-
-    wxWindow* GetWindow();
 };
 
 //---------------------------------------------------------------------------
@@ -145,8 +131,11 @@ public:
                     int *attribList = NULL,
                     const wxPalette& palette = wxNullPalette ));
 
-
+#ifdef __WXMAC__
     void SetCurrent();
+#else
+    void SetCurrent(const wxGLContext& RC);
+#endif
     void SetColour(const wxString& colour);
     void SwapBuffers();