wxMac's glcanvas doesn't have the new API changes yet...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index e399a9e7f3a2ba57f5431182f84a484a729a9f73..b792320539a66799a2b2cb1322c66b168077a881 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -60,7 +60,9 @@ public:
 #endif
     ~wxGLContext();
 
 #endif
     ~wxGLContext();
 

+#ifndef __WXMAC__  

     void SetCurrent(const wxGLCanvas& win);
     void SetCurrent(const wxGLCanvas& win);

+#endif

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -129,8 +131,11 @@ public:
                     int *attribList = NULL,
                     const wxPalette& palette = wxNullPalette ));
 
                     int *attribList = NULL,
                     const wxPalette& palette = wxNullPalette ));
 

-
+#ifdef __WXMAC__
+    void SetCurrent();
+#else

     void SetCurrent(const wxGLContext& RC);
     void SetCurrent(const wxGLContext& RC);

+#endif

     void SetColour(const wxString& colour);
     void SwapBuffers();
 
     void SetColour(const wxString& colour);
     void SwapBuffers();