corrected bug in MacRedraw

[wxWidgets.git] / wxPython / contrib / glcanvas / glcanvas.i

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index ad76d3cf13b92d44d40b455b839f2ef1d41b085b..bb5620d85725b8cb93ca23c34d3168a63e54d9fb 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -15,7 +15,12 @@
 
 %{
 #include "export.h"
 
 %{
 #include "export.h"

+#ifdef __WXMSW__

 #include "myglcanvas.h"
 #include "myglcanvas.h"

+#else
+#include <wx/glcanvas.h>
+#endif
+

 %}
 
 //---------------------------------------------------------------------------
 %}
 
 //---------------------------------------------------------------------------


@@ -49,8 +54,10 @@ class wxGLCanvas;
 
 class wxGLContext : public wxObject {
 public:
 
 class wxGLContext : public wxObject {
 public:

+#ifndef __WXMAC__  //  fix this?

     wxGLContext(bool isRGB, wxGLCanvas *win,
                 const wxPalette& palette = wxNullPalette);
     wxGLContext(bool isRGB, wxGLCanvas *win,
                 const wxPalette& palette = wxNullPalette);

+#endif

     ~wxGLContext();
 
     void SetCurrent();
     ~wxGLContext();
 
     void SetCurrent();


@@ -69,6 +76,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)) {
 %typemap(python, in) int *attribList (int *temp) {
     int i;
     if (PySequence_Check($source)) {


@@ -89,7 +116,7 @@ public:
 
 
 
 
 
 

-class wxGLCanvas : public wxScrolledWindow {
+class wxGLCanvas : public wxWindow {

 public:
     wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxDefaultPosition,
 public:
     wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxDefaultPosition,


@@ -109,8 +136,8 @@ public:
                     int *attribList = NULL,
                     const wxPalette& palette = wxNullPalette );
 
                     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)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxGLCanvasWithContext:val._setOORInfo(self)"


@@ -121,11 +148,12 @@ public:
 
     wxGLContext* GetContext();
 
 
     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

 };
 
 
 };