memory dc must have bitmap selected into it before it can be used for measuring

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

diff --git a/wxPython/contrib/gizmos/gizmos.i b/wxPython/contrib/gizmos/gizmos.i
index 3c09032d649ec190e2bae21d1f216b2e4faad492..0c272612c7e1e65948e66f7271eaae22c57d10b0 100644 (file)
--- a/wxPython/contrib/gizmos/gizmos.i
+++ b/wxPython/contrib/gizmos/gizmos.i
@@ -10,50 +10,58 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-%module gizmos
+%define DOCSTRING
+"Various *gizmo* classes: `DynamicSashWindow`, `EditableListBox`,
+`LEDNumberCtrl`, `TreeListCtrl`, etc."
+%enddef
+
+%module(package="wx", docstring=DOCSTRING) gizmos

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

-    
+

 #include <wx/gizmos/dynamicsash.h>
 #include <wx/gizmos/editlbox.h>
 #include <wx/gizmos/splittree.h>
 #include <wx/gizmos/ledctrl.h>
 #include <wx/gizmos/dynamicsash.h>
 #include <wx/gizmos/editlbox.h>
 #include <wx/gizmos/splittree.h>
 #include <wx/gizmos/ledctrl.h>

+#include <wx/gizmos/statpict.h>

 
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>

-    
-#include "treelistctrl.h"
+
+#include "wx/treelistctrl.h"

 #include "wx/wxPython/pytree.h"
 
 #include "wx/wxPython/pytree.h"
 

-    
-    static const wxString wxPyDynamicSashNameStr(wxT("dynamicSashWindow"));
-    static const wxString wxPyEditableListBoxNameStr(wxT("editableListBox"));
-    static const wxString wxPyTreeListCtrlNameStr(wxT("treelistctrl"));
-    static const wxString wxPyEmptyString(wxT(""));

 %}
 
 //---------------------------------------------------------------------------
 
 %import windows.i
 %import controls.i
 %}
 
 //---------------------------------------------------------------------------
 
 %import windows.i
 %import controls.i

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

 
 

-%include _gizmos_rename.i
+MAKE_CONST_WXSTRING2(DynamicSashNameStr,     wxT("dynamicSashWindow"));
+MAKE_CONST_WXSTRING2(EditableListBoxNameStr, wxT("editableListBox"));
+MAKE_CONST_WXSTRING2(TreeListCtrlNameStr,    wxT("treelistctrl"));
+MAKE_CONST_WXSTRING(StaticPictureNameStr);                     
+    
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);

 
 //---------------------------------------------------------------------------
 
 enum {
 
 //---------------------------------------------------------------------------
 
 enum {

-    wxEVT_DYNAMIC_SASH_SPLIT,
-    wxEVT_DYNAMIC_SASH_UNIFY,
-

     wxDS_MANAGE_SCROLLBARS,
     wxDS_DRAG_CORNER,
 };
 
     wxDS_MANAGE_SCROLLBARS,
     wxDS_DRAG_CORNER,
 };
 

+%constant wxEventType wxEVT_DYNAMIC_SASH_SPLIT;
+%constant wxEventType wxEVT_DYNAMIC_SASH_UNIFY;
+

 
 /*
     wxDynamicSashSplitEvents are sent to your view by wxDynamicSashWindow
 
 /*
     wxDynamicSashSplitEvents are sent to your view by wxDynamicSashWindow


@@ -130,18 +138,20 @@ public:
 
 */
 
 
 */
 

+MustHaveApp(wxDynamicSashWindow);
+

 class wxDynamicSashWindow : public wxWindow {
 public:
 class wxDynamicSashWindow : public wxWindow {
 public:

-    %addtofunc wxDynamicSashWindow         "self._setOORInfo(self)"
-    %addtofunc wxDynamicSashWindow()       ""
+    %pythonAppend wxDynamicSashWindow         "self._setOORInfo(self)"
+    %pythonAppend wxDynamicSashWindow()       ""

 
 

-    wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
+    wxDynamicSashWindow(wxWindow *parent, wxWindowID id=-1,

                         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                         long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
                         const wxString& name = wxPyDynamicSashNameStr);
                         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                         long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
                         const wxString& name = wxPyDynamicSashNameStr);

-    %name(PreDynamicSashWindow)wxDynamicSashWindow();
+    %RenameCtor(PreDynamicSashWindow, wxDynamicSashWindow());

 
 

-    bool Create(wxWindow *parent, wxWindowID id,
+    bool Create(wxWindow *parent, wxWindowID id=-1,

                 const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                 long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
                 const wxString& name = wxPyDynamicSashNameStr);
                 const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                 long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
                 const wxString& name = wxPyDynamicSashNameStr);


@@ -168,14 +178,15 @@ enum {
 
 // This class provides a composite control that lets the
 // user easily enter list of strings
 
 // This class provides a composite control that lets the
 // user easily enter list of strings

+MustHaveApp(wxEditableListBox);

 class wxEditableListBox : public wxPanel
 {
 public:
 class wxEditableListBox : public wxPanel
 {
 public:

-    %addtofunc wxEditableListBox         "self._setOORInfo(self)"
-    %addtofunc wxEditableListBox()       ""
+    %pythonAppend wxEditableListBox         "self._setOORInfo(self)"
+    %pythonAppend wxEditableListBox()       ""

 
 

-    wxEditableListBox(wxWindow *parent, wxWindowID id,
-                      const wxString& label,
+    wxEditableListBox(wxWindow *parent, wxWindowID id=-1,
+                      const wxString& label = wxPyEmptyString,

                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE,
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE,


@@ -193,7 +204,7 @@ public:
         }
     }
 
         }
     }
 

-    wxListCtrl* GetListCtrl();
+    wxPyListCtrl* GetListCtrl();

     wxBitmapButton* GetDelButton();
     wxBitmapButton* GetNewButton();
     wxBitmapButton* GetUpButton();
     wxBitmapButton* GetDelButton();
     wxBitmapButton* GetNewButton();
     wxBitmapButton* GetUpButton();


@@ -218,11 +229,13 @@ public:
     typedef wxTreeCtrl wxPyTreeCtrl;
 %}
 
     typedef wxTreeCtrl wxPyTreeCtrl;
 %}
 

+MustHaveApp(wxRemotelyScrolledTreeCtrl);
+

 class wxRemotelyScrolledTreeCtrl: public wxPyTreeCtrl
 {
 public:
 class wxRemotelyScrolledTreeCtrl: public wxPyTreeCtrl
 {
 public:

-    %addtofunc wxRemotelyScrolledTreeCtrl         "self._setOORInfo(self)"
-    %addtofunc wxRemotelyScrolledTreeCtrl()       ""
+    %pythonAppend wxRemotelyScrolledTreeCtrl         "self._setOORInfo(self)"
+    %pythonAppend wxRemotelyScrolledTreeCtrl()       ""

 
     wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id,
                                const wxPoint& pos = wxDefaultPosition,
 
     wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id,
                                const wxPoint& pos = wxDefaultPosition,


@@ -269,17 +282,17 @@ public:
 
     virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect) {
         bool found;
 
     virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect) {
         bool found;

-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) {
         if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) {

-            PyObject* dcobj = wxPyMake_wxObject(&dc);
-            PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), FALSE);
-            PyObject* recobj= wxPyConstructObject((void*)&rect, wxT("wxRect"), FALSE);
+            PyObject* dcobj = wxPyMake_wxObject(&dc,false);
+            PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), false);
+            PyObject* recobj= wxPyConstructObject((void*)&rect, wxT("wxRect"), false);

             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", dcobj, idobj, recobj));
             Py_DECREF(dcobj);
             Py_DECREF(idobj);
             Py_DECREF(recobj);
         }
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", dcobj, idobj, recobj));
             Py_DECREF(dcobj);
             Py_DECREF(idobj);
             Py_DECREF(recobj);
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         if (! found)
             wxTreeCompanionWindow::DrawItem(dc, id, rect);
     }
         if (! found)
             wxTreeCompanionWindow::DrawItem(dc, id, rect);
     }


@@ -289,11 +302,14 @@ public:
 %}
 
 
 %}
 
 

-%name(TreeCompanionWindow) class wxPyTreeCompanionWindow: public wxWindow
+MustHaveApp(wxPyTreeCompanionWindow);
+
+%rename(TreeCompanionWindow) wxPyTreeCompanionWindow;
+class wxPyTreeCompanionWindow: public wxWindow

 {
 public:
 {
 public:

-    %addtofunc wxPyTreeCompanionWindow         "self._setOORInfo(self);self._setCallbackInfo(self, TreeCompanionWindow)"
-    %addtofunc wxPyTreeCompanionWindow()       ""
+    %pythonAppend wxPyTreeCompanionWindow         "self._setOORInfo(self);self._setCallbackInfo(self, TreeCompanionWindow)"
+    %pythonAppend wxPyTreeCompanionWindow()       ""

 
     wxPyTreeCompanionWindow(wxWindow* parent, wxWindowID id = -1,
                             const wxPoint& pos = wxDefaultPosition,
 
     wxPyTreeCompanionWindow(wxWindow* parent, wxWindowID id = -1,
                             const wxPoint& pos = wxDefaultPosition,


@@ -314,11 +330,13 @@ public:
  * than the usual one.
  */
 
  * than the usual one.
  */
 

+MustHaveApp(wxThinSplitterWindow);
+

 class wxThinSplitterWindow: public wxSplitterWindow
 {
 public:
 class wxThinSplitterWindow: public wxSplitterWindow
 {
 public:

-    %addtofunc wxThinSplitterWindow         "self._setOORInfo(self)"
-    %addtofunc wxThinSplitterWindow()       ""
+    %pythonAppend wxThinSplitterWindow         "self._setOORInfo(self)"
+    %pythonAppend wxThinSplitterWindow()       ""

 
     wxThinSplitterWindow(wxWindow* parent, wxWindowID id = -1,
                          const wxPoint& pos = wxDefaultPosition,
 
     wxThinSplitterWindow(wxWindow* parent, wxWindowID id = -1,
                          const wxPoint& pos = wxDefaultPosition,


@@ -337,11 +355,13 @@ public:
  * scroll appropriately.
  */
 
  * scroll appropriately.
  */
 

+MustHaveApp(wxSplitterScrolledWindow);
+

 class wxSplitterScrolledWindow: public wxScrolledWindow
 {
 public:
 class wxSplitterScrolledWindow: public wxScrolledWindow
 {
 public:

-    %addtofunc wxSplitterScrolledWindow         "self._setOORInfo(self)"
-    %addtofunc wxSplitterScrolledWindow()       ""
+    %pythonAppend wxSplitterScrolledWindow         "self._setOORInfo(self)"
+    %pythonAppend wxSplitterScrolledWindow()       ""

 
     wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = -1,
                              const wxPoint& pos = wxDefaultPosition,
 
     wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = -1,
                              const wxPoint& pos = wxDefaultPosition,


@@ -366,17 +386,19 @@ enum wxLEDValueAlign
 };
 
 
 };
 
 

+MustHaveApp(wxLEDNumberCtrl);
+

 class wxLEDNumberCtrl :        public wxControl
 {
 public:
 class wxLEDNumberCtrl :        public wxControl
 {
 public:

-    %addtofunc wxLEDNumberCtrl         "self._setOORInfo(self)"
-    %addtofunc wxLEDNumberCtrl()       ""
+    %pythonAppend wxLEDNumberCtrl         "self._setOORInfo(self)"
+    %pythonAppend wxLEDNumberCtrl()       ""

 
     wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = -1,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style =  wxLED_ALIGN_LEFT | wxLED_DRAW_FADED);
 
     wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = -1,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style =  wxLED_ALIGN_LEFT | wxLED_DRAW_FADED);

-    %name(PreLEDNumberCtrl) wxLEDNumberCtrl();
+    %RenameCtor(PreLEDNumberCtrl,  wxLEDNumberCtrl());

 
     bool Create(wxWindow *parent, wxWindowID id = -1,
                     const wxPoint& pos = wxDefaultPosition,
 
     bool Create(wxWindow *parent, wxWindowID id = -1,
                     const wxPoint& pos = wxDefaultPosition,


@@ -412,6 +434,20 @@ enum {
 };
 
 
 };
 
 

+enum {
+    // flags for FindItem
+    wxTL_SEARCH_VISIBLE,
+    wxTL_SEARCH_LEVEL,
+    wxTL_SEARCH_FULL,
+    wxTL_SEARCH_PARTIAL,
+    wxTL_SEARCH_NOCASE
+};
+
+enum {
+    // extra tree styles
+    wxTR_DONT_ADJUST_MAC
+};
+%pythoncode { wx.TR_DONT_ADJUST_MAC = TR_DONT_ADJUST_MAC }

 
 
 class wxTreeListColumnInfo: public wxObject {
 
 
 class wxTreeListColumnInfo: public wxObject {


@@ -419,14 +455,20 @@ public:
     wxTreeListColumnInfo(const wxString& text = wxPyEmptyString,
                         int image = -1,
                         size_t width = 100,
     wxTreeListColumnInfo(const wxString& text = wxPyEmptyString,
                         int image = -1,
                         size_t width = 100,

+                         bool shown = true,

                         wxTreeListColumnAlign alignment = wxTL_ALIGN_LEFT);
 
                         wxTreeListColumnAlign alignment = wxTL_ALIGN_LEFT);
 

+    ~wxTreeListColumnInfo();
+    
+    bool GetShown() const;

     wxTreeListColumnAlign GetAlignment() const;
     wxString GetText() const;
     int GetImage() const;
     int GetSelectedImage() const;
     size_t GetWidth() const;
 
     wxTreeListColumnAlign GetAlignment() const;
     wxString GetText() const;
     int GetImage() const;
     int GetSelectedImage() const;
     size_t GetWidth() const;
 

+    // TODO:  These all actually return wxTreeListColumnInfo&, any problem with doing it for Python too?
+    void SetShown(bool shown);

     void SetAlignment(wxTreeListColumnAlign alignment);
     void SetText(const wxString& text);
     void SetImage(int image);
     void SetAlignment(wxTreeListColumnAlign alignment);
     void SetText(const wxString& text);
     void SetImage(int image);


@@ -454,7 +496,7 @@ public:
                        const wxTreeItemId& item2) {
         int rval = 0;
         bool found;
                        const wxTreeItemId& item2) {
         int rval = 0;
         bool found;

-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) {
             PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), 0);
             PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), 0);
         if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) {
             PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), 0);
             PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), 0);


@@ -462,7 +504,7 @@ public:
             Py_DECREF(o1);
             Py_DECREF(o2);
         }
             Py_DECREF(o1);
             Py_DECREF(o2);
         }

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         if (! found)
             rval = wxTreeListCtrl::OnCompareItems(item1, item2);
         return rval;
         if (! found)
             rval = wxTreeListCtrl::OnCompareItems(item1, item2);
         return rval;


@@ -479,11 +521,14 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeListCtrl, wxTreeListCtrl)
 
 
 
 
 
 

-%name(TreeListCtrl) class wxPyTreeListCtrl : public wxControl
+MustHaveApp(wxPyTreeListCtrl);
+
+%rename(TreeListCtrl) wxPyTreeListCtrl;
+class wxPyTreeListCtrl : public wxControl

 {
 public:
 {
 public:

-    %addtofunc wxPyTreeListCtrl         "self._setOORInfo(self);self._setCallbackInfo(self, TreeListCtrl)"
-    %addtofunc wxPyTreeListCtrl()       ""
+    %pythonAppend wxPyTreeListCtrl         "self._setOORInfo(self);self._setCallbackInfo(self, TreeListCtrl)"
+    %pythonAppend wxPyTreeListCtrl()       ""

 
     wxPyTreeListCtrl(wxWindow *parent, wxWindowID id = -1,
                    const wxPoint& pos = wxDefaultPosition,
 
     wxPyTreeListCtrl(wxWindow *parent, wxWindowID id = -1,
                    const wxPoint& pos = wxDefaultPosition,


@@ -491,7 +536,7 @@ public:
                    long style = wxTR_DEFAULT_STYLE,
                    const wxValidator &validator = wxDefaultValidator,
                    const wxString& name = wxPyTreeListCtrlNameStr );
                    long style = wxTR_DEFAULT_STYLE,
                    const wxValidator &validator = wxDefaultValidator,
                    const wxString& name = wxPyTreeListCtrlNameStr );

-    %name(PreTreeListCtrl)wxPyTreeListCtrl();
+    %RenameCtor(PreTreeListCtrl, wxPyTreeListCtrl());

 
     bool Create(wxWindow *parent, wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,
 
     bool Create(wxWindow *parent, wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,


@@ -502,7 +547,7 @@ public:
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 

-    
+

     // get the total number of items in the control
     size_t GetCount() const;
 
     // get the total number of items in the control
     size_t GetCount() const;
 


@@ -512,10 +557,6 @@ public:
     unsigned int GetIndent() const;
     void SetIndent(unsigned int indent);
 
     unsigned int GetIndent() const;
     void SetIndent(unsigned int indent);
 

-    // spacing is the number of pixels between the start and the Text
-    unsigned int GetSpacing() const;
-    void SetSpacing(unsigned int spacing);
-

     // line spacing is the space above and below the text on each line
     unsigned int GetLineSpacing() const;
     void SetLineSpacing(unsigned int spacing);
     // line spacing is the space above and below the text on each line
     unsigned int GetLineSpacing() const;
     void SetLineSpacing(unsigned int spacing);


@@ -540,24 +581,23 @@ public:
     void SetStateImageList(wxImageList *imageList);
     void SetButtonsImageList(wxImageList *imageList);
 
     void SetStateImageList(wxImageList *imageList);
     void SetButtonsImageList(wxImageList *imageList);
 

-    %addtofunc AssignImageList      "args[1].thisown = 0";
+    %disownarg( wxImageList *imageList );

     void AssignImageList(wxImageList *imageList);
     void AssignImageList(wxImageList *imageList);

-
-    %addtofunc AssignStateImageList      "args[1].thisown = 0";

     void AssignStateImageList(wxImageList *imageList);
     void AssignStateImageList(wxImageList *imageList);

-
-    %addtofunc AssignButtonsImageList      "args[1].thisown = 0";

     void AssignButtonsImageList(wxImageList *imageList);
     void AssignButtonsImageList(wxImageList *imageList);

-
+    %cleardisown( wxImageList *imageList );

 
 
     // adds a column
     void AddColumn(const wxString& text);
 
 
     // adds a column
     void AddColumn(const wxString& text);

-    %name(AddColumnInfo) void AddColumn(const wxTreeListColumnInfo& col);
+//     void AddColumn(const wxString& text,
+//                    size_t width,
+//                    wxTreeListColumnAlign alignment = wxTL_ALIGN_LEFT);
+    %Rename(AddColumnInfo,  void,  AddColumn(const wxTreeListColumnInfo& col));

 
     // inserts a column before the given one
     void InsertColumn(size_t before, const wxString& text);
 
     // inserts a column before the given one
     void InsertColumn(size_t before, const wxString& text);

-    %name(InsertColumnInfo) void InsertColumn(size_t before, const wxTreeListColumnInfo& col);
+    %Rename(InsertColumnInfo,  void,  InsertColumn(size_t before, const wxTreeListColumnInfo& col));

 
     // deletes the given column - does not delete the corresponding column
     // of each item
 
     // deletes the given column - does not delete the corresponding column
     // of each item


@@ -586,6 +626,8 @@ public:
     void SetColumnImage(size_t column, int image);
     int GetColumnImage(size_t column) const;
 
     void SetColumnImage(size_t column, int image);
     int GetColumnImage(size_t column) const;
 

+    void ShowColumn(size_t column, bool shown);
+    bool IsColumnShown(size_t column) const;

 
     %extend {
         // retrieves item's label of the given column (main column by default)
 
     %extend {
         // retrieves item's label of the given column (main column by default)


@@ -628,10 +670,12 @@ public:
             return data;
         }
 
             return data;
         }
 

+        %disownarg( wxPyTreeItemData* data );

         void SetItemData(const wxTreeItemId& item, wxPyTreeItemData* data) {
             data->SetId(item); // set the id
             self->SetItemData(item, data);
         }
         void SetItemData(const wxTreeItemId& item, wxPyTreeItemData* data) {
             data->SetId(item); // set the id
             self->SetItemData(item, data);
         }

+        %cleardisown(wxPyTreeItemData* data );

 
         // [Get|Set]ItemPyData are short-cuts.  Also made somewhat crash-proof by
         // automatically creating data classes.
 
         // [Get|Set]ItemPyData are short-cuts.  Also made somewhat crash-proof by
         // automatically creating data classes.


@@ -655,23 +699,25 @@ public:
                 data->SetData(obj);
         }
     }
                 data->SetData(obj);
         }
     }

+    %pythoncode { GetPyData = GetItemPyData }
+    %pythoncode { SetPyData = SetItemPyData }

 
 
     // force appearance of [+] button near the item. This is useful to
     // allow the user to expand the items which don't have any children now
     // - but instead add them only when needed, thus minimizing memory
     // usage and loading time.
 
 
     // force appearance of [+] button near the item. This is useful to
     // allow the user to expand the items which don't have any children now
     // - but instead add them only when needed, thus minimizing memory
     // usage and loading time.

-    void SetItemHasChildren(const wxTreeItemId& item, bool has = TRUE);
+    void SetItemHasChildren(const wxTreeItemId& item, bool has = true);

 
     // the item will be shown in bold
 
     // the item will be shown in bold

-    void SetItemBold(const wxTreeItemId& item, bool bold = TRUE);
+    void SetItemBold(const wxTreeItemId& item, bool bold = true);

 
     // set the item's text colour
 
     // set the item's text colour

-    void SetItemTextColour(const wxTreeItemId& item, const wxColour& col);
+    void SetItemTextColour(const wxTreeItemId& item, const wxColour& colour);

 
     // set the item's background colour
     void SetItemBackgroundColour(const wxTreeItemId& item,
 
     // set the item's background colour
     void SetItemBackgroundColour(const wxTreeItemId& item,

-                                const wxColour& col);
+                                const wxColour& colour);

 
     // set the item's font (should be of the same height for all items)
     void SetItemFont(const wxTreeItemId& item, const wxFont& font);
 
     // set the item's font (should be of the same height for all items)
     void SetItemFont(const wxTreeItemId& item, const wxFont& font);


@@ -697,12 +743,12 @@ public:
     // is item text in bold font?
     bool IsBold(const wxTreeItemId& item) const;
 
     // is item text in bold font?
     bool IsBold(const wxTreeItemId& item) const;
 

-    // if 'recursively' is FALSE, only immediate children count, otherwise
+    // if 'recursively' is False, only immediate children count, otherwise

     // the returned number is the number of all items in this branch
     // the returned number is the number of all items in this branch

-    size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = TRUE);
+    size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = true);

 
 
 
 

-    // wxTreeItemId.IsOk() will return FALSE if there is no such item
+    // wxTreeItemId.IsOk() will return False if there is no such item

 
     // get the root tree item
     wxTreeItemId GetRootItem() const;
 
     // get the root tree item
     wxTreeItemId GetRootItem() const;


@@ -714,24 +760,25 @@ public:
     //size_t GetSelections(wxArrayTreeItemIds&) const;
     %extend {
         PyObject* GetSelections() {
     //size_t GetSelections(wxArrayTreeItemIds&) const;
     %extend {
         PyObject* GetSelections() {

-            wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();

             PyObject*           rval = PyList_New(0);
             wxArrayTreeItemIds  array;
             size_t              num, x;
             num = self->GetSelections(array);
             for (x=0; x < num; x++) {
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));
             PyObject*           rval = PyList_New(0);
             wxArrayTreeItemIds  array;
             size_t              num, x;
             num = self->GetSelections(array);
             for (x=0; x < num; x++) {
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));

-                PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), TRUE);
+                PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), true);

                 PyList_Append(rval, item);
                 PyList_Append(rval, item);

+                Py_DECREF(item);

             }
             }

-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);

             return rval;
         }
     }
 
 
     // get the parent of this item (may return NULL if root)
             return rval;
         }
     }
 
 
     // get the parent of this item (may return NULL if root)

-    %name(GetItemParent)wxTreeItemId GetParent(const wxTreeItemId& item) const;
+    wxTreeItemId GetItemParent(const wxTreeItemId& item) const;

 
     // for this enumeration function you must pass in a "cookie" parameter
     // which is opaque for the application but is necessary for the library
 
     // for this enumeration function you must pass in a "cookie" parameter
     // which is opaque for the application but is necessary for the library


@@ -741,18 +788,20 @@ public:
     // the same!
 
 
     // the same!
 
 

+    // NOTE: These are a copy of the same methods in _treectrl.i, be sure to
+    // update both at the same time.  (Or find a good way to refactor!)

     %extend {
         // Get the first child of this item.  Returns a wxTreeItemId and an
         // opaque "cookie" value that should be passed to GetNextChild in
         // order to continue the search.
         PyObject* GetFirstChild(const wxTreeItemId& item) {
     %extend {
         // Get the first child of this item.  Returns a wxTreeItemId and an
         // opaque "cookie" value that should be passed to GetNextChild in
         // order to continue the search.
         PyObject* GetFirstChild(const wxTreeItemId& item) {

-            long cookie = 0;
-            wxTreeItemId ritem = self->GetFirstChild(item, cookie);
-            wxPyBeginBlockThreads();
+            void* cookie = 0;
+            wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie));
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(2);
             PyObject* tup = PyTuple_New(2);

-            PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), true));
-            PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(cookie));
-            wxPyEndBlockThreads();
+            PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
+            PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
+            wxPyEndBlockThreads(blocked);

             return tup;
         }
 
             return tup;
         }
 


@@ -761,15 +810,19 @@ public:
         // value returned from GetFirstChild or the previous GetNextChild.
         // Returns a wxTreeItemId and an opaque "cookie" value that should be
         // passed to GetNextChild in order to continue the search.
         // value returned from GetFirstChild or the previous GetNextChild.
         // Returns a wxTreeItemId and an opaque "cookie" value that should be
         // passed to GetNextChild in order to continue the search.

-        PyObject* GetNextChild(const wxTreeItemId& item, long cookie) {
-            wxTreeItemId ritem = self->GetNextChild(item, cookie);
-            wxPyBeginBlockThreads();
+        PyObject* GetNextChild(const wxTreeItemId& item, void* cookie) {
+            wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie));
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(2);
             PyObject* tup = PyTuple_New(2);

-            PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), true));
-            PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(cookie));
-            wxPyEndBlockThreads();
+            PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
+            PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
+            wxPyEndBlockThreads(blocked);

             return tup;
             return tup;

-        }            
+        }
+
+
+        // TODO:  GetPrevChild
+        

     }
 
     // get the last child of this item - this method doesn't use cookies
     }
 
     // get the last child of this item - this method doesn't use cookies


@@ -795,6 +848,8 @@ public:
     wxTreeItemId GetNext(const wxTreeItemId& item) const;
 
 
     wxTreeItemId GetNext(const wxTreeItemId& item) const;
 
 

+    %disownarg( wxPyTreeItemData* data );
+    

     // add the root node to the tree
     wxTreeItemId AddRoot(const wxString& text,
                          int image = -1, int selectedImage = -1,
     // add the root node to the tree
     wxTreeItemId AddRoot(const wxString& text,
                          int image = -1, int selectedImage = -1,


@@ -814,12 +869,12 @@ public:
                             wxPyTreeItemData *data = NULL);
 
     // insert a new item before the one with the given index
                             wxPyTreeItemData *data = NULL);
 
     // insert a new item before the one with the given index

-    %name(InsertItemBefore)
-        wxTreeItemId InsertItem(const wxTreeItemId& parent,
+    %Rename(InsertItemBefore, 
+        wxTreeItemId,  InsertItem(const wxTreeItemId& parent,

                                 size_t index,
                                 const wxString& text,
                                 int image = -1, int selectedImage = -1,
                                 size_t index,
                                 const wxString& text,
                                 int image = -1, int selectedImage = -1,

-                                wxPyTreeItemData *data = NULL);
+                                wxPyTreeItemData *data = NULL));

 
     // insert a new item in as the last child of the parent
     wxTreeItemId AppendItem(const wxTreeItemId& parent,
 
     // insert a new item in as the last child of the parent
     wxTreeItemId AppendItem(const wxTreeItemId& parent,


@@ -827,6 +882,8 @@ public:
                             int image = -1, int selectedImage = -1,
                             wxPyTreeItemData *data = NULL);
 
                             int image = -1, int selectedImage = -1,
                             wxPyTreeItemData *data = NULL);
 

+    %cleardisown(wxPyTreeItemData* data );
+    

     // delete this item and associated data if any
     void Delete(const wxTreeItemId& item);
 
     // delete this item and associated data if any
     void Delete(const wxTreeItemId& item);
 


@@ -858,9 +915,11 @@ public:
     void UnselectAll();
 
     // select this item
     void UnselectAll();
 
     // select this item

-    void SelectItem(const wxTreeItemId& item, bool unselect_others=TRUE,
-                   bool extended_select=FALSE);
+    void SelectItem(const wxTreeItemId& item, bool unselect_others=true,
+                   bool extended_select=false);

 
 

+    void SelectAll(bool extended_select=false);
+    

     // make sure this item is visible (expanding the parent item and/or
     // scrolling to this item if necessary)
     void EnsureVisible(const wxTreeItemId& item);
     // make sure this item is visible (expanding the parent item and/or
     // scrolling to this item if necessary)
     void EnsureVisible(const wxTreeItemId& item);


@@ -873,13 +932,13 @@ public:
 
     %extend {
         // get the bounding rectangle of the item (or of its label only)
 
     %extend {
         // get the bounding rectangle of the item (or of its label only)

-        PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = FALSE) {
+        PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = false) {

             wxRect rect;
             if (self->GetBoundingRect(item, rect, textOnly)) {
             wxRect rect;
             if (self->GetBoundingRect(item, rect, textOnly)) {

-                wxPyBeginBlockThreads();
+                wxPyBlock_t blocked = wxPyBeginBlockThreads();

                 wxRect* r = new wxRect(rect);
                 PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1);
                 wxRect* r = new wxRect(rect);
                 PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1);

-                wxPyEndBlockThreads();
+                wxPyEndBlockThreads(blocked);

                 return val;
             }
             else {
                 return val;
             }
             else {


@@ -898,19 +957,63 @@ public:
     // sort the children of this item using OnCompareItems
     void SortChildren(const wxTreeItemId& item);
 
     // sort the children of this item using OnCompareItems
     void SortChildren(const wxTreeItemId& item);
 

-    // get the selected item image
-    int GetItemSelectedImage(const wxTreeItemId& item) const;
+    // searching
+    wxTreeItemId FindItem (const wxTreeItemId& item, const wxString& str, int flags = 0);

 
 

-    // set the selected item image
-    void SetItemSelectedImage(const wxTreeItemId& item, int image);
+    wxWindow* GetHeaderWindow() const;
+    wxScrolledWindow* GetMainWindow() const;

 
 

+};

 
 

-    wxWindow* GetHeaderWindow() const;
-    wxWindow* GetMainWindow() const;
+//----------------------------------------------------------------------

 
 

+enum
+{
+    wxSCALE_HORIZONTAL,
+    wxSCALE_VERTICAL,
+    wxSCALE_UNIFORM,
+    wxSCALE_CUSTOM    

 };
 
 };
 

+MustHaveApp(wxStaticPicture);
+
+class wxStaticPicture : public wxControl
+{
+public:
+    %pythonAppend wxStaticPicture         "self._setOORInfo(self)"
+    %pythonAppend wxStaticPicture()       ""
+
+    wxStaticPicture( wxWindow* parent, wxWindowID id=-1,
+                     const wxBitmap& label=wxNullBitmap,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = 0,
+                     const wxString& name = wxPyStaticPictureNameStr );
+
+    %RenameCtor(PreStaticPicture, wxStaticPicture());
+
+    bool Create( wxWindow* parent, wxWindowID id=-1,
+                 const wxBitmap& label=wxNullBitmap,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = 0,
+                 const wxString& name = wxPyStaticPictureNameStr );
+
+    void SetBitmap( const wxBitmap& bmp );
+    wxBitmap GetBitmap() const;
+    void SetIcon( const wxIcon& icon );
+    wxIcon GetIcon() const;
+
+    void SetAlignment( int align );
+    int GetAlignment() const;
+
+    void SetScale( int scale );
+    int GetScale() const; 

 
 

+    void SetCustomScale( float sx, float sy );
+    void GetCustomScale( float* OUTPUT, float* OUTPUT ) const;
+
+};

 
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------


@@ -928,8 +1031,3 @@ public:
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 

-
-
-
-
-