X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e75491071dbefcada61175e3eb89ce4edf335983..e640f8231fbf0417f9ab5d378e7f218587cb6ac2:/include/wx/mac/listbox.h diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h index 061c146b0e..18b4149d88 100644 --- a/include/wx/mac/listbox.h +++ b/include/wx/mac/listbox.h @@ -25,7 +25,7 @@ class WXDLLEXPORT wxOwnerDrawn; // define the array of list box items - #include + #include "wx/dynarray.h" WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray); #endif // wxUSE_OWNER_DRAWN @@ -66,7 +66,8 @@ public: const wxString& name = wxListBoxNameStr); virtual ~wxListBox(); - + virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL); + // implement base class pure virtuals virtual void Clear(); virtual void Delete(int n); @@ -91,6 +92,7 @@ public: virtual void* DoGetItemClientData(int n) const; virtual void DoSetItemClientObject(int n, wxClientData* clientData); virtual wxClientData* DoGetItemClientObject(int n) const; + virtual void DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ; // wxCheckListBox support #if wxUSE_OWNER_DRAWN @@ -104,11 +106,6 @@ public: int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); } #endif // wxUSE_OWNER_DRAWN - // Windows-specific code to set the horizontal extent of the listbox, if - // necessary. If s is non-NULL, it's used to calculate the horizontal - // extent. Otherwise, all strings are used. - virtual void SetHorizontalExtent(const wxString& s = wxEmptyString); - // Windows callbacks virtual void SetupColours(); @@ -117,6 +114,7 @@ public: ListHandle m_macList ; wxArrayString m_stringArray ; wxListDataArray m_dataArray ; + wxArrayInt m_selectionPreImage ; void MacSetRedraw( bool doDraw ) ; protected: void MacDestroy() ; @@ -143,7 +141,7 @@ protected: int m_noItems; int m_selected; - virtual wxSize DoGetBestSize(); + virtual wxSize DoGetBestSize() const; #if wxUSE_OWNER_DRAWN // control items