Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h
index 681775f0cac79baa44f0a72168dd2fb6eff1114d..eb6b50b4a972de4a4c28aba73b3896e588834204 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;


@@ -160,11 +159,6 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase
   // list or report view
   long GetTopItem() const ;
 
   // list or report view
   long GetTopItem() const ;
 

-  // are we in report mode?
-  bool InReportView() const { return HasFlag(wxLC_REPORT); }
-
-  bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
-

   // Add or remove a single window style
   void SetSingleStyle(long style, bool add = true) ;
 
   // Add or remove a single window style
   void SetSingleStyle(long style, bool add = true) ;
 


@@ -257,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.


@@ -303,9 +291,6 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase
     // return the icon for the given item and column.
     virtual int OnGetItemColumnImage(long item, long column) const;
 
     // return the icon for the given item and column.
     virtual int OnGetItemColumnImage(long item, long column) const;
 

-    // return the attribute for the item (may return NULL if none)
-    virtual wxListItemAttr *OnGetItemAttr(long item) const;
-

 /* Why should we need this function? Leave for now.
  * We might need it because item data may have changed,
  * but the display needs refreshing (in string callback mode)
 /* Why should we need this function? Leave for now.
  * We might need it because item data may have changed,
  * but the display needs refreshing (in string callback mode)


@@ -376,14 +361,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;