X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7b7742da5ee462d18e4b90e054f95bce48b64f6..170acdc90e9f92f8b8120fa6c04acdbf45c89582:/wxPython/src/aui.i

diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i
index be013847c5..53baa1d170 100755
--- a/wxPython/src/aui.i
+++ b/wxPython/src/aui.i
@@ -263,7 +263,7 @@ The following example shows a simple implementation that utilizes
 //---------------------------------------------------------------------------
 
 %{
-// A wxDocArt class that knows how to forward virtuals to Python methods  
+// A wxDocArt class that knows how to forward virtuals to Python methods
 class wxPyDockArt :  public wxDefaultDockArt
 {
     wxPyDockArt() : wxDefaultDockArt() {}
@@ -289,6 +289,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);
+            Py_DECREF(owin);
             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);
@@ -310,6 +311,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
                                                          odc, owin, orientation, orect));
             Py_DECREF(odc);
+            Py_DECREF(owin);
             Py_DECREF(orect);
         }
         wxPyEndBlockThreads(blocked);
@@ -334,6 +336,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOO)",
                                                          odc, owin, otext, orect, opane));
             Py_DECREF(odc);
+            Py_DECREF(owin);
             Py_DECREF(otext);
             Py_DECREF(orect);
             Py_DECREF(opane);
@@ -379,6 +382,7 @@ class wxPyDockArt :  public wxDefaultDockArt
             PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane));
             Py_DECREF(odc);
+            Py_DECREF(owin);
             Py_DECREF(orect);
             Py_DECREF(opane);
        }
@@ -405,6 +409,7 @@ class wxPyDockArt :  public wxDefaultDockArt
                                                          odc, owin, button, button_state,
                                                          orect, opane));
             Py_DECREF(odc);
+            Py_DECREF(owin);
             Py_DECREF(orect);
             Py_DECREF(opane);
         }
@@ -435,7 +440,7 @@ methods to the Python methods implemented in the derived class.", "");
 class wxPyDockArt :  public wxDefaultDockArt
 {
     %pythonAppend wxPyDockArt     "self._setCallbackInfo(self, PyDockArt)"
-    PyDocArt();
+    wxPyDocArt();
 
 };
 
@@ -476,6 +481,187 @@ class wxPyDockArt :  public wxDefaultDockArt
 }
 
 
+//---------------------------------------------------------------------------
+
+%{
+// A wxTabArt class that knows how to forward virtuals to Python methods
+class wxPyTabArt :  public wxDefaultTabArt
+{
+    wxPyTabArt() : wxDefaultTabArt() {}
+
+    
+    virtual void DrawBackground( wxDC* dc,
+                                 const wxRect& rect )
+    {
+        bool found;
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "DrawBackground"))) {
+            PyObject* odc = wxPyMake_wxObject(dc, false);
+            PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0);
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", odc, orect));
+            Py_DECREF(odc);
+            Py_DECREF(orect);
+        }
+        wxPyEndBlockThreads(blocked);
+        if (!found)
+            wxDefaultTabArt::DrawBackground(dc, rect);
+    }
+
+    virtual void DrawTab( wxDC* dc,
+                          const wxRect& in_rect,
+                          const wxString& caption,
+                          bool active,
+                          wxRect* out_rect,
+                          int* x_extent)
+    {
+        bool found;
+        const char* errmsg = "DrawTab should return a sequence containing (out_rect, x_extent)";
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "DrawTab"))) {
+            PyObject* odc = wxPyMake_wxObject(dc, false);
+            PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0);
+            PyObject* otext = wx2PyString(caption);
+            PyObject* ro;
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOOi)", odc, orect, otext, (int)active));
+            if (ro) {
+                if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
+                    PyObject* o1 = PySequence_GetItem(ro, 0);
+                    PyObject* o2 = PySequence_GetItem(ro, 1);
+                    if (!wxRect_helper(o1, &out_rect)) 
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    else if (!PyInt_Check(o2)) 
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    else
+                        *x_extent = PyInt_AsLong(o2);
+                    
+                    Py_DECREF(o1);
+                    Py_DECREF(o2);
+                }
+                else {
+                    PyErr_SetString(PyExc_TypeError, errmsg);
+                }
+                Py_DECREF(ro);
+            }
+
+            Py_DECREF(odc);
+            Py_DECREF(orect);
+            Py_DECREF(otext);
+        }
+        wxPyEndBlockThreads(blocked);
+        if (!found)
+            wxDefaultTabArt::DrawTab(dc, in_rect, caption, active, out_rect, x_extent);
+    }
+
+
+    virtual void DrawButton( wxDC* dc,
+                             const wxRect& in_rect,
+                             int bitmap_id,
+                             int button_state,
+                             int orientation,
+                             const wxBitmap& bitmap_override,
+                             wxRect* out_rect)
+    {
+        bool found;
+        const char* errmsg = "DrawButton should return a wxRect";
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) {
+            PyObject* odc = wxPyMake_wxObject(dc, false);
+            PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0);
+            PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0);
+            PyObject* ro;
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiiiO)", odc, orect,
+                                                                 bitmap_id, button_state, orientation,
+                                                                 obmp));
+            if (ro) {
+                if (!wxRect_helper(ro, &out_rect)) 
+                    PyErr_SetString(PyExc_TypeError, errmsg);
+                Py_DECREF(ro);
+            }
+
+            Py_DECREF(odc);
+            Py_DECREF(orect);
+            Py_DECREF(obmp);
+        }
+        wxPyEndBlockThreads(blocked);
+        if (!found)
+            wxDefaultTabArt::DrawButton(dc, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect);
+    }
+
+    
+    virtual wxSize GetTabSize( wxDC* dc,
+                               const wxString& caption,
+                               bool active,
+                               int* x_extent)
+    {
+        bool found;
+        wxSize rv, *prv = &rv;
+        const char* errmsg = "GetTabSize should return a sequence containing (size, x_extent)";
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) {
+            PyObject* odc = wxPyMake_wxObject(dc, false);
+            PyObject* otext = wx2PyString(caption);
+            PyObject* ro;
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOi)", odc, otext, (int)active));
+            if (ro) {
+                if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
+                    PyObject* o1 = PySequence_GetItem(ro, 0);
+                    PyObject* o2 = PySequence_GetItem(ro, 1);
+                    if (!wxSize_helper(o1, &prv)) 
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    else if (!PyInt_Check(o2)) 
+                        PyErr_SetString(PyExc_TypeError, errmsg);
+                    else
+                        *x_extent = PyInt_AsLong(o2);
+                    
+                    Py_DECREF(o1);
+                    Py_DECREF(o2);
+                }
+                else {
+                    PyErr_SetString(PyExc_TypeError, errmsg);
+                }
+                Py_DECREF(ro);
+            }
+
+            Py_DECREF(odc);
+            Py_DECREF(otext);
+        }
+        wxPyEndBlockThreads(blocked);
+        if (!found)
+            rv = wxDefaultTabArt::GetTabSize(dc, caption, active, x_extent);
+        return rv;
+    }
+   
+   
+
+    DEC_PYCALLBACK__FONT(SetNormalFont);
+    DEC_PYCALLBACK__FONT(SetSelectedFont);
+    DEC_PYCALLBACK__FONT(SetMeasuringFont);
+    DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize);
+
+    PYPRIVATE;
+};
+
+
+IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetNormalFont);
+IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetSelectedFont);
+IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetMeasuringFont);
+IMP_PYCALLBACK_INT_WIN(wxPyTabArt, wxDefaultTabArt, GetBestTabCtrlSize);
+%}
+
+
+DocStr(wxPyTabArt,
+"This version of the `TabArt` class has been instrumented to be
+subclassable in Python and to reflect all calls to the C++ base class
+methods to the Python methods implemented in the derived class.", "");
+
+class wxPyTabArt :  public wxDefaultTabArt
+{
+    %pythonAppend wxPyTabArt     "self._setCallbackInfo(self, PyTabArt)"
+    wxPyTabArt();
+
+};
+
+
 //---------------------------------------------------------------------------
 
 #undef wxUSE_AUI