No need to use wxPyMake_wxObject for wxImageList. There are no

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index e399a9e7f3a2ba57f5431182f84a484a729a9f73..1cdf22827693e3910047c7e5249eccdfa77f1c2b 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -46,7 +46,7 @@ MustHaveApp(wxGLContext);
 class wxGLContext : public wxObject {
 public:
 #ifndef __WXMAC__  
-    wxGLContext(wxWindow *win, const wxGLContext* other = NULL);
+    wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL);
 #else
     %extend {
         wxGLContext(bool isRGB, wxGLCanvas *win,
@@ -60,7 +60,9 @@ public:
 #endif
     ~wxGLContext();
 
+#ifndef __WXMAC__  
     void SetCurrent(const wxGLCanvas& win);
+#endif
 };
 
 //---------------------------------------------------------------------------
@@ -129,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();
 
@@ -142,6 +147,8 @@ public:
     wxPalette CreateDefaultPalette();
     wxPalette* GetPalette();
 #endif
+
+    %property(Context, GetContext, doc="See `GetContext`");
 };