Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adapt to wxGLCanvas changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-09-08 01:05:13 +00:00
parent 5039a2df01
commit 925430af06
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wxPython/contrib/glcanvas/glcanvas.i
View File

@@ -46,9 +46,7 @@ MustHaveApp(wxGLContext);
class wxGLContext : public wxObject { class wxGLContext : public wxObject {
public: public:
#ifndef __WXMAC__ #ifndef __WXMAC__
wxGLContext(bool isRGB, wxGLCanvas *win, wxGLContext(wxWindow *win, const wxGLContext* other = NULL);
const wxPalette& palette = wxNullPalette,
const wxGLContext* other = NULL);
#else #else
%extend { %extend {
wxGLContext(bool isRGB, wxGLCanvas *win, wxGLContext(bool isRGB, wxGLCanvas *win,
@@ -62,18 +60,7 @@ public:
#endif #endif
~wxGLContext(); ~wxGLContext();
void SetCurrent(); void SetCurrent(const wxGLCanvas& win);
void SetColour(const wxString& colour);
void SwapBuffers();
#ifdef __WXGTK__
void SetupPixelFormat();
void SetupPalette(const wxPalette& palette);
wxPalette CreateDefaultPalette();
wxPalette* GetPalette();
#endif
wxWindow* GetWindow();
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -143,7 +130,7 @@ public:
const wxPalette& palette = wxNullPalette )); const wxPalette& palette = wxNullPalette ));
void SetCurrent(); void SetCurrent(const wxGLContext& RC);
void SetColour(const wxString& colour); void SetColour(const wxString& colour);
void SwapBuffers(); void SwapBuffers();