Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / cocoa / listbox.h

diff --git a/include/wx/cocoa/listbox.h b/include/wx/cocoa/listbox.h
index e21a39c3e194c841d18066c527159c2ea5132b70..91cf6212121bb4ab8a78c5d7586a29b397bf500e 100644 (file)
--- 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,10 +76,15 @@ 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;