X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/137b5242b1834999da2883c7a68fbde28c6fba37..2361ce822f82cd4964066319b2253562bf4de84b:/wxPython/src/controls2.i?ds=sidebyside

diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index ef63593dc1..2ca2e9a39e 100644
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -45,7 +45,7 @@
     const wxChar* wxListCtrlNameStr = _T("wxListCtrl");
     DECLARE_DEF_STRING(ListCtrlNameStr);
 
-    const wxChar* wx_TreeCtrlNameStr = _T("wxListCtrl");
+    const wxChar* wx_TreeCtrlNameStr = _T("wxTreeCtrl");
     DECLARE_DEF_STRING(_TreeCtrlNameStr);
     DECLARE_DEF_STRING(DirDialogDefaultFolderStr);
 
@@ -344,12 +344,14 @@ class wxListEvent: public wxNotifyEvent {
 public:
     wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 
+%readonly
     int           m_code;
     long          m_oldItemIndex;
     long          m_itemIndex;
     int           m_col;
     wxPoint       m_pointDrag;
     wxListItem    m_item;
+%readwrite
 
     int GetCode();
     long GetIndex();
@@ -667,21 +669,11 @@ public:
     // to scroll. If in report view mode, y specifies the number of lines to scroll.
     bool ScrollList(int dx, int dy);
 
-    // 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;
-            return self->SortItems(wxPyListCtrl_SortItems, (long)func);
-        }
-    }
+    void SetItemTextColour( long item, const wxColour& col);
+    wxColour GetItemTextColour( long item ) const;
+    void SetItemBackgroundColour( long item, const wxColour &col);
+    wxColour GetItemBackgroundColour( long item ) const;
+
 
     %pragma(python) addtoclass = "
     # Some helpers...
@@ -724,6 +716,23 @@ public:
                 self.SetStringItem(pos, i, str(entry[i]))
             return pos
     "
+
+
+    // 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;
+            return self->SortItems(wxPyListCtrl_SortItems, (long)func);
+        }
+    }
 };
 
 
@@ -1325,6 +1334,10 @@ enum {
     wxDIRCTRL_SELECT_FIRST,
     wxDIRCTRL_SHOW_FILTERS,
     wxDIRCTRL_3D_INTERNAL,
+    wxDIRCTRL_EDIT_LABELS,
+
+    wxID_TREECTRL,
+    wxID_FILTERLISTCTRL,
 };