Updates for wxColourDatabase

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

diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index f88d140f453d5a8d023b3595de8fc292c8b0c8d4..a75f3668d4c88d6411effacae47bf924e530c56c 100644 (file)
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -374,6 +374,10 @@ public:
 
     long GetCacheFrom();
     long GetCacheTo();
+
+    // was label editing canceled? (for wxEVT_COMMAND_LIST_END_LABEL_EDIT only)
+    bool IsEditCancelled() const { return m_editCancelled; }
+    void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; }
 };
 
 
@@ -476,6 +480,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 +563,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 );