added CanConvert()

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

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 6a7dc88036e14f2d8db5f22b7493c5f8b5980eea..e39a1d554ef4da26c116b4b0e574622cfa5ff8f4 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -11,7 +11,7 @@
 #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
 


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


@@ -161,10 +162,14 @@ public:
     void RefreshItem(long item);
     void RefreshItems(long itemFrom, long itemTo);
 
     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
     // -------------------------------
 
     // 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


@@ -201,6 +206,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 +228,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);