X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba5b8a68f7486cfb11e326c200e1c2df3e1a534d..985acf8734d61067c66b4812a9dd9da90d725851:/include/wx/mac/carbon/listbox.h?ds=inline diff --git a/include/wx/mac/carbon/listbox.h b/include/wx/mac/carbon/listbox.h index 6826f1d997..91214b05b6 100644 --- a/include/wx/mac/carbon/listbox.h +++ b/include/wx/mac/carbon/listbox.h @@ -21,12 +21,12 @@ // forward decl for GetSelections() class wxArrayInt; -// forward decl for GetPeer() -class wxMacListControl ; +// forward decl for wxMacListControl data type. +class wxMacListControl; // List box item -WX_DEFINE_ARRAY( char * , wxListDataArray ) ; +WX_DEFINE_ARRAY( char* , wxListDataArray ); // ---------------------------------------------------------------------------- // List box control @@ -37,48 +37,60 @@ class WXDLLEXPORT wxListBox : public wxListBoxBase public: // ctors and such wxListBox(); - wxListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr) + + wxListBox( + wxWindow *parent, + wxWindowID winid, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, const wxString choices[] = NULL, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxListBoxNameStr) { - Create(parent, id, pos, size, n, choices, style, validator, name); + Create(parent, winid, pos, size, n, choices, style, validator, name); } - wxListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr) + + wxListBox( + wxWindow *parent, + wxWindowID winid, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxListBoxNameStr) { - Create(parent, id, pos, size, choices, style, validator, name); + Create(parent, winid, pos, size, choices, style, validator, name); } - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); + bool Create( + wxWindow *parent, + wxWindowID winid, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, + const wxString choices[] = NULL, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxListBoxNameStr); + + bool Create( + wxWindow *parent, + wxWindowID winid, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + 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(unsigned int n); + virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL); + virtual void DoClear(); + virtual void DoDeleteOneItem(unsigned int n); virtual unsigned int GetCount() const; virtual wxString GetString(unsigned int n) const; @@ -89,57 +101,34 @@ public: virtual int GetSelection() const; virtual int GetSelections(wxArrayInt& aSelections) const; + virtual void EnsureVisible(int n); + // wxCheckListBox support static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - wxArrayString m_stringArray ; - wxListDataArray m_dataArray ; - - wxMacListControl* GetPeer() const { return (wxMacListControl*) m_peer ; } + wxMacListControl* GetPeer() const; protected: - // internal storage for line n has changed, issue a redraw - void MacUpdateLine( int n ) ; - - virtual void DoSetSelection(int n, bool select); - virtual int DoAppend(const wxString& item); - virtual void DoInsertItems(const wxArrayString& items, unsigned int pos); - virtual void DoSetItems(const wxArrayString& items, void **clientData); - virtual void DoSetFirstItem(int n); + // from wxItemContainer + 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; - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - virtual int DoListHitTest(const wxPoint& point) const; - void MacDelete( int n ) ; - void MacInsert( int n , const wxString& item) ; - void MacAppend( const wxString& item) ; - void MacSet( int n , const wxString& item ) ; - void MacClear() ; - void MacDeselectAll() ; - void MacSetSelection( int n , bool select ) ; - int MacGetSelection() const ; - int MacGetSelections(wxArrayInt& aSelections) const ; - bool MacIsSelected( int n ) const ; - void MacScrollTo( int n ) ; - bool MacSuppressSelection( bool suppress ) ; + // from wxListBoxBase + virtual void DoSetSelection(int n, bool select); + virtual void DoSetFirstItem(int n); + virtual int DoListHitTest(const wxPoint& point) const; // free memory (common part of Clear() and dtor) // prevent collision with some BSD definitions of macro Free() void FreeData(); - unsigned int m_noItems; - int m_selected; - bool m_suppressSelection ; - virtual wxSize DoGetBestSize() const; - // common creation for all databrowser list implementations - wxMacListControl* CreateMacListControl(const wxPoint& pos, const wxSize& size, long style) ; - private: DECLARE_DYNAMIC_CLASS(wxListBox) DECLARE_EVENT_TABLE()