Don't use "Cancel" button in the about dialog of the listctrl sample.

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

diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h
index 0e9fcf122602b5d77e2f52e5ad73a80eb880ae9d..cd6b2e9fb6b97e7628bc196e6042db3b0eacf91d 100644 (file)
--- a/include/wx/osx/listctrl.h
+++ b/include/wx/osx/listctrl.h
@@ -63,8 +63,7 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase
   bool GetColumn(int col, wxListItem& item) const;
 
   // Sets information about this column
   bool GetColumn(int col, wxListItem& item) const;
 
   // Sets information about this column

-  // TODO: NOT const to be compatible with wxGenericListCtrl API
-  bool SetColumn(int col, wxListItem& item) ;
+  bool SetColumn(int col, const wxListItem& item) ;

 
   // Gets the column width
   int GetColumnWidth(int col) const;
 
   // Gets the column width
   int GetColumnWidth(int col) const;


@@ -252,12 +251,6 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase
   // Insert an image/string item
   long InsertItem(long index, const wxString& label, int imageIndex);
 
   // Insert an image/string item
   long InsertItem(long index, const wxString& label, int imageIndex);
 

-  // For list view mode (only), inserts a column.
-  long InsertColumn(long col, wxListItem& info);
-
-  long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT,
-    int width = -1);
-

   // Scrolls the list control. If in icon, small icon or report view mode,
   // x specifies the number of pixels to scroll. If in list view mode, x
   // specifies the number of columns to scroll.
   // Scrolls the list control. If in icon, small icon or report view mode,
   // x specifies the number of pixels to scroll. If in list view mode, x
   // specifies the number of columns to scroll.


@@ -371,14 +364,14 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase
   GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:
   GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:

+  // Implement base class pure virtual methods.
+  long DoInsertColumn(long col, const wxListItem& info);

 
   // protected overrides needed for pimpl approach
   virtual void DoSetSize(int x, int y,
                          int width, int height,
                          int sizeFlags = wxSIZE_AUTO);
 
 
   // protected overrides needed for pimpl approach
   virtual void DoSetSize(int x, int y,
                          int width, int height,
                          int sizeFlags = wxSIZE_AUTO);
 

-  virtual wxSize DoGetBestSize() const;
-

   long               m_current;
   wxListCtrlTextCtrlWrapper *m_textctrlWrapper;
   wxListCtrlRenameTimer *m_renameTimer;
   long               m_current;
   wxListCtrlTextCtrlWrapper *m_textctrlWrapper;
   wxListCtrlRenameTimer *m_renameTimer;