X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa61d3525370a9b9fa8c797d9b7f89d96994db5f..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/cocoa/listbox.h diff --git a/include/wx/cocoa/listbox.h b/include/wx/cocoa/listbox.h index 0002435bbc..91cf621212 100644 --- a/include/wx/cocoa/listbox.h +++ b/include/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() @@ -76,24 +76,27 @@ protected: WX_NSMutableArray m_cocoaItems; 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 int GetSelections(wxArrayInt& aSelections) const; protected: - virtual void DoInsertItems(const wxArrayString& items, unsigned 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(unsigned int n); + virtual void DoClear(); + virtual void DoDeleteOneItem(unsigned int n); // accessing strings virtual unsigned int GetCount() const; virtual wxString GetString(unsigned int n) const; @@ -102,11 +105,11 @@ public: // selection virtual int GetSelection() const; protected: - virtual int DoAppend(const wxString& item); + 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; - virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData); - virtual wxClientData* DoGetItemClientObject(unsigned int n) const; }; #endif // __WX_COCOA_LISTBOX_H__