X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d37f9642887a5602d7c0b59527f213c32dd501a..922ba68045d84789ab1dfceb4d1aa1b6e2c5e810:/wxPython/src/controls2.i

diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index d0b3ae8bea..265dcc0a60 100644
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -64,7 +64,7 @@ enum {
     wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
     wxEVT_COMMAND_LIST_COL_DRAGGING,
     wxEVT_COMMAND_LIST_COL_END_DRAG,
-
+    wxEVT_COMMAND_LIST_ITEM_FOCUSED,
 };
 
 
@@ -131,6 +131,9 @@ def EVT_LIST_ITEM_ACTIVATED(win, id, func):
 
 def EVT_LIST_CACHE_HINT(win, id, func):
     win.Connect(id, -1, wxEVT_COMMAND_LIST_CACHE_HINT, func)
+
+def EVT_LIST_ITEM_FOCUSED(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_FOCUSED, func)
 "
 
 
@@ -256,9 +259,9 @@ public:
     bool HasBackgroundColour();
     bool HasFont();
 
-    const wxColour& GetTextColour();
-    const wxColour& GetBackgroundColour();
-    const wxFont& GetFont();
+    wxColour GetTextColour();
+    wxColour GetBackgroundColour();
+    wxFont GetFont();
 };
 
 
@@ -329,19 +332,15 @@ public:
     wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 
     int           m_code;
-    long          m_itemIndex;
     long          m_oldItemIndex;
+    long          m_itemIndex;
     int           m_col;
-    bool          m_cancelled;
     wxPoint       m_pointDrag;
     wxListItem    m_item;
 
     int GetCode();
     long GetIndex();
-    long GetOldIndex();
-    long GetOldItem();
     int GetColumn();
-    bool Cancelled();
     wxPoint GetPoint();
     const wxString& GetLabel();
     const wxString& GetText();
@@ -414,7 +413,7 @@ public:
     %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxListCtrl)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
-    %pragma(python) addtomethod = "wxPreListCtrl:val._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreListCtrl:val._setOORInfo(val)"
 
     // Set the control colours
     bool SetForegroundColour(const wxColour& col);
@@ -734,7 +733,7 @@ public:
                 const wxString &name = "listctrl" );
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
-    %pragma(python) addtomethod = "wxPreListView:val._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreListView:val._setOORInfo(val)"
 
     // [de]select an item
     void Select(long n, bool on = TRUE);
@@ -909,9 +908,9 @@ public:
     bool HasBackgroundColour();
     bool HasFont();
 
-    const wxColour& GetTextColour();
-    const wxColour& GetBackgroundColour();
-    const wxFont& GetFont();
+    wxColour GetTextColour();
+    wxColour GetBackgroundColour();
+    wxFont GetFont();
 };
 
 
@@ -920,6 +919,7 @@ public:
     wxTreeItemId();
     ~wxTreeItemId();
     bool IsOk();
+    %pragma(python) addtoclass = "Ok = IsOk"
 
     %addmethods {
         int __cmp__(wxTreeItemId* other) {
@@ -1064,7 +1064,7 @@ public:
     %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxTreeCtrl)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
-    %pragma(python) addtomethod = "wxPreTreeCtrl:val._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreTreeCtrl:val._setOORInfo(val)"
 
     size_t GetCount();
     unsigned int GetIndent();
@@ -1234,6 +1234,7 @@ public:
 
 #ifdef __WXMSW__
     void SetItemDropHighlight(const wxTreeItemId& item, int highlight = TRUE);
+#endif
 
     //bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, int textOnly = FALSE)
     %addmethods {
@@ -1252,7 +1253,7 @@ public:
             }
         }
     }
-#endif
+
 
 %pragma(python) addtoclass = "
     # Redefine some methods that SWIG gets a bit confused on...
@@ -1272,6 +1273,7 @@ public:
         val1.thisown = 1
         return (val1,val2)
 "
+
 };