X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0122b7e3fcfd78f879470053c91a60e3c66537a3..71aba8333cc915afff9e740c944f7fa7247abacb:/wxPython/contrib/glcanvas/glcanvas.i

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index ad76d3cf13..f1f23d3fad 100644
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -14,8 +14,18 @@
 %module glcanvas
 
 %{
-#include "export.h"
+#include "wxPython.h"
+
+#ifdef __WXMAC__  // avoid a bug in Carbon headers
+#define scalb scalbn
+#endif
+
+#ifdef __WXMSW__
 #include "myglcanvas.h"
+#else
+#include <wx/glcanvas.h>
+#endif
+
 %}
 
 //---------------------------------------------------------------------------
@@ -37,6 +47,14 @@
 
 %pragma(python) code = "import wx"
 
+//----------------------------------------------------------------------
+
+%{
+    // Put some wx default wxChar* values into wxStrings.
+    static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas"));
+    static const wxString wxPyEmptyString(wxT(""));
+%}
+
 //---------------------------------------------------------------------------
 
 class wxPalette;
@@ -49,12 +67,14 @@ class wxGLCanvas;
 
 class wxGLContext : public wxObject {
 public:
+#ifndef __WXMAC__  //  fix this?
     wxGLContext(bool isRGB, wxGLCanvas *win,
                 const wxPalette& palette = wxNullPalette);
+#endif
     ~wxGLContext();
 
     void SetCurrent();
-    void SetColour(const char *colour);
+    void SetColour(const wxString& colour);
     void SwapBuffers();
 
 #ifdef __WXGTK__
@@ -69,6 +89,26 @@ public:
 
 //---------------------------------------------------------------------------
 
+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(python, in) int *attribList (int *temp) {
     int i;
     if (PySequence_Check($source)) {
@@ -89,12 +129,12 @@ public:
 
 
 
-class wxGLCanvas : public wxScrolledWindow {
+class wxGLCanvas : public wxWindow {
 public:
     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);
 
@@ -105,27 +145,28 @@ public:
                     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 );
 
-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxPoint& pos, const wxSize& size, long style, const wxString& name);
+//      bool Create(wxWindow *parent, wxWindowID id,
+//                  const wxPoint& pos, const wxSize& size, long style, const wxString& name);
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxGLCanvasWithContext:val._setOORInfo(self)"
 
     void SetCurrent();
-    void SetColour(const char *colour);
+    void SetColour(const wxString& colour);
     void SwapBuffers();
 
     wxGLContext* GetContext();
 
-   void SetupPixelFormat(int *attribList = NULL);
-   void SetupPalette(const wxPalette& palette);
-   wxPalette CreateDefaultPalette();
-
-   wxPalette* GetPalette();
+#ifdef __WXMSW__
+    void SetupPixelFormat(int *attribList = NULL);
+    void SetupPalette(const wxPalette& palette);
+    wxPalette CreateDefaultPalette();
+    wxPalette* GetPalette();
+#endif
 };
 
 
@@ -133,9 +174,6 @@ public:
 
 %init %{
 
-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();
-
 %}
 
 //---------------------------------------------------------------------------