Changes needed to get upto date with the latest wx CVS

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/src/controls2.i

@@ -476,6 +476,9 @@ public:
     // or small icon view)
     int GetCountPerPage() const;
 
+    // return the total area occupied by all the items (icon/small icon only)
+    wxRect GetViewRect() const;
+    
 #ifdef __WXMSW__
     // Gets the edit control for editing labels.
     wxTextCtrl* GetEditControl() const;
@@ -556,10 +559,8 @@ public:
     // Gets the number of columns in the list control
     int GetColumnCount() const;
 
-    // Retrieves the spacing between icons in pixels.
-    // If small is TRUE, gets the spacing for the small icon
-    // view, otherwise the large icon view.
-    int GetItemSpacing(bool isSmall) const;
+    // get the horizontal and vertical components of the item spacing
+    wxSize GetItemSpacing() const;
 
 #ifndef __WXMSW__
     void SetItemSpacing( int spacing, bool isSmall = FALSE );