Committing in .

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

diff --git a/utils/wxPython/src/controls2.i b/utils/wxPython/src/controls2.i
index 804b3465c793d07afb5eb8c8fde84ada16fff750..f2cfc6430f39369fd7b586ebf21cef6dc320a49d 100644 (file)
--- a/utils/wxPython/src/controls2.i
+++ b/utils/wxPython/src/controls2.i
@@ -165,6 +165,7 @@ public:
             wxListItem* info = new wxListItem;
             info->m_itemId = itemId;
             info->m_col = col;
+            info->m_mask = 0xFFFF;
             self->GetItem(*info);
             return info;
         }
@@ -222,13 +223,68 @@ public:
     void SetItemText(long item, const wxString& text);
     void SetSingleStyle(long style, bool add = TRUE);
     void SetWindowStyleFlag(long style);
-    // TODO:  bool SortItems(wxListCtrlCompare fn, long data);
+
+    // bool SortItems(wxListCtrlCompare fn, long data);
+    %addmethods {
+        bool SortItems(PyObject* func) {
+            if (!PyCallable_Check(func))
+                return FALSE;
+
+            return self->SortItems(wxPyTreeCtrl_SortItems, (long)func);
+        }
+    }
 };
 
+%{
+    int wxCALLBACK wxPyTreeCtrl_SortItems(long item1, long item2, long funcPtr) {
+        int retval = 0;
+        PyObject* func = (PyObject*)funcPtr;
+        bool doSave = wxPyRestoreThread();
+
+        PyObject* args = Py_BuildValue("(ii)", item1, item2);
+        PyObject* result = PyEval_CallObject(func, args);
+        Py_DECREF(args);
+        if (result) {
+            retval = PyInt_AsLong(result);
+            Py_DECREF(result);
+        }
 
+        wxPySaveThread(doSave);
+        return retval;
+    }
+
+%}
 
 //----------------------------------------------------------------------
 
+enum wxTreeItemIcon
+{
+    wxTreeItemIcon_Normal,              // not selected, not expanded
+    wxTreeItemIcon_Selected,            //     selected, not expanded
+    wxTreeItemIcon_Expanded,            // not selected,     expanded
+    wxTreeItemIcon_SelectedExpanded,    //     selected,     expanded
+    wxTreeItemIcon_Max
+};
+
+
+// constants for HitTest
+enum {
+    wxTREE_HITTEST_ABOVE,
+    wxTREE_HITTEST_BELOW,
+    wxTREE_HITTEST_NOWHERE,
+    wxTREE_HITTEST_ONITEMBUTTON,
+    wxTREE_HITTEST_ONITEMICON,
+    wxTREE_HITTEST_ONITEMINDENT,
+    wxTREE_HITTEST_ONITEMLABEL,
+    wxTREE_HITTEST_ONITEMRIGHT,
+    wxTREE_HITTEST_ONITEMSTATEICON,
+    wxTREE_HITTEST_TOLEFT,
+    wxTREE_HITTEST_TORIGHT,
+    wxTREE_HITTEST_ONITEMUPPERPART,
+    wxTREE_HITTEST_ONITEMLOWERPART,
+    wxTREE_HITTEST_ONITEM
+};
+
 
 class wxTreeItemId {
 public:
@@ -317,18 +373,20 @@ public:
     void SetIndent(unsigned int indent);
     wxImageList *GetImageList();
     wxImageList *GetStateImageList();
-    void SetImageList(wxImageList *imageList);
+    void SetImageList(wxImageList *imageList/*, int which = wxIMAGE_LIST_NORMAL*/);
     void SetStateImageList(wxImageList *imageList);
 
     unsigned int GetSpacing();
     void SetSpacing(unsigned int spacing);
 
     wxString GetItemText(const wxTreeItemId& item);
-    int GetItemImage(const wxTreeItemId& item);
+    int GetItemImage(const wxTreeItemId& item,
+                     wxTreeItemIcon which = wxTreeItemIcon_Normal);
     int GetItemSelectedImage(const wxTreeItemId& item);
 
     void SetItemText(const wxTreeItemId& item, const wxString& text);
-    void SetItemImage(const wxTreeItemId& item, int image);
+    void SetItemImage(const wxTreeItemId& item, int image,
+                      wxTreeItemIcon which = wxTreeItemIcon_Normal);
     void SetItemSelectedImage(const wxTreeItemId& item, int image);
     void SetItemHasChildren(const wxTreeItemId& item, bool hasChildren = TRUE);
 
@@ -377,10 +435,11 @@ public:
 
     wxTreeItemId GetRootItem();
     wxTreeItemId GetSelection();
-    wxTreeItemId GetParent(const wxTreeItemId& item);
+    %name(GetItemParent) wxTreeItemId GetParent(const wxTreeItemId& item);
     //size_t GetSelections(wxArrayTreeItemIds& selection);
     %addmethods {
         PyObject* GetSelections() {
+            bool doSave = wxPyRestoreThread();
             PyObject*           rval = PyList_New(0);
             wxArrayTreeItemIds  array;
             size_t              num, x;
@@ -390,6 +449,7 @@ public:
                                                      "wxTreeItemId");
                 PyList_Append(rval, item);
             }
+            wxPySaveThread(doSave);
             return rval;
         }
     }
@@ -452,7 +512,11 @@ public:
 
     void SetItemBold(const wxTreeItemId& item, int bold = TRUE);
     bool IsBold(const wxTreeItemId& item) const;
-    wxTreeItemId HitTest(const wxPoint& point);
+    wxTreeItemId HitTest(const wxPoint& point, int& OUTPUT);
+
+    void SetItemTextColour(const wxTreeItemId& item, const wxColour& col);
+    void SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col);
+    void SetItemFont(const wxTreeItemId& item, const wxFont& font);
 
 #ifdef __WXMSW__
     void SetItemDropHighlight(const wxTreeItemId& item, int highlight = TRUE);
@@ -461,8 +525,13 @@ public:
     %addmethods {
         PyObject* GetBoundingRect(const wxTreeItemId& item, int textOnly = FALSE) {
             wxRect rect;
-            if (self->GetBoundingRect(item, rect, textOnly))
-                return wxPyConstructObject((void*)&rect, "wxRect");
+            if (self->GetBoundingRect(item, rect, textOnly)) {
+                bool doSave = wxPyRestoreThread();
+                wxRect* r = new wxRect(rect);
+                PyObject* val = wxPyConstructObject((void*)r, "wxRect");
+                wxPySaveThread(doSave);
+                return val;
+            }
             else {
                 Py_INCREF(Py_None);
                 return Py_None;