Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index e33dfcf8d1c52483f41f8ae2ca8d488f90e8d876..f2db368a54db5b8a0fce3db50da2530b26a6623f 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -79,7 +79,7 @@ public:
     bool SetItemState( long item, long state, long stateMask);
     bool SetItemImage( long item, int image, int selImage = -1 );
     bool SetItemColumnImage( long item, long column, int image );
     bool SetItemState( long item, long state, long stateMask);
     bool SetItemImage( long item, int image, int selImage = -1 );
     bool SetItemColumnImage( long item, long column, int image );

-    wxString GetItemText( long item ) const;
+    wxString GetItemText( long item, int col = 0 ) const;

     void SetItemText( long item, const wxString& str );
     wxUIntPtr GetItemData( long item ) const;
     bool SetItemPtrData(long item, wxUIntPtr data);
     void SetItemText( long item, const wxString& str );
     wxUIntPtr GetItemData( long item ) const;
     bool SetItemPtrData(long item, wxUIntPtr data);


@@ -121,7 +121,7 @@ public:
     void SetItemCount(long count);
 
     wxTextCtrl *EditLabel(long item,
     void SetItemCount(long count);
 
     wxTextCtrl *EditLabel(long item,

-                          wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
+                          wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));

     wxTextCtrl* GetEditControl() const;
     void Edit( long item ) { EditLabel(item); }
 
     wxTextCtrl* GetEditControl() const;
     void Edit( long item ) { EditLabel(item); }
 


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

-    wxCoord              m_headerHeight;

 
 protected:
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 
 protected:
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );


@@ -222,7 +221,7 @@ protected:
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;
 
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;
 

-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestClientSize() const;

 
     // return the text for the given column of the given item
     virtual wxString OnGetItemText(long item, long column) const;
 
     // return the text for the given column of the given item
     virtual wxString OnGetItemText(long item, long column) const;


@@ -243,11 +242,12 @@ protected:
 
     virtual wxBorder GetDefaultBorder() const;
 
 
     virtual wxBorder GetDefaultBorder() const;
 

+    virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size);
+

 private:
     void CreateOrDestroyHeaderWindowAsNeeded();
     void OnScroll( wxScrollWinEvent& event );
     void OnSize( wxSizeEvent &event );
 private:
     void CreateOrDestroyHeaderWindowAsNeeded();
     void OnScroll( wxScrollWinEvent& event );
     void OnSize( wxSizeEvent &event );

-    virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size);

 
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
 
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through