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

All platforms have the same GLCanvas API now

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-04-12 00:34:20 +00:00
parent 9c8d71beb8
commit b4aa9fec65
7 changed files with 787 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,19 +45,7 @@ MustHaveApp(wxGLContext);
class wxGLContext : public wxObject {
public:
#ifndef __WXMAC__
wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL);
#else
%extend {
wxGLContext(bool isRGB, wxGLCanvas *win,
const wxPalette& palette = wxNullPalette,
const wxGLContext* other = NULL) {
AGLPixelFormat fmt; // TODO: How should this be initialized?
return new wxGLContext(fmt, win, palette, other);
}
}
#endif
~wxGLContext();
#ifndef __WXMAC__
@@ -87,7 +75,7 @@ enum {
};
%typemap(in) int *attribList (int *temp) {
%typemap(in) const int *attribList (int *temp) {
int i;
if (PySequence_Check($input)) {
int size = PyObject_Length($input);
@@ -112,13 +100,24 @@ MustHaveApp(wxGLCanvas);
class wxGLCanvas : public wxWindow {
public:
%pythonAppend wxGLCanvas "self._setOORInfo(self)"
wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
wxGLCanvas(wxWindow *parent,
wxWindowID id = -1,
const int *attribList = NULL,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxPyGLCanvasNameStr,
int *attribList = NULL,
const wxPalette& palette = wxNullPalette);
bool Create(wxWindow *parent,
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxGLCanvasName,
const int *attribList = NULL,
const wxPalette& palette = wxNullPalette);
%pythonAppend wxGLCanvas "val._setOORInfo(val)"
%RenameCtor(GLCanvasWithContext,
wxGLCanvas( wxWindow *parent,
@@ -128,21 +127,21 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxPyGLCanvasNameStr,
int *attribList = NULL,
const int *attribList = NULL,
const wxPalette& palette = wxNullPalette ));
%nokwargs SetCurrent;
void SetCurrent();
#ifndef __WXMAC__
void SetCurrent(const wxGLContext& RC);
#endif
void SetCurrent(const wxGLContext& context);
void SetColour(const wxString& colour);
void SwapBuffers();
// deprecated...
wxGLContext* GetContext();
void SetCurrent();
#ifdef __WXMSW__
void SetupPixelFormat(int *attribList = NULL);
// void SetupPixelFormat(int *attribList = NULL);
void SetupPalette(const wxPalette& palette);
wxPalette CreateDefaultPalette();
wxPalette* GetPalette();