X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e508a2b616e077bf6c9b668b9f8034e1fbd59c4f..962162620ff8b78f4d25c7f4ccec88ce071dfb2b:/wxPython/contrib/glcanvas/glcanvas.i diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i index dfd9ed4c8d..6f6f3708fa 100644 --- a/wxPython/contrib/glcanvas/glcanvas.i +++ b/wxPython/contrib/glcanvas/glcanvas.i @@ -14,46 +14,52 @@ %module glcanvas %{ -#include "export.h" +#include "wx/wxPython/wxPython.h" +#include "wx/wxPython/pyclasses.h" + #include + %} //--------------------------------------------------------------------------- -%include typemaps.i -%include my_typemaps.i +%import core.i +%pythoncode { wx = core } + -%extern wx.i -%extern windows.i -%extern windows2.i -%extern windows3.i -%extern frames.i -%extern _defs.i -%extern misc.i -%extern gdi.i -%extern controls.i -%extern events.i +MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas")); +MAKE_CONST_WXSTRING_NOSWIG(EmptyString); -%pragma(python) code = "import wx" +%include _glcanvas_rename.i //--------------------------------------------------------------------------- class wxPalette; -class wxWindow; -class wxSize; -class wxPoint; -class wxGLCanvas; //--------------------------------------------------------------------------- -class wxGLContext { +class wxGLContext : public wxObject { public: - wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette); +#ifndef __WXMAC__ + wxGLContext(bool isRGB, wxGLCanvas *win, + const wxPalette& palette = wxNullPalette, + 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(); void SetCurrent(); - void SetColour(const char *colour); + void SetColour(const wxString& colour); void SwapBuffers(); #ifdef __WXGTK__ @@ -68,42 +74,81 @@ public: //--------------------------------------------------------------------------- -%typemap(python, in) int *attribList (int *temp) { +enum { + WX_GL_RGBA, // use true color palette + WX_GL_BUFFER_SIZE, // bits for buffer if not WX_GL_RGBA + WX_GL_LEVEL, // 0 for main buffer, >0 for overlay, <0 for underlay + WX_GL_DOUBLEBUFFER, // use doublebuffer + WX_GL_STEREO, // use stereoscopic display + WX_GL_AUX_BUFFERS, // number of auxiliary buffers + WX_GL_MIN_RED, // use red buffer with most bits (> MIN_RED bits) + WX_GL_MIN_GREEN, // use green buffer with most bits (> MIN_GREEN bits) + WX_GL_MIN_BLUE, // use blue buffer with most bits (> MIN_BLUE bits) + WX_GL_MIN_ALPHA, // use blue buffer with most bits (> MIN_ALPHA bits) + WX_GL_DEPTH_SIZE, // bits for Z-buffer (0,16,32) + WX_GL_STENCIL_SIZE, // bits for stencil buffer + WX_GL_MIN_ACCUM_RED, // use red accum buffer with most bits (> MIN_ACCUM_RED bits) + WX_GL_MIN_ACCUM_GREEN, // use green buffer with most bits (> MIN_ACCUM_GREEN bits) + WX_GL_MIN_ACCUM_BLUE, // use blue buffer with most bits (> MIN_ACCUM_BLUE bits) + WX_GL_MIN_ACCUM_ALPHA // use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) +}; + + +%typemap(in) int *attribList (int *temp) { int i; - if (PySequence_Check($source)) { - int size = PyObject_Length($source); + if (PySequence_Check($input)) { + int size = PyObject_Length($input); temp = new int[size+1]; // (int*)malloc((size + 1) * sizeof(int)); for (i = 0; i < size; i++) { - temp[i] = PyInt_AsLong(PySequence_GetItem($source, i)); + temp[i] = PyInt_AsLong(PySequence_GetItem($input, i)); } temp[size] = 0; - $target = temp; + $1 = temp; } } -%typemap(python, freearg) int *attribList +%typemap(freearg) int *attribList { - delete [] $source; + delete [] $1; } -class wxGLCanvas : public wxScrolledWindow { +class wxGLCanvas : public wxWindow { public: + %pythonAppend wxGLCanvas "self._setOORInfo(self)" wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const char* name = "GLCanvas", + const wxString& name = wxPyGLCanvasNameStr, int *attribList = NULL, const wxPalette& palette = wxNullPalette); - %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)" + %pythonAppend wxGLCanvas "val._setOORInfo(val)" + %name(GLCanvasWithContext) + wxGLCanvas( wxWindow *parent, + const wxGLContext *shared = NULL, + wxWindowID id = -1, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxPyGLCanvasNameStr, + int *attribList = NULL, + const wxPalette& palette = wxNullPalette ); + void SetCurrent(); - void SetColour(const char *colour); + void SetColour(const wxString& colour); void SwapBuffers(); wxGLContext* GetContext(); + +#ifdef __WXMSW__ + void SetupPixelFormat(int *attribList = NULL); + void SetupPalette(const wxPalette& palette); + wxPalette CreateDefaultPalette(); + wxPalette* GetPalette(); +#endif }; @@ -111,9 +156,6 @@ public: %init %{ - wxClassInfo::CleanUpClasses(); - wxClassInfo::InitializeClasses(); - %} //---------------------------------------------------------------------------