implemented late(r) initialization of wxUniv themes

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

diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index 871049d0cf85c951d31a3f103a4cc1d8fa03a029..e19424491231fecb3d3552bd192256a6bc76cd8c 100644 (file)
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -330,7 +330,6 @@ public:
 
     int           m_code;
     long          m_itemIndex;
 
     int           m_code;
     long          m_itemIndex;

-    long          m_oldItemIndex;

     int           m_col;
     bool          m_cancelled;
     wxPoint       m_pointDrag;
     int           m_col;
     bool          m_cancelled;
     wxPoint       m_pointDrag;


@@ -338,8 +337,6 @@ public:
 
     int GetCode();
     long GetIndex();
 
     int GetCode();
     long GetIndex();

-    long GetOldIndex();
-    long GetOldItem();

     int GetColumn();
     bool Cancelled();
     wxPoint GetPoint();
     int GetColumn();
     bool Cancelled();
     wxPoint GetPoint();


@@ -414,7 +411,7 @@ public:
     %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxListCtrl)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %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);
 
     // Set the control colours
     bool SetForegroundColour(const wxColour& col);


@@ -517,7 +514,7 @@ public:
     int GetItemCount() const;
 
     // Gets the number of columns in the list control
     int GetItemCount() const;
 
     // Gets the number of columns in the list control

-    int GetColumnCount() const { return m_colCount; }
+    int GetColumnCount() const;

 
     // Retrieves the spacing between icons in pixels.
     // If small is TRUE, gets the spacing for the small icon
 
     // Retrieves the spacing between icons in pixels.
     // If small is TRUE, gets the spacing for the small icon


@@ -734,7 +731,7 @@ public:
                 const wxString &name = "listctrl" );
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
                 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);
 
     // [de]select an item
     void Select(long n, bool on = TRUE);


@@ -1064,7 +1061,7 @@ public:
     %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxTreeCtrl)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %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();
 
     size_t GetCount();
     unsigned int GetIndent();