Remove ShowHidden property, it conflicts with the ShowHidden method

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index f538920e02fa42bdf1bd18f73ff4ed8aadc1df36..1cdf22827693e3910047c7e5249eccdfa77f1c2b 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -46,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,
@@ -62,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();
 };
 
 //---------------------------------------------------------------------------
@@ -142,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();
 
@@ -155,6 +147,8 @@ public:
     wxPalette CreateDefaultPalette();
     wxPalette* GetPalette();
 #endif
+
+    %property(Context, GetContext, doc="See `GetContext`");
 };