X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6762286db6cf974817dead5b88bebf0e390dbb7e..43c42c18d36c703a88b1b7b697bac27fe5608eca:/include/wx/osx/listbox.h diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h index bf01a78fec..2165dc9b18 100644 --- a/include/wx/osx/listbox.h +++ b/include/wx/osx/listbox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/listbox.h +// Name: wx/osx/listbox.h // Purpose: wxListBox class // Author: Stefan Csomor // Modified by: @@ -90,7 +90,7 @@ public: const wxString& name = wxListBoxNameStr); virtual ~wxListBox(); - + // implement base class pure virtuals virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL); @@ -102,7 +102,7 @@ public: // data callbacks virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); - + virtual bool IsSelected(int n) const; virtual int GetSelection() const; virtual int GetSelections(wxArrayInt& aSelections) const; @@ -119,7 +119,7 @@ public: GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); wxListWidgetImpl* GetListPeer() const; - + bool MacGetBlockEvents() const { return m_blockEvents; } virtual void HandleLineEvent( unsigned int n, bool doubleClick ); @@ -151,11 +151,11 @@ protected: virtual wxSize DoGetBestSize() const; bool m_blockEvents; - + wxListWidgetColumn* m_textColumn; - + // data storage (copied from univ) - + // the array containing all items (it is sorted if the listbox has // wxLB_SORT style) union @@ -166,8 +166,13 @@ protected: // and this one the client data (either void or wxClientData) wxArrayPtrVoid m_itemsClientData; - + private: +#ifdef __WXOSX_CARBON__ + // It needs to call our CalcAndSendEvent(). + friend class wxMacDataBrowserListControl; +#endif // Carbon + DECLARE_DYNAMIC_CLASS(wxListBox) DECLARE_EVENT_TABLE() };