Fix memory leak by letting the base class version handle the

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

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 6a7dc88036e14f2d8db5f22b7493c5f8b5980eea..a8caab5e28ff9842b22c66b2ce8336db89104f0c 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -5,13 +5,13 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart

-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __LISTCTRLH_G__
 #define __LISTCTRLH_G__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __LISTCTRLH_G__
 #define __LISTCTRLH_G__
 

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

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


@@ -37,7 +37,7 @@ class WXDLLEXPORT wxDropTarget;
 class WXDLLEXPORT wxListItem;
 class WXDLLEXPORT wxListEvent;
 
 class WXDLLEXPORT wxListItem;
 class WXDLLEXPORT wxListEvent;
 

-#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)

 class WXDLLEXPORT wxListCtrl;
 #define wxImageListType wxImageList
 #else
 class WXDLLEXPORT wxListCtrl;
 #define wxImageListType wxImageList
 #else


@@ -67,19 +67,19 @@ class WXDLLEXPORT wxGenericListCtrl: public wxControl
 public:
     wxGenericListCtrl();
     wxGenericListCtrl( wxWindow *parent,
 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 = wxT("listctrl") )
     {
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,
                 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,
     }
     ~wxGenericListCtrl();
 
     bool Create( wxWindow *parent,

-                 wxWindowID id = -1,
+                 wxWindowID winid = -1,

                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLC_ICON,
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLC_ICON,


@@ -91,6 +91,7 @@ public:
     int GetColumnWidth( int col ) const;
     bool SetColumnWidth( int col, int width);
     int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think
     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 ) ;
 
     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 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);
     void SetItemTextColour( long item, const wxColour& col);
     wxColour GetItemTextColour( long item ) const;
     void SetItemBackgroundColour( long item, const wxColour &col);


@@ -154,17 +155,36 @@ public:
     bool SortItems( wxListCtrlCompare fn, long data );
     bool Update( long item );
 
     bool SortItems( wxListCtrlCompare fn, long data );
     bool Update( long item );
 

-    // returns true if it is a virtual list control
-    bool IsVirtual() const { return (GetWindowStyle() & wxLC_VIRTUAL) != 0; }
+    // are we in report mode?
+    bool InReportView() const { return HasFlag(wxLC_REPORT); }
+
+    // are we in virtual report mode?
+    bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
+
+    // do we have a header window?
+    bool HasHeader() const
+        { return InReportView() && !HasFlag(wxLC_NO_HEADER); }

 
     // refresh items selectively (only useful for virtual list controls)
     void RefreshItem(long item);
     void RefreshItems(long itemFrom, long itemTo);
 
 
     // refresh items selectively (only useful for virtual list controls)
     void RefreshItem(long item);
     void RefreshItems(long itemFrom, long itemTo);
 

+    // obsolete, don't use
+    wxDEPRECATED( int GetItemSpacing( bool isSmall ) const );
+
+
+    virtual wxVisualAttributes GetDefaultAttributes() const
+    {
+        return GetClassDefaultAttributes(GetWindowVariant());
+    }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+

     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-    void OnIdle( wxIdleEvent &event );
+    void OnInternalIdle( );

     void OnSize( wxSizeEvent &event );
 
     // We have to hand down a few functions
     void OnSize( wxSizeEvent &event );
 
     // We have to hand down a few functions


@@ -188,6 +208,7 @@ public:
 
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 
 
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 

+    virtual bool ShouldInheritColours() const { return false; }

     virtual void SetFocus();
 
     // implementation
     virtual void SetFocus();
 
     // implementation


@@ -201,6 +222,7 @@ public:
                          m_ownsImageListState;
     wxListHeaderWindow  *m_headerWin;
     wxListMainWindow    *m_mainWin;
                          m_ownsImageListState;
     wxListHeaderWindow  *m_headerWin;
     wxListMainWindow    *m_mainWin;

+    wxCoord              m_headerHeight;

 
 protected:
     // return the text for the given column of the given item
 
 protected:
     // return the text for the given column of the given item


@@ -222,6 +244,9 @@ private:
     // create the header window
     void CreateHeaderWindow();
 
     // 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);
     // reposition the header and the main window in the report view depending
     // on whether it should be shown or not
     void ResizeReportView(bool showHeader);


@@ -230,7 +255,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericListCtrl);
 };
 
     DECLARE_DYNAMIC_CLASS(wxGenericListCtrl);
 };
 

-#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)

 /*
  * wxListCtrl has to be a real class or we have problems with
  * the run-time information.
 /*
  * wxListCtrl has to be a real class or we have problems with
  * the run-time information.


@@ -243,16 +268,16 @@ class WXDLLEXPORT wxListCtrl: public wxGenericListCtrl
 public:
     wxListCtrl() {}
 
 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 = wxT("listctrl") )
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxLC_ICON,
                const wxValidator &validator = wxDefaultValidator,
                const wxString &name = wxT("listctrl") )

-    : wxGenericListCtrl(parent, id, pos, size, style, validator, name)
+    : wxGenericListCtrl(parent, winid, pos, size, style, validator, name)

     {
     }
 };
     {
     }
 };

-#endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__
+#endif // !__WXMSW__ || __WXUNIVERSAL__

 
 #endif // __LISTCTRLH_G__
 
 #endif // __LISTCTRLH_G__