X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9ceab7ce6f4543fea1860792b887f6d78d7c185..91116345459337f3fc10fa60ad96d770d41569eb:/include/wx/generic/listctrl.h?ds=sidebyside

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index c6c02d9802..b07e824277 100644
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -4,14 +4,14 @@
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __LISTCTRLH_G__
 #define __LISTCTRLH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "listctrl.h"
 #endif
 
@@ -67,30 +67,31 @@ class WXDLLEXPORT wxGenericListCtrl: public wxControl
 public:
     wxGenericListCtrl();
     wxGenericListCtrl( wxWindow *parent,
-                wxWindowID id = -1,
+                wxWindowID winid = -1,
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = "listctrl" )
+                const wxString &name = wxT("listctrl") )
     {
-        Create(parent, id, pos, size, style, validator, name);
+        Create(parent, winid, pos, size, style, validator, name);
     }
     ~wxGenericListCtrl();
 
     bool Create( wxWindow *parent,
-                 wxWindowID id = -1,
+                 wxWindowID winid = -1,
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLC_ICON,
                  const wxValidator& validator = wxDefaultValidator,
-                 const wxString &name = "listctrl" );
+                 const wxString &name = wxT("listctrl") );
 
     bool GetColumn( int col, wxListItem& item ) const;
     bool SetColumn( int col, wxListItem& item );
     int GetColumnWidth( int col ) const;
     bool SetColumnWidth( int col, int width);
     int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think
+    wxRect GetViewRect() const;
 
     bool GetItem( wxListItem& info ) const;
     bool SetItem( wxListItem& info ) ;
@@ -108,7 +109,7 @@ public:
     int GetItemCount() const;
     int GetColumnCount() const;
     void SetItemSpacing( int spacing, bool isSmall = FALSE );
-    int GetItemSpacing( bool isSmall ) const;
+    wxSize GetItemSpacing() const;
     void SetItemTextColour( long item, const wxColour& col);
     wxColour GetItemTextColour( long item ) const;
     void SetItemBackgroundColour( long item, const wxColour &col);
@@ -148,8 +149,8 @@ public:
     long InsertItem( long index, int imageIndex );
     long InsertItem( long index, const wxString& label, int imageIndex );
     long InsertColumn( long col, wxListItem& info );
-    long InsertColumn( long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT,
-      int width = -1 );
+    long InsertColumn( long col, const wxString& heading,
+                       int format = wxLIST_FORMAT_LEFT, int width = -1 );
     bool ScrollList( int dx, int dy );
     bool SortItems( wxListCtrlCompare fn, long data );
     bool Update( long item );
@@ -161,13 +162,19 @@ public:
     void RefreshItem(long item);
     void RefreshItems(long itemFrom, long itemTo);
 
+    // obsolete, don't use
+    wxDEPRECATED( int GetItemSpacing( bool isSmall ) const );
+
+
     // implementation only from now on
     // -------------------------------
 
-    void OnIdle( wxIdleEvent &event );
+    void OnInternalIdle( );
     void OnSize( wxSizeEvent &event );
 
     // We have to hand down a few functions
+    virtual void Refresh(bool eraseBackground = TRUE,
+                         const wxRect *rect = NULL);
 
     virtual void Freeze();
     virtual void Thaw();
@@ -186,6 +193,7 @@ public:
 
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 
+    virtual bool ShouldInheritColours() const { return false; }
     virtual void SetFocus();
 
     // implementation
@@ -199,6 +207,7 @@ public:
                          m_ownsImageListState;
     wxListHeaderWindow  *m_headerWin;
     wxListMainWindow    *m_mainWin;
+    wxCoord              m_headerHeight;
 
 protected:
     // return the text for the given column of the given item
@@ -220,6 +229,9 @@ private:
     // create the header window
     void CreateHeaderWindow();
 
+    // calculate and set height of the header
+    void CalculateAndSetHeaderHeight();
+
     // reposition the header and the main window in the report view depending
     // on whether it should be shown or not
     void ResizeReportView(bool showHeader);
@@ -241,13 +253,13 @@ class WXDLLEXPORT wxListCtrl: public wxGenericListCtrl
 public:
     wxListCtrl() {}
 
-    wxListCtrl(wxWindow *parent, wxWindowID id = -1,
+    wxListCtrl(wxWindow *parent, wxWindowID winid = -1,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxLC_ICON,
                const wxValidator &validator = wxDefaultValidator,
-               const wxString &name = "listctrl" )
-    : wxGenericListCtrl(parent, id, pos, size, style, validator, name)
+               const wxString &name = wxT("listctrl") )
+    : wxGenericListCtrl(parent, winid, pos, size, style, validator, name)
     {
     }
 };