From: Robin Dunn <robin@alldunn.com>
Date: Mon, 16 Apr 2007 19:27:28 +0000 (+0000)
Subject: wxMac has wxGLContext.SetCurrent now
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e6c222e712c05d7cfb6a5337a68ec07522eacac8

wxMac has wxGLContext.SetCurrent now


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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index 682735ded0..4f1b7fcc7b 100644
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -48,9 +48,7 @@ public:
     wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL);
     ~wxGLContext();
 
-#ifndef __WXMAC__  
     void SetCurrent(const wxGLCanvas& win);
-#endif
 };
 
 //---------------------------------------------------------------------------
@@ -139,6 +137,17 @@ public:
     wxGLContext* GetContext();
     void SetCurrent();
 
+#ifdef __WXGTK__
+    bool InitVisual(const int *attribList);
+
+// What about these?    
+//     // return GLX version: 13 means 1.3 &c
+//     static int GetGLXVersion();
+
+//     // get the X11 handle of this window
+//     virtual Window GetXWindow() const = 0;
+    
+#endif
     
 #ifdef __WXMSW__
 //     void SetupPixelFormat(int *attribList = NULL);