don't show generic dir dlg when it's the same as the standard one

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index ebb39d526a251032395f0a95967c563190982796..b51b3fb5f1164709fa08268af2a810dc159e7e4c 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -42,6 +42,14 @@
 
 %pragma(python) code = "import wx"
 
 
 %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;
 //---------------------------------------------------------------------------
 
 class wxPalette;


@@ -54,8 +62,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();


@@ -74,6 +84,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)) {


@@ -94,12 +124,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,
 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);
 
                int *attribList = NULL,
                const wxPalette& palette = wxNullPalette);
 


@@ -110,7 +140,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
                     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 );
 
                     int *attribList = NULL,
                     const wxPalette& palette = wxNullPalette );