added WM_UPDATEUISTATE and related stuff

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

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 5de83175f9d72e132398e6a7a9f309af639a123e..640eba3e90ede49ac5e3520da09b4b3582941733 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "listctrl.h"
 #endif
 
     #pragma interface "listctrl.h"
 #endif
 


@@ -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();


@@ -370,6 +376,9 @@ protected:
     long              m_baseStyle;  // Basic Windows style flags, for recreation purposes
     int               m_colCount;   // Windows doesn't have GetColumnCount so must
                                     // keep track of inserted/deleted columns
     long              m_baseStyle;  // Basic Windows style flags, for recreation purposes
     int               m_colCount;   // Windows doesn't have GetColumnCount so must
                                     // keep track of inserted/deleted columns

+    long              m_count;      // Keep track of item count to save calls to
+                                    // ListView_GetItemCount
+    bool              m_ignoreChangeMessages;

 
     // TRUE if we have any internal data (user data & attributes)
     bool m_AnyInternalData;
 
     // TRUE if we have any internal data (user data & attributes)
     bool m_AnyInternalData;