Further fixes for wx-config and MacOS X.

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

diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index 8090773f397ae87effc2f9b1179e86fc60cbb24a..871049d0cf85c951d31a3f103a4cc1d8fa03a029 100644 (file)
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -410,9 +410,11 @@ public:
                  const wxValidator& validator = wxDefaultValidator,
                  char* name = "listCtrl");
 
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxListCtrl)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxListCtrl)"
 
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreListCtrl:val._setOORInfo(self)"
 
     // Set the control colours
     bool SetForegroundColour(const wxColour& col);
@@ -562,9 +564,6 @@ public:
     void RefreshItem(long item);
     void RefreshItems(long itemFrom, long itemTo);
 
-
-
-
     // Arranges the items
     bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
 
@@ -734,6 +733,8 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString &name = "listctrl" );
 
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreListView:val._setOORInfo(self)"
 
     // [de]select an item
     void Select(long n, bool on = TRUE);
@@ -985,6 +986,7 @@ public:
     wxTreeItemId GetItem();
     wxTreeItemId GetOldItem();
     wxPoint GetPoint();
+    const wxKeyEvent& GetKeyEvent();
     int GetCode();
     const wxString& GetLabel();
 };
@@ -1058,8 +1060,11 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                char* name = "wxTreeCtrl");
 
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxTreeCtrl)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxTreeCtrl)"
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreTreeCtrl:val._setOORInfo(self)"
 
     size_t GetCount();
     unsigned int GetIndent();