Applied patch #809019 (Adds embedded/plugin capabilities to wxMac).

[wxWidgets.git] / include / wx / msw / listctrl.h

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 7131dcc64701a5c1c75191618a13ff76f37f6d0d..640eba3e90ede49ac5e3520da09b4b3582941733 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -138,6 +138,9 @@ public:
     // or small icon view)
     int GetCountPerPage() const;
 
     // or small icon view)
     int GetCountPerPage() const;
 

+    // return the total area occupied by all the items (icon/small icon only)
+    wxRect GetViewRect() const;
+

     // Gets the edit control for editing labels.
     wxTextCtrl* GetEditControl() const;
 
     // Gets the edit control for editing labels.
     wxTextCtrl* GetEditControl() const;
 


@@ -186,10 +189,8 @@ public:
     // Gets the number of columns in the list control
     int GetColumnCount() const { return m_colCount; }
 
     // Gets the number of columns in the list control
     int GetColumnCount() const { return m_colCount; }
 

-    // 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;

 
     // Foreground colour of an item.
     void SetItemTextColour( long item, const wxColour& col);
 
     // Foreground colour of an item.
     void SetItemTextColour( long item, const wxColour& col);


@@ -352,6 +353,11 @@ public:
     // Necessary for drawing hrules and vrules, if specified
     void OnPaint(wxPaintEvent& event);
 
     // Necessary for drawing hrules and vrules, if specified
     void OnPaint(wxPaintEvent& event);
 

+    virtual bool ShouldInheritColours() const { return false; }
+
+    // obsolete stuff, for compatibility only -- don't use
+    wxDEPRECATED( int GetItemSpacing(bool isSmall) const);
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();