X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bf5d46efb26ab22575ca9bc0d0ca5d32d6b77a3..d29aba2ff72e12d2451ae23aa80c5a3e0e039e74:/utils/wxPython/src/controls2.i

diff --git a/utils/wxPython/src/controls2.i b/utils/wxPython/src/controls2.i
index 8a8f6b72bc..4d4911a575 100644
--- a/utils/wxPython/src/controls2.i
+++ b/utils/wxPython/src/controls2.i
@@ -14,6 +14,9 @@
 
 %{
 #include "helpers.h"
+#ifdef __WXMSW__
+#include <windows.h>
+#endif
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
 %}
@@ -158,9 +161,10 @@ public:
     long GetItemData(long item);
 
     %addmethods {
-        %new wxListItem* GetItem(long itemId) {
+        %new wxListItem* GetItem(long itemId, int col=0) {
             wxListItem* info = new wxListItem;
             info->m_itemId = itemId;
+            info->m_col = col;
             self->GetItem(*info);
             return info;
         }
@@ -225,6 +229,15 @@ public:
 
 //----------------------------------------------------------------------
 
+enum wxTreeItemIcon
+{
+    wxTreeItemIcon_Normal,              // not selected, not expanded
+    wxTreeItemIcon_Selected,            //     selected, not expanded
+    wxTreeItemIcon_Expanded,            // not selected,     expanded
+    wxTreeItemIcon_SelectedExpanded,    //     selected,     expanded
+    wxTreeItemIcon_Max
+};
+
 
 class wxTreeItemId {
 public:
@@ -247,13 +260,9 @@ public:
     }
 
     ~wxPyTreeItemData() {
-#ifdef WXP_WITH_THREAD
-        PyEval_RestoreThread(wxPyEventThreadState);
-#endif
+        bool doSave = wxPyRestoreThread();
 	Py_DECREF(m_obj);
-#ifdef WXP_WITH_THREAD
-        PyEval_SaveThread();
-#endif
+        wxPySaveThread(doSave);
     }
 
     PyObject* GetData() {
@@ -317,15 +326,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);
 
@@ -375,6 +389,23 @@ public:
     wxTreeItemId GetRootItem();
     wxTreeItemId GetSelection();
     wxTreeItemId GetParent(const wxTreeItemId& item);
+    //size_t GetSelections(wxArrayTreeItemIds& selection);
+    %addmethods {
+        PyObject* GetSelections() {
+            PyObject*           rval = PyList_New(0);
+            wxArrayTreeItemIds  array;
+            size_t              num, x;
+            num = self->GetSelections(array);
+            for (x=0; x < num; x++) {
+                PyObject* item = wxPyConstructObject((void*)&array.Item(x),
+                                                     "wxTreeItemId");
+                PyList_Append(rval, item);
+            }
+            return rval;
+        }
+    }
+
+
 
     size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = TRUE);
 
@@ -385,6 +416,8 @@ public:
     wxTreeItemId GetFirstVisibleItem();
     wxTreeItemId GetNextVisible(const wxTreeItemId& item);
     wxTreeItemId GetPrevVisible(const wxTreeItemId& item);
+    wxTreeItemId GetLastChild(const wxTreeItemId& item);
+
 
 
     wxTreeItemId AddRoot(const wxString& text,
@@ -421,19 +454,34 @@ public:
 #ifdef __WXMSW__
     wxTextCtrl* EditLabel(const wxTreeItemId& item);
     wxTextCtrl* GetEditControl();
-    void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE);
+    void EndEditLabel(const wxTreeItemId& item, int discardChanges = FALSE);
 #else
     void EditLabel(const wxTreeItemId& item);
 #endif
 
-//    void SortChildren(const wxTreeItemId& item);
-                      // **** And this too
-                      // wxTreeItemCmpFunc *cmpFunction = NULL);
+    void SortChildren(const wxTreeItemId& item);
 
-    void SetItemBold(const wxTreeItemId& item, bool bold = TRUE);
+    void SetItemBold(const wxTreeItemId& item, int bold = TRUE);
     bool IsBold(const wxTreeItemId& item) const;
     wxTreeItemId HitTest(const wxPoint& point);
 
+#ifdef __WXMSW__
+    void SetItemDropHighlight(const wxTreeItemId& item, int highlight = TRUE);
+
+    //bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, int textOnly = FALSE)
+    %addmethods {
+        PyObject* GetBoundingRect(const wxTreeItemId& item, int textOnly = FALSE) {
+            wxRect rect;
+            if (self->GetBoundingRect(item, rect, textOnly))
+                return wxPyConstructObject((void*)&rect, "wxRect");
+            else {
+                Py_INCREF(Py_None);
+                return Py_None;
+            }
+        }
+    }
+#endif
+
 %pragma(python) addtoclass = "
     # Redefine a couple methods that SWIG gets a bit confused on...
     def GetFirstChild(self,arg0,arg1):