X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584ad2a32fec156c6049145d7ece9a33213aea28..43c42c18d36c703a88b1b7b697bac27fe5608eca:/include/wx/cocoa/listbox.h?ds=sidebyside diff --git a/include/wx/cocoa/listbox.h b/include/wx/cocoa/listbox.h index 94f6ea0897..91cf621212 100644 --- a/include/wx/cocoa/listbox.h +++ b/include/wx/cocoa/listbox.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_LISTBOX_H__ @@ -19,7 +19,7 @@ // ======================================================================== // wxListBox // ======================================================================== -class WXDLLEXPORT wxListBox: public wxListBoxBase, protected wxCocoaNSTableView +class WXDLLIMPEXP_CORE wxListBox: public wxListBoxBase, protected wxCocoaNSTableView { DECLARE_DYNAMIC_CLASS(wxListBox) DECLARE_EVENT_TABLE() @@ -28,7 +28,7 @@ class WXDLLEXPORT wxListBox: public wxListBoxBase, protected wxCocoaNSTableView // initialization // ------------------------------------------------------------------------ public: - wxListBox() { m_cocoaItems = NULL; } + wxListBox() { m_cocoaItems = NULL; m_cocoaDataSource = NULL; } wxListBox(wxWindow *parent, wxWindowID winid, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -74,40 +74,42 @@ protected: virtual struct objc_object* CocoaDataSource_objectForTableColumn( WX_NSTableColumn tableColumn, int rowIndex); WX_NSMutableArray m_cocoaItems; - wxArrayPtrVoid m_clientData; + wxArrayPtrVoid m_itemClientData; struct objc_object *m_cocoaDataSource; + bool m_needsUpdate; + inline bool _WxCocoa_GetNeedsUpdate(); + inline void _WxCocoa_SetNeedsUpdate(bool needsUpdate); + virtual void OnInternalIdle(); // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ public: + virtual wxSize DoGetBestSize() const; // pure virtuals from wxListBoxBase virtual bool IsSelected(int n) const; - virtual void SetSelection(int n, bool select = TRUE); virtual int GetSelections(wxArrayInt& aSelections) const; protected: - virtual void DoInsertItems(const wxArrayString& items, int pos); - virtual void DoSetItems(const wxArrayString& items, void **clientData); virtual void DoSetFirstItem(int n); + virtual void DoSetSelection(int n, bool select); // pure virtuals from wxItemContainer public: // deleting items - virtual void Clear(); - virtual void Delete(int n); + virtual void DoClear(); + virtual void DoDeleteOneItem(unsigned int n); // accessing strings - virtual int GetCount() const; - virtual wxString GetString(int n) const; - virtual void SetString(int n, const wxString& s); - virtual int FindString(const wxString& s) const; + virtual unsigned int GetCount() const; + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& s); + virtual int FindString(const wxString& s, bool bCase = false) const; // selection - virtual void Select(int n); virtual int GetSelection() const; protected: - virtual int DoAppend(const wxString& item); - virtual void DoSetItemClientData(int n, void* clientData); - virtual void* DoGetItemClientData(int n) const; - virtual void DoSetItemClientObject(int n, wxClientData* clientData); - virtual wxClientData* DoGetItemClientObject(int n) const; + virtual int DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type); + virtual void DoSetItemClientData(unsigned int n, void* clientData); + virtual void* DoGetItemClientData(unsigned int n) const; }; #endif // __WX_COCOA_LISTBOX_H__