Add wxCONTROL_FLAT

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

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index 6f6f3708fa4651dbd6d17f6248769c62fafaf8b6..682735ded024e66fcd0f0df53837a9c36d790332 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -11,7 +11,11 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

-%module glcanvas
+%define DOCSTRING
+"`GLCanvas` provides an OpenGL Context on a `wx.Window`."
+%enddef
+
+%module(package="wx", docstring=DOCSTRING) glcanvas

 
 %{
 #include "wx/wxPython/wxPython.h"
 
 %{
 #include "wx/wxPython/wxPython.h"


@@ -24,52 +28,29 @@
 //---------------------------------------------------------------------------
 
 %import core.i
 //---------------------------------------------------------------------------
 
 %import core.i

-%pythoncode { wx = core }
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }

 
 
 MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas"));
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
 
 
 MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas"));
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 

-
-%include _glcanvas_rename.i
-

 //---------------------------------------------------------------------------
 
 class wxPalette;
 
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 
 class wxPalette;
 
 //---------------------------------------------------------------------------
 

+MustHaveApp(wxGLContext);
+

 class wxGLContext : public wxObject {
 public:
 class wxGLContext : public wxObject {
 public:

-#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(wxGLCanvas *win, const wxGLContext* other = NULL);

     ~wxGLContext();
 
     ~wxGLContext();
 

-    void SetCurrent();
-    void SetColour(const wxString& colour);
-    void SwapBuffers();
-
-#ifdef __WXGTK__
-    void SetupPixelFormat();
-    void SetupPalette(const wxPalette& palette);
-    wxPalette CreateDefaultPalette();
-    wxPalette* GetPalette();
+#ifndef __WXMAC__  
+    void SetCurrent(const wxGLCanvas& win);

 #endif
 #endif

-
-    wxWindow* GetWindow();

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -94,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);
     int i;
     if (PySequence_Check($input)) {
         int size = PyObject_Length($input);


@@ -114,18 +95,31 @@ enum {
 
 
 
 
 
 

+MustHaveApp(wxGLCanvas);
+

 class wxGLCanvas : public wxWindow {
 public:
     %pythonAppend wxGLCanvas   "self._setOORInfo(self)"
 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 wxPoint& pos = wxDefaultPosition,

-               const wxSize& size = wxDefaultSize, long style = 0,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,

                const wxString& name = wxPyGLCanvasNameStr,
                const wxString& name = wxPyGLCanvasNameStr,

-               int *attribList = NULL,

                const wxPalette& palette = wxNullPalette);
 
                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)"
     %pythonAppend wxGLCanvas   "val._setOORInfo(val)"

-    %name(GLCanvasWithContext)
+    %RenameCtor(GLCanvasWithContext, 

         wxGLCanvas( wxWindow *parent,
                     const wxGLContext *shared = NULL,
                     wxWindowID id = -1,
         wxGLCanvas( wxWindow *parent,
                     const wxGLContext *shared = NULL,
                     wxWindowID id = -1,


@@ -133,22 +127,27 @@ public:
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
                     const wxString& name = wxPyGLCanvasNameStr,
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
                     const wxString& name = wxPyGLCanvasNameStr,

-                    int *attribList = NULL,
-                    const wxPalette& palette = wxNullPalette );
-
+                    const int *attribList = NULL,
+                    const wxPalette& palette = wxNullPalette ));

 
 

-    void SetCurrent();
+    %nokwargs SetCurrent;
+    void SetCurrent(const wxGLContext& context);

     void SetColour(const wxString& colour);
     void SwapBuffers();
 
     void SetColour(const wxString& colour);
     void SwapBuffers();
 

+    // deprecated...

     wxGLContext* GetContext();
     wxGLContext* GetContext();

+    void SetCurrent();

 
 

+    

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-    void SetupPixelFormat(int *attribList = NULL);
+//     void SetupPixelFormat(int *attribList = NULL);

     void SetupPalette(const wxPalette& palette);
     wxPalette CreateDefaultPalette();
     wxPalette* GetPalette();
 #endif
     void SetupPalette(const wxPalette& palette);
     wxPalette CreateDefaultPalette();
     wxPalette* GetPalette();
 #endif

+
+    %property(Context, GetContext, doc="See `GetContext`");

 };
 
 
 };