Fixed compile errors, warnings and other DSMs, and improved comments.

[wxWidgets.git] / wxPython / src / controls2.i

diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index 5acae12601112431ea43e1fa7f02201cd8247baa..11e599148c659171bd68fc84021cdfa02486eda3 100644 (file)
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -19,6 +19,7 @@
 #endif
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
 #endif
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>

+#include <wx/imaglist.h>

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


@@ -36,21 +37,150 @@
 
 %pragma(python) code = "import wx"
 
 
 %pragma(python) code = "import wx"
 

+
+//----------------------------------------------------------------------

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

+enum {
+    /* List control event types */
+    wxEVT_COMMAND_LIST_BEGIN_DRAG,
+    wxEVT_COMMAND_LIST_BEGIN_RDRAG,
+    wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT,
+    wxEVT_COMMAND_LIST_END_LABEL_EDIT,
+    wxEVT_COMMAND_LIST_DELETE_ITEM,
+    wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS,
+    wxEVT_COMMAND_LIST_GET_INFO,
+    wxEVT_COMMAND_LIST_SET_INFO,
+    wxEVT_COMMAND_LIST_ITEM_SELECTED,
+    wxEVT_COMMAND_LIST_ITEM_DESELECTED,
+    wxEVT_COMMAND_LIST_KEY_DOWN,
+    wxEVT_COMMAND_LIST_INSERT_ITEM,
+    wxEVT_COMMAND_LIST_COL_CLICK,
+    wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,
+    wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK,
+    wxEVT_COMMAND_LIST_ITEM_ACTIVATED,
+    wxEVT_COMMAND_LIST_CACHE_HINT,
+    wxEVT_COMMAND_LIST_COL_RIGHT_CLICK,
+    wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
+    wxEVT_COMMAND_LIST_COL_DRAGGING,
+    wxEVT_COMMAND_LIST_COL_END_DRAG,
+
+};
+
+
+%pragma(python) code = "
+def EVT_LIST_BEGIN_DRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_BEGIN_DRAG, func)
+
+def EVT_LIST_BEGIN_RDRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_BEGIN_RDRAG, func)
+
+def EVT_LIST_BEGIN_LABEL_EDIT(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, func)
+
+def EVT_LIST_END_LABEL_EDIT(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_END_LABEL_EDIT, func)
+
+def EVT_LIST_DELETE_ITEM(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_DELETE_ITEM, func)
+
+def EVT_LIST_DELETE_ALL_ITEMS(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, func)
+
+def EVT_LIST_GET_INFO(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_GET_INFO, func)
+
+def EVT_LIST_SET_INFO(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_SET_INFO, func)
+
+def EVT_LIST_ITEM_SELECTED(win, id, func):
+    win.Connect(id, -1,  wxEVT_COMMAND_LIST_ITEM_SELECTED, func)
+
+def EVT_LIST_ITEM_DESELECTED(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_DESELECTED, func)
+
+def EVT_LIST_KEY_DOWN(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_KEY_DOWN, func)
+
+def EVT_LIST_INSERT_ITEM(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_INSERT_ITEM, func)
+
+def EVT_LIST_COL_CLICK(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_CLICK, func)
+
+def EVT_LIST_COL_RIGHT_CLICK(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, func)
+
+def EVT_LIST_COL_BEGIN_DRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, func)
+
+def EVT_LIST_COL_DRAGGING(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_DRAGGING, func)
+
+def EVT_LIST_COL_END_DRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_END_DRAG, func)
+
+def EVT_LIST_ITEM_RIGHT_CLICK(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, func)
+
+def EVT_LIST_ITEM_MIDDLE_CLICK(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, func)
+
+def EVT_LIST_ITEM_ACTIVATED(win, id, func):
+    win.Connect(id, -1,  wxEVT_COMMAND_LIST_ITEM_ACTIVATED, func)
+
+def EVT_LIST_CACHE_HINT(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_CACHE_HINT, func)
+"
+
+
+enum {
+    /* Style flags */
+    wxLC_VRULES,
+    wxLC_HRULES,
+
+    wxLC_ICON,
+    wxLC_SMALL_ICON,
+    wxLC_LIST,
+    wxLC_REPORT,
+
+    wxLC_ALIGN_TOP,
+    wxLC_ALIGN_LEFT,
+    wxLC_AUTOARRANGE,
+    wxLC_VIRTUAL,
+    wxLC_EDIT_LABELS,
+    wxLC_NO_HEADER,
+    wxLC_NO_SORT_HEADER,
+    wxLC_SINGLE_SEL,
+    wxLC_SORT_ASCENDING,
+    wxLC_SORT_DESCENDING,
+
+    wxLC_MASK_TYPE,
+    wxLC_MASK_ALIGN,
+    wxLC_MASK_SORT,
+
+    wxLC_USER_TEXT,
+};
+

 
 enum {
 
 enum {

+    // Mask flags
+    wxLIST_MASK_STATE,

     wxLIST_MASK_TEXT,
     wxLIST_MASK_IMAGE,
     wxLIST_MASK_DATA,
     wxLIST_MASK_TEXT,
     wxLIST_MASK_IMAGE,
     wxLIST_MASK_DATA,

+    wxLIST_SET_ITEM,

     wxLIST_MASK_WIDTH,
     wxLIST_MASK_FORMAT,
     wxLIST_MASK_WIDTH,
     wxLIST_MASK_FORMAT,

-    wxLIST_MASK_STATE,
+
+    // State flags

     wxLIST_STATE_DONTCARE,
     wxLIST_STATE_DROPHILITED,
     wxLIST_STATE_FOCUSED,
     wxLIST_STATE_SELECTED,
     wxLIST_STATE_CUT,
     wxLIST_STATE_DONTCARE,
     wxLIST_STATE_DROPHILITED,
     wxLIST_STATE_FOCUSED,
     wxLIST_STATE_SELECTED,
     wxLIST_STATE_CUT,

+
+    // Hit test flags

     wxLIST_HITTEST_ABOVE,
     wxLIST_HITTEST_BELOW,
     wxLIST_HITTEST_NOWHERE,
     wxLIST_HITTEST_ABOVE,
     wxLIST_HITTEST_BELOW,
     wxLIST_HITTEST_NOWHERE,


@@ -61,27 +191,40 @@ enum {
     wxLIST_HITTEST_TOLEFT,
     wxLIST_HITTEST_TORIGHT,
     wxLIST_HITTEST_ONITEM,
     wxLIST_HITTEST_TOLEFT,
     wxLIST_HITTEST_TORIGHT,
     wxLIST_HITTEST_ONITEM,

+
+    // Flags for GetNextItem

     wxLIST_NEXT_ABOVE,
     wxLIST_NEXT_ALL,
     wxLIST_NEXT_BELOW,
     wxLIST_NEXT_LEFT,
     wxLIST_NEXT_RIGHT,
     wxLIST_NEXT_ABOVE,
     wxLIST_NEXT_ALL,
     wxLIST_NEXT_BELOW,
     wxLIST_NEXT_LEFT,
     wxLIST_NEXT_RIGHT,

+
+    // Alignment flags

     wxLIST_ALIGN_DEFAULT,
     wxLIST_ALIGN_LEFT,
     wxLIST_ALIGN_TOP,
     wxLIST_ALIGN_SNAP_TO_GRID,
     wxLIST_ALIGN_DEFAULT,
     wxLIST_ALIGN_LEFT,
     wxLIST_ALIGN_TOP,
     wxLIST_ALIGN_SNAP_TO_GRID,

-    wxLIST_AUTOSIZE,
-    wxLIST_AUTOSIZE_USEHEADER,
+
+    // Autosize values for SetColumnWidth
+    wxLIST_AUTOSIZE = -1,
+    wxLIST_AUTOSIZE_USEHEADER = -2,
+
+    // Flag values for GetItemRect

     wxLIST_RECT_BOUNDS,
     wxLIST_RECT_ICON,
     wxLIST_RECT_LABEL,
     wxLIST_RECT_BOUNDS,
     wxLIST_RECT_ICON,
     wxLIST_RECT_LABEL,

+
+    // Flag values for FindItem (MSW only)

     wxLIST_FIND_UP,
     wxLIST_FIND_DOWN,
     wxLIST_FIND_LEFT,
     wxLIST_FIND_RIGHT,
     wxLIST_FIND_UP,
     wxLIST_FIND_DOWN,
     wxLIST_FIND_LEFT,
     wxLIST_FIND_RIGHT,

+
+

 };
 
 
 };
 
 

+

 enum wxListColumnFormat
 {
     wxLIST_FORMAT_LEFT,
 enum wxListColumnFormat
 {
     wxLIST_FORMAT_LEFT,


@@ -91,15 +234,17 @@ enum wxListColumnFormat
 };
 
 
 };
 
 

+
+

 class wxListItemAttr
 {
 public:
     // ctors
 class wxListItemAttr
 {
 public:
     // ctors

-    wxListItemAttr();
-    //wxListItemAttr(const wxColour& colText,
-    //               const wxColour& colBack,
-    //               const wxFont& font)
-    //    : m_colText(colText), m_colBack(colBack), m_font(font) { }
+    //wxListItemAttr();
+    wxListItemAttr(const wxColour& colText = wxNullColour,
+                   const wxColour& colBack = wxNullColour,
+                   const wxFont& font = wxNullFont);
+

 
     // setters
     void SetTextColour(const wxColour& colText);
 
     // setters
     void SetTextColour(const wxColour& colText);


@@ -117,7 +262,7 @@ public:
 };
 
 
 };
 
 

-class wxListItem {
+class wxListItem : public wxObject {

 public:
     wxListItem();
     ~wxListItem();
 public:
     wxListItem();
     ~wxListItem();


@@ -181,6 +326,8 @@ public:
 
 class wxListEvent: public wxNotifyEvent {
 public:
 
 class wxListEvent: public wxNotifyEvent {
 public:

+    wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
+

     int           m_code;
     long          m_itemIndex;
     long          m_oldItemIndex;
     int           m_code;
     long          m_itemIndex;
     long          m_oldItemIndex;


@@ -202,46 +349,101 @@ public:
     long GetData();
     long GetMask();
     const wxListItem& GetItem();
     long GetData();
     long GetMask();
     const wxListItem& GetItem();

+
+    long GetCacheFrom();
+    long GetCacheTo();

 };
 
 
 };
 
 

+%{  // C++ Version of a Python aware class
+class wxPyListCtrl : public wxListCtrl {
+    DECLARE_ABSTRACT_CLASS(wxPyListCtrl);
+public:
+    wxPyListCtrl() : wxListCtrl() {}
+    wxPyListCtrl(wxWindow* parent, wxWindowID id,
+                 const wxPoint& pos,
+                 const wxSize& size,
+                 long style,
+                 const wxValidator& validator,
+                 char* name) :
+        wxListCtrl(parent, id, pos, size, style, validator, name) {}
+
+    bool Create(wxWindow* parent, wxWindowID id,
+                const wxPoint& pos,
+                const wxSize& size,
+                long style,
+                const wxValidator& validator,
+                char* name) {
+        return wxListCtrl::Create(parent, id, pos, size, style, validator, name);
+    }

 
 

-class wxListCtrl : public wxControl {
+    DEC_PYCALLBACK_STRING_LONGLONG(OnGetItemText);
+    DEC_PYCALLBACK_INT_LONG(OnGetItemImage);
+    DEC_PYCALLBACK_LISTATTR_LONG(OnGetItemAttr);
+
+    PYPRIVATE;
+};
+
+IMPLEMENT_ABSTRACT_CLASS(wxPyListCtrl, wxListCtrl);
+
+IMP_PYCALLBACK_STRING_LONGLONG(wxPyListCtrl, wxListCtrl, OnGetItemText);
+IMP_PYCALLBACK_INT_LONG(wxPyListCtrl, wxListCtrl, OnGetItemImage);
+IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr);
+%}
+
+
+
+%name(wxListCtrl)class wxPyListCtrl : public wxControl {

 public:
 public:

-    wxListCtrl(wxWindow* parent, wxWindowID id,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = wxLC_ICON,
-               const wxValidator& validator = wxDefaultValidator,
-               char* name = "listCtrl");
+    wxPyListCtrl(wxWindow* parent, wxWindowID id = -1,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxLC_ICON,
+                 const wxValidator& validator = wxDefaultValidator,
+                 char* name = "listCtrl");
+    %name(wxPreListCtrl)wxPyListCtrl();
+
+    bool Create(wxWindow* parent, wxWindowID id = -1,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxLC_ICON,
+                 const wxValidator& validator = wxDefaultValidator,
+                 char* name = "listCtrl");

 
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxListCtrl)"
+
+
+    // Set the control colours
+    bool SetForegroundColour(const wxColour& col);
+    bool SetBackgroundColour(const wxColour& col);
+
+    // Gets information about this column
+    bool GetColumn(int col, wxListItem& item) const;
+
+    // Sets information about this column
+    bool SetColumn(int col, wxListItem& item) ;
+
+    // Gets the column width
+    int GetColumnWidth(int col) const;
+
+    // Sets the column width
+    bool SetColumnWidth(int col, int width) ;
+
+    // Gets the number of items that can fit vertically in the
+    // visible area of the list control (list or report view)
+    // or the total number of items in the list control (icon
+    // or small icon view)
+    int GetCountPerPage() const;

 
 

-    bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
-    bool DeleteItem(long item);
-    bool DeleteAllItems();
-    bool DeleteColumn(int col);
-    bool DeleteAllColumns(void);
-    void ClearAll(void);

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-    wxTextCtrl* EditLabel(long item);
-    bool EndEditLabel(bool cancel);
-    wxTextCtrl* GetEditControl();
-#else
-    void EditLabel(long item);
+    // Gets the edit control for editing labels.
+    wxTextCtrl* GetEditControl() const;

 #endif
 #endif

-    bool EnsureVisible(long item);
-    long FindItem(long start, const wxString& str, bool partial = FALSE);
-    %name(FindItemData)long FindItem(long start, long data);
-    %name(FindItemAtPos)long FindItem(long start, const wxPoint& pt,
-                                      int direction);
-    bool GetColumn(int col, wxListItem& item);
-    int GetColumnWidth(int col);
-    int GetCountPerPage();
-    wxImageList* GetImageList(int which);
-    long GetItemData(long item);

 
 

+    //bool GetItem(wxListItem& info) const ;

     %addmethods {
     %addmethods {

+        // Gets information about the item

         %new wxListItem* GetItem(long itemId, int col=0) {
             wxListItem* info = new wxListItem;
             info->m_itemId = itemId;
         %new wxListItem* GetItem(long itemId, int col=0) {
             wxListItem* info = new wxListItem;
             info->m_itemId = itemId;


@@ -250,11 +452,54 @@ public:
             self->GetItem(*info);
             return info;
         }
             self->GetItem(*info);
             return info;
         }

+    }  // The OOR typemaps don't know what to do with the %new, so fix it up.
+    %pragma(python) addtoclass = "
+    def GetItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItem,(self,) + _args, _kwargs)
+        val.thisown = 1
+        return val
+    "
+
+
+    // Sets information about the item
+    bool SetItem(wxListItem& info) ;
+
+    // Sets a string field at a particular column
+    %name(SetStringItem)long SetItem(long index, int col, const wxString& label, int imageId = -1);
+
+    // Gets the item state
+    int  GetItemState(long item, long stateMask) const ;
+
+    // Sets the item state
+    bool SetItemState(long item, long state, long stateMask) ;
+
+    // Sets the item image
+    bool SetItemImage(long item, int image, int selImage) ;
+
+    // Gets the item text
+    wxString GetItemText(long item) const ;
+
+    // Sets the item text
+    void SetItemText(long item, const wxString& str) ;
+
+    // Gets the item data
+    long GetItemData(long item) const ;
+
+    // Sets the item data
+    bool SetItemData(long item, long data) ;
+
+
+    //bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
+    //bool GetItemPosition(long item, wxPoint& pos) const ;
+
+    // Gets the item position
+    %addmethods {

         %new wxPoint* GetItemPosition(long item) {
             wxPoint* pos = new wxPoint;
             self->GetItemPosition(item, *pos);
             return pos;
         }
         %new wxPoint* GetItemPosition(long item) {
             wxPoint* pos = new wxPoint;
             self->GetItemPosition(item, *pos);
             return pos;
         }

+        // Gets the item rectangle

         %new wxRect* GetItemRect(long item, int code = wxLIST_RECT_BOUNDS) {
             wxRect* rect= new wxRect;
             self->GetItemRect(item, *rect, code);
         %new wxRect* GetItemRect(long item, int code = wxLIST_RECT_BOUNDS) {
             wxRect* rect= new wxRect;
             self->GetItemRect(item, *rect, code);


@@ -262,65 +507,196 @@ public:
         }
     }
 
         }
     }
 

-    int GetItemState(long item, long stateMask);
-    int GetItemCount();
-    int GetItemSpacing(bool isSmall);
-    wxString GetItemText(long item);
-    long GetNextItem(long item,
-                     int geometry = wxLIST_NEXT_ALL,
-                     int state = wxLIST_STATE_DONTCARE);
-    int GetSelectedItemCount();
-#ifdef __WXMSW__
-    wxColour GetTextColour();
+
+    // Sets the item position
+    bool SetItemPosition(long item, const wxPoint& pos) ;
+
+    // Gets the number of items in the list control
+    int GetItemCount() const;
+
+    // Gets the number of columns in the list control
+    int GetColumnCount() const { return m_colCount; }
+
+    // Retrieves the spacing between icons in pixels.
+    // If small is TRUE, gets the spacing for the small icon
+    // view, otherwise the large icon view.
+    int GetItemSpacing(bool isSmall) const;
+
+    // Gets the number of selected items in the list control
+    int GetSelectedItemCount() const;
+
+    // Gets the text colour of the listview
+    wxColour GetTextColour() const;
+
+    // Sets the text colour of the listview

     void SetTextColour(const wxColour& col);
     void SetTextColour(const wxColour& col);

+
+    // Gets the index of the topmost visible item when in
+    // list or report view
+    long GetTopItem() const ;
+
+    // Add or remove a single window style
+    void SetSingleStyle(long style, bool add = TRUE) ;
+
+    // Set the whole window style
+    void SetWindowStyleFlag(long style) ;
+
+    // Searches for an item, starting from 'item'.
+    // item can be -1 to find the first item that matches the
+    // specified flags.
+    // Returns the item or -1 if unsuccessful.
+    long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const ;
+
+    // Gets one of the three image lists
+    wxImageList *GetImageList(int which) const ;
+
+    // Sets the image list
+    void SetImageList(wxImageList *imageList, int which) ;
+    void AssignImageList(wxImageList *imageList, int which) ;
+    %pragma(python) addtomethod = "AssignImageList:_args[0].thisown = 0"
+
+    // returns true if it is a virtual list control
+    bool IsVirtual() const;
+
+    // refresh items selectively (only useful for virtual list controls)
+    void RefreshItem(long item);
+    void RefreshItems(long itemFrom, long itemTo);
+
+
+
+
+    // Arranges the items
+    bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
+
+    // Deletes an item
+    bool DeleteItem(long item);
+
+    // Deletes all items
+    bool DeleteAllItems() ;
+
+    // Deletes a column
+    bool DeleteColumn(int col);
+
+    // Deletes all columns
+    bool DeleteAllColumns();
+
+    // Clears items, and columns if there are any.
+    void ClearAll();
+
+#ifdef __WXMSW__
+    // Edit the label
+    wxTextCtrl* EditLabel(long item /*, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl)*/);
+
+    // End label editing, optionally cancelling the edit
+    bool EndEditLabel(bool cancel);

 #endif
 #endif

-    long GetTopItem();
+
+    // Ensures this item is visible
+    bool EnsureVisible(long item) ;
+
+    // Find an item whose label matches this string, starting from the item after 'start'
+    // or the beginning if 'start' is -1.
+    long FindItem(long start, const wxString& str, bool partial = FALSE);
+
+    // Find an item whose data matches this data, starting from the item after 'start'
+    // or the beginning if 'start' is -1.
+    %name(FindItemData)long FindItem(long start, long data);
+
+    // Find an item nearest this position in the specified direction, starting from
+    // the item after 'start' or the beginning if 'start' is -1.
+    %name(FindItemAtPos)long FindItem(long start, const wxPoint& pt, int direction);
+
+    // Determines which item (if any) is at the specified point,
+    // giving details in the second return value (see wxLIST_HITTEST_... flags above)

     long HitTest(const wxPoint& point, int& OUTPUT);
     long HitTest(const wxPoint& point, int& OUTPUT);

+
+    // Inserts an item, returning the index of the new item if successful,
+    // -1 otherwise.
+    long InsertItem(wxListItem& info);
+
+    // Insert a string item
+    %name(InsertStringItem)long InsertItem(long index, const wxString& label);
+
+    // Insert an image item
+    %name(InsertImageItem)long InsertItem(long index, int imageIndex);
+
+    // Insert an image/string item
+    %name(InsertImageStringItem)long InsertItem(long index, const wxString& label, int imageIndex);
+
+    // For list view mode (only), inserts a column.

     %name(InsertColumnInfo)long InsertColumn(long col, wxListItem& info);
     %name(InsertColumnInfo)long InsertColumn(long col, wxListItem& info);

-    long InsertColumn(long col, const wxString& heading,
+
+    long InsertColumn(long col,
+                      const wxString& heading,

                       int format = wxLIST_FORMAT_LEFT,
                       int width = -1);
 
                       int format = wxLIST_FORMAT_LEFT,
                       int width = -1);
 

-    long InsertItem(wxListItem& info);
-    %name(InsertStringItem)     long InsertItem(long index, const wxString& label);
-    %name(InsertImageItem)      long InsertItem(long index, int imageIndex);
-    %name(InsertImageStringItem)long InsertItem(long index, const wxString& label,
-                                                int imageIndex);
+    // set the number of items in a virtual list control
+    void SetItemCount(long count);

 
 

+    // Scrolls the list control. If in icon, small icon or report view mode,
+    // x specifies the number of pixels to scroll. If in list view mode, x
+    // specifies the number of columns to scroll.
+    // If in icon, small icon or list view mode, y specifies the number of pixels
+    // to scroll. If in report view mode, y specifies the number of lines to scroll.

     bool ScrollList(int dx, int dy);
     bool ScrollList(int dx, int dy);

-    void SetBackgroundColour(const wxColour& col);
-    bool SetColumn(int col, wxListItem& item);
-    bool SetColumnWidth(int col, int width);
-    void SetImageList(wxImageList* imageList, int which);
-
-    bool SetItem(wxListItem& info);
-    %name(SetStringItem)long SetItem(long index, int col, const wxString& label,
-                                     int imageId = -1);
-
-    bool SetItemData(long item, long data);
-    bool SetItemImage(long item, int image, int selImage);
-    bool SetItemPosition(long item, const wxPoint& pos);
-    bool SetItemState(long item, long state, long stateMask);
-    void SetItemText(long item, const wxString& text);
-    void SetSingleStyle(long style, bool add = TRUE);
-    void SetWindowStyleFlag(long style);

 
     // bool SortItems(wxListCtrlCompare fn, long data);
     %addmethods {
 
     // bool SortItems(wxListCtrlCompare fn, long data);
     %addmethods {

+        // Sort items.
+        // func is a function which takes 2 long arguments: item1, item2.
+        // item1 is the long data associated with a first item (NOT the index).
+        // item2 is the long data associated with a second item (NOT the index).
+        // The return value is a negative number if the first item should precede the second
+        // item, a positive number of the second item should precede the first,
+        // or zero if the two items are equivalent.

         bool SortItems(PyObject* func) {
             if (!PyCallable_Check(func))
                 return FALSE;
         bool SortItems(PyObject* func) {
             if (!PyCallable_Check(func))
                 return FALSE;

-

             return self->SortItems(wxPyListCtrl_SortItems, (long)func);
         }
     }
             return self->SortItems(wxPyListCtrl_SortItems, (long)func);
         }
     }

+
+    %pragma(python) addtoclass = "
+    # Some helpers...
+
+    def Select(self, idx, on=1):
+        '''[de]select an item'''
+        if on: state = wxLIST_STATE_SELECTED
+        else: state = 0
+        self.SetItemState(idx, state, wxLIST_STATE_SELECTED)
+
+    def Focus(self, idx):
+        '''Focus and show the given item'''
+        self.SetItemState(idx, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED)
+        self.EnsureVisible(idx)
+
+    def GetFocusedItem(self):
+        '''get the currently focused item or -1 if none'''
+        return self.GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED)
+
+    def IsSelected(self, idx):
+        '''return TRUE if the item is selected'''
+        return self.GetItemState(idx, wxLIST_STATE_SELECTED) != 0
+
+    def SetColumnImage(self, col, image):
+        item = wxListItem()
+        item.SetMask(wxLIST_MASK_IMAGE)
+        item.SetImage(image)
+        self.SetColumn(col, item)
+
+    def ClearColumnImage(self, col):
+        self.SetColumnImage(col, -1)
+    "

 };
 
 };
 

-%{
+
+
+%{ // Python aware sorting function for wxPyListCtrl

     int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
         int retval = 0;
         PyObject* func = (PyObject*)funcPtr;
     int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
         int retval = 0;
         PyObject* func = (PyObject*)funcPtr;

-        bool doSave = wxPyRestoreThread();
+        wxPyTState* state = wxPyBeginBlockThreads();

 
         PyObject* args = Py_BuildValue("(ii)", item1, item2);
         PyObject* result = PyEval_CallObject(func, args);
 
         PyObject* args = Py_BuildValue("(ii)", item1, item2);
         PyObject* result = PyEval_CallObject(func, args);


@@ -330,7 +706,7 @@ public:
             Py_DECREF(result);
         }
 
             Py_DECREF(result);
         }
 

-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);

         return retval;
     }
 
         return retval;
     }
 


@@ -338,6 +714,71 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+class wxListView : public wxPyListCtrl
+{
+public:
+    wxListView( wxWindow *parent,
+                wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxLC_REPORT,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString &name = "listctrl" );
+    %name(wxPreListView)wxListView();
+
+    bool Create( wxWindow *parent,
+                wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxLC_REPORT,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString &name = "listctrl" );
+
+
+    // [de]select an item
+    void Select(long n, bool on = TRUE);
+
+    // focus and show the given item
+    void Focus(long index);
+
+    // get the currently focused item or -1 if none
+    long GetFocusedItem() const;
+
+    // get first and subsequent selected items, return -1 when no more
+    long GetNextSelected(long item) const;
+    long GetFirstSelected() const;
+
+    // return TRUE if the item is selected
+    bool IsSelected(long index);
+
+    void SetColumnImage(int col, int image);
+    void ClearColumnImage(int col);
+};
+
+
+//----------------------------------------------------------------------
+
+// wxTreeCtrl flags
+enum {
+    wxTR_NO_BUTTONS,
+    wxTR_HAS_BUTTONS,
+    wxTR_TWIST_BUTTONS,
+    wxTR_NO_LINES,
+    wxTR_MAC_BUTTONS,
+
+    wxTR_SINGLE,
+    wxTR_MULTIPLE,
+    wxTR_EXTENDED,
+
+    wxTR_EDIT_LABELS,
+    wxTR_LINES_AT_ROOT,
+    wxTR_HIDE_ROOT,
+    wxTR_ROW_LINES,
+    wxTR_HAS_VARIABLE_ROW_HEIGHT,
+
+    wxTR_DEFAULT_STYLE,
+};
+

 enum wxTreeItemIcon
 {
     wxTreeItemIcon_Normal,              // not selected, not expanded
 enum wxTreeItemIcon
 {
     wxTreeItemIcon_Normal,              // not selected, not expanded


@@ -367,6 +808,112 @@ enum {
 };
 
 
 };
 
 

+enum {
+    /* Tree control event types */
+    wxEVT_COMMAND_TREE_BEGIN_DRAG,
+    wxEVT_COMMAND_TREE_BEGIN_RDRAG,
+    wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT,
+    wxEVT_COMMAND_TREE_END_LABEL_EDIT,
+    wxEVT_COMMAND_TREE_DELETE_ITEM,
+    wxEVT_COMMAND_TREE_GET_INFO,
+    wxEVT_COMMAND_TREE_SET_INFO,
+    wxEVT_COMMAND_TREE_ITEM_EXPANDED,
+    wxEVT_COMMAND_TREE_ITEM_EXPANDING,
+    wxEVT_COMMAND_TREE_ITEM_COLLAPSED,
+    wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
+    wxEVT_COMMAND_TREE_SEL_CHANGED,
+    wxEVT_COMMAND_TREE_SEL_CHANGING,
+    wxEVT_COMMAND_TREE_KEY_DOWN,
+    wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
+    wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,
+    wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK,
+    wxEVT_COMMAND_TREE_END_DRAG,
+};
+
+
+%pragma(python) code = "
+# wxTreeCtrl events
+def EVT_TREE_BEGIN_DRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_DRAG, func)
+
+def EVT_TREE_BEGIN_RDRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_RDRAG, func)
+
+def EVT_TREE_END_DRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_END_DRAG, func)
+
+def EVT_TREE_BEGIN_LABEL_EDIT(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, func)
+
+def EVT_TREE_END_LABEL_EDIT(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_END_LABEL_EDIT, func)
+
+def EVT_TREE_GET_INFO(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_GET_INFO, func)
+
+def EVT_TREE_SET_INFO(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_SET_INFO, func)
+
+def EVT_TREE_ITEM_EXPANDED(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_EXPANDED, func)
+
+def EVT_TREE_ITEM_EXPANDING(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_EXPANDING, func)
+
+def EVT_TREE_ITEM_COLLAPSED(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_COLLAPSED, func)
+
+def EVT_TREE_ITEM_COLLAPSING(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_COLLAPSING, func)
+
+def EVT_TREE_SEL_CHANGED(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_SEL_CHANGED, func)
+
+def EVT_TREE_SEL_CHANGING(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_SEL_CHANGING, func)
+
+def EVT_TREE_KEY_DOWN(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_KEY_DOWN, func)
+
+def EVT_TREE_DELETE_ITEM(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_DELETE_ITEM, func)
+
+def EVT_TREE_ITEM_ACTIVATED(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_ACTIVATED, func)
+
+def EVT_TREE_ITEM_RIGHT_CLICK(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, func)
+
+def EVT_TREE_ITEM_MIDDLE_CLICK(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, func)
+"
+
+
+class wxTreeItemAttr
+{
+public:
+    // ctors
+    //wxTreeItemAttr() { }
+    wxTreeItemAttr(const wxColour& colText = wxNullColour,
+                   const wxColour& colBack = wxNullColour,
+                   const wxFont& font = wxNullFont);
+
+    // setters
+    void SetTextColour(const wxColour& colText);
+    void SetBackgroundColour(const wxColour& colBack);
+    void SetFont(const wxFont& font);
+
+    // accessors
+    bool HasTextColour();
+    bool HasBackgroundColour();
+    bool HasFont();
+
+    const wxColour& GetTextColour();
+    const wxColour& GetBackgroundColour();
+    const wxFont& GetFont();
+};
+
+

 class wxTreeItemId {
 public:
     wxTreeItemId();
 class wxTreeItemId {
 public:
     wxTreeItemId();


@@ -394,9 +941,9 @@ public:
     }
 
     ~wxPyTreeItemData() {
     }
 
     ~wxPyTreeItemData() {

-        bool doSave = wxPyRestoreThread();
+        wxPyTState* state = wxPyBeginBlockThreads();

         Py_DECREF(m_obj);
         Py_DECREF(m_obj);

-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);

     }
 
     PyObject* GetData() {
     }
 
     PyObject* GetData() {


@@ -405,9 +952,9 @@ public:
     }
 
     void SetData(PyObject* obj) {
     }
 
     void SetData(PyObject* obj) {

-        bool doSave = wxPyRestoreThread();
+        wxPyTState* state = wxPyBeginBlockThreads();

         Py_DECREF(m_obj);
         Py_DECREF(m_obj);

-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);

         m_obj = obj;
         Py_INCREF(obj);
     }
         m_obj = obj;
         Py_INCREF(obj);
     }


@@ -418,7 +965,7 @@ public:
 
 
 
 
 
 

-%name(wxTreeItemData) class wxPyTreeItemData {
+%name(wxTreeItemData) class wxPyTreeItemData : public wxObject {

 public:
     wxPyTreeItemData(PyObject* obj = NULL);
 
 public:
     wxPyTreeItemData(PyObject* obj = NULL);
 


@@ -433,18 +980,23 @@ public:
 
 class wxTreeEvent : public wxNotifyEvent {
 public:
 
 class wxTreeEvent : public wxNotifyEvent {
 public:

+    wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
+

     wxTreeItemId GetItem();
     wxTreeItemId GetOldItem();
     wxPoint GetPoint();
     wxTreeItemId GetItem();
     wxTreeItemId GetOldItem();
     wxPoint GetPoint();

+    const wxKeyEvent& GetKeyEvent();

     int GetCode();
     const wxString& GetLabel();
 };
 
 
 
     int GetCode();
     const wxString& GetLabel();
 };
 
 
 

-%{
+%{ // C++ version of Python aware wxTreeCtrl

 class wxPyTreeCtrl : public wxTreeCtrl {
 class wxPyTreeCtrl : public wxTreeCtrl {

+    DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl);

 public:
 public:

+    wxPyTreeCtrl() : wxTreeCtrl() {}

     wxPyTreeCtrl(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos,
                  const wxSize& size,
     wxPyTreeCtrl(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos,
                  const wxSize& size,


@@ -453,24 +1005,36 @@ public:
                  char* name) :
         wxTreeCtrl(parent, id, pos, size, style, validator, name) {}
 
                  char* name) :
         wxTreeCtrl(parent, id, pos, size, style, validator, name) {}
 

+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxPoint& pos,
+                const wxSize& size,
+                long style,
+                const wxValidator& validator,
+                char* name) {
+        return wxTreeCtrl::Create(parent, id, pos, size, style, validator, name);
+    }
+

 
     int OnCompareItems(const wxTreeItemId& item1,
                        const wxTreeItemId& item2) {
         int rval = 0;
 
     int OnCompareItems(const wxTreeItemId& item1,
                        const wxTreeItemId& item2) {
         int rval = 0;

-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("OnCompareItems"))
+        bool found;
+        wxPyTState* state = wxPyBeginBlockThreads();
+        if ((found = m_myInst.findCallback("OnCompareItems")))

             rval = m_myInst.callCallback(Py_BuildValue(
                 "(OO)",
                 wxPyConstructObject((void*)&item1, "wxTreeItemId"),
                 wxPyConstructObject((void*)&item2, "wxTreeItemId")));
             rval = m_myInst.callCallback(Py_BuildValue(
                 "(OO)",
                 wxPyConstructObject((void*)&item1, "wxTreeItemId"),
                 wxPyConstructObject((void*)&item2, "wxTreeItemId")));

-        else
+        wxPyEndBlockThreads(state);
+        if (! found)

             rval = wxTreeCtrl::OnCompareItems(item1, item2);
             rval = wxTreeCtrl::OnCompareItems(item1, item2);

-        wxPySaveThread(doSave);

         return rval;
     }
     PYPRIVATE;
 };
 
         return rval;
     }
     PYPRIVATE;
 };
 

+IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl);
+

 %}
 
 // These are for the GetFirstChild/GetNextChild methods below
 %}
 
 // These are for the GetFirstChild/GetNextChild methods below


@@ -486,9 +1050,16 @@ public:
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                const wxValidator& validator = wxDefaultValidator,
                char* name = "wxTreeCtrl");
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                const wxValidator& validator = wxDefaultValidator,
                char* name = "wxTreeCtrl");

+    %name(wxPreTreeCtrl)wxPyTreeCtrl();
+
+    bool Create(wxWindow *parent, wxWindowID id = -1,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
+               const wxValidator& validator = wxDefaultValidator,
+               char* name = "wxTreeCtrl");

 
     void _setSelf(PyObject* self, PyObject* _class);
 
     void _setSelf(PyObject* self, PyObject* _class);

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"

     %pragma(python) addtomethod = "__init__:self._setSelf(self, wxTreeCtrl)"
 
     size_t GetCount();
     %pragma(python) addtomethod = "__init__:self._setSelf(self, wxTreeCtrl)"
 
     size_t GetCount();


@@ -496,8 +1067,12 @@ public:
     void SetIndent(unsigned int indent);
     wxImageList *GetImageList();
     wxImageList *GetStateImageList();
     void SetIndent(unsigned int indent);
     wxImageList *GetImageList();
     wxImageList *GetStateImageList();

-    void SetImageList(wxImageList *imageList/*, int which = wxIMAGE_LIST_NORMAL*/);
+    void SetImageList(wxImageList *imageList);

     void SetStateImageList(wxImageList *imageList);
     void SetStateImageList(wxImageList *imageList);

+    void AssignImageList(wxImageList* imageList);
+    %pragma(python) addtomethod = "AssignImageList:_args[0].thisown = 0"
+    void AssignStateImageList(wxImageList* imageList);
+    %pragma(python) addtomethod = "AssignStateImageList:_args[0].thisown = 0"

 
     unsigned int GetSpacing();
     void SetSpacing(unsigned int spacing);
 
     unsigned int GetSpacing();
     void SetSpacing(unsigned int spacing);


@@ -566,7 +1141,7 @@ public:
     //size_t GetSelections(wxArrayTreeItemIds& selection);
     %addmethods {
         PyObject* GetSelections() {
     //size_t GetSelections(wxArrayTreeItemIds& selection);
     %addmethods {
         PyObject* GetSelections() {

-            bool doSave = wxPyRestoreThread();
+            wxPyTState* state = wxPyBeginBlockThreads();

             PyObject*           rval = PyList_New(0);
             wxArrayTreeItemIds  array;
             size_t              num, x;
             PyObject*           rval = PyList_New(0);
             wxArrayTreeItemIds  array;
             size_t              num, x;


@@ -576,7 +1151,7 @@ public:
                 PyObject* item = wxPyConstructObject((void*)tii, "wxTreeItemId", TRUE);
                 PyList_Append(rval, item);
             }
                 PyObject* item = wxPyConstructObject((void*)tii, "wxTreeItemId", TRUE);
                 PyList_Append(rval, item);
             }

-            wxPySaveThread(doSave);
+            wxPyEndBlockThreads(state);

             return rval;
         }
     }
             return rval;
         }
     }


@@ -661,10 +1236,10 @@ public:
         PyObject* GetBoundingRect(const wxTreeItemId& item, int textOnly = FALSE) {
             wxRect rect;
             if (self->GetBoundingRect(item, rect, textOnly)) {
         PyObject* GetBoundingRect(const wxTreeItemId& item, int textOnly = FALSE) {
             wxRect rect;
             if (self->GetBoundingRect(item, rect, textOnly)) {

-                bool doSave = wxPyRestoreThread();
+                wxPyTState* state = wxPyBeginBlockThreads();

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

-                wxPySaveThread(doSave);
+                wxPyEndBlockThreads(state);

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


@@ -698,57 +1273,12 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-#ifdef SKIPTHIS
-#ifdef __WXMSW__
-class wxTabEvent : public wxCommandEvent {
-public:
-};
-
-
-
-class wxTabCtrl : public wxControl {
-public:
-    wxTabCtrl(wxWindow* parent, wxWindowID id,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = 0,
-              char* name = "tabCtrl");
-
-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
-
-    bool DeleteAllItems();
-    bool DeleteItem(int item);
-    wxImageList* GetImageList();
-    int GetItemCount();
-    // TODO: void* GetItemData();
-    int GetItemImage(int item);
-
-    %addmethods {
-        %new wxRect* GetItemRect(int item) {
-            wxRect* rect = new wxRect;
-            self->GetItemRect(item, *rect);
-            return rect;
-        }
-    }
-
-    wxString GetItemText(int item);
-    bool GetRowCount();
-    int GetSelection();
-    int HitTest(const wxPoint& pt, long& OUTPUT);
-    void InsertItem(int item, const wxString& text,
-                    int imageId = -1, void* clientData = NULL);
-    // TODO: bool SetItemData(int item, void* data);
-    bool SetItemImage(int item, int image);
-    void SetImageList(wxImageList* imageList);
-    void SetItemSize(const wxSize& size);
-    bool SetItemText(int item, const wxString& text);
-    void SetPadding(const wxSize& padding);
-    int SetSelection(int item);
-
-};
-
-#endif
-#endif
+%init %{
+    // Map renamed classes back to their common name for OOR
+    wxPyPtrTypeMap_Add("wxTreeItemData", "wxPyTreeItemData");
+    wxPyPtrTypeMap_Add("wxTreeCtrl", "wxPyTreeCtrl");
+    wxPyPtrTypeMap_Add("wxListCtrl", "wxPyListCtrl");
+%}

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