many wxItemContainer-related changes:
1. the main function for item insertion is now DoInsertItems() which allows for much more efficient addition of many new items at once 2. the items client data management is done entirely in wxItemContainer itself, the derived classes don't have to distinguish between void and object client data 3. many fixes for sorted controls, in particular implemented wxCB_SORT support in wxGTK combobox git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -63,26 +63,20 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxListBoxNameStr);
|
||||
|
||||
virtual ~wxListBox();
|
||||
|
||||
// implementation of wxControlWithItems
|
||||
virtual unsigned int GetCount() const;
|
||||
virtual int DoAppend(const wxString& item);
|
||||
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 int DoInsertItems(const wxArrayStringsAdapter& items,
|
||||
unsigned int pos,
|
||||
void **clientData, wxClientDataType type);
|
||||
virtual int GetSelection() const;
|
||||
virtual void Delete(unsigned int n);
|
||||
virtual void DoDeleteOneItem(unsigned int n);
|
||||
virtual int FindString(const wxString& s, bool bCase = false) const;
|
||||
virtual void Clear();
|
||||
virtual void DoClear();
|
||||
virtual void SetString(unsigned int n, const wxString& s);
|
||||
virtual wxString GetString(unsigned int n) const;
|
||||
|
||||
// implementation of wxListBoxbase
|
||||
virtual void DoSetSelection(int n, bool select);
|
||||
virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);
|
||||
virtual void DoSetItems(const wxArrayString& items, void **clientData);
|
||||
virtual void DoSetFirstItem(int n);
|
||||
virtual int GetSelections(wxArrayInt& aSelections) const;
|
||||
virtual bool IsSelected(int n) const;
|
||||
@@ -96,15 +90,13 @@ public:
|
||||
WXWidget GetTopWidget() const;
|
||||
|
||||
#if wxUSE_CHECKLISTBOX
|
||||
virtual void DoToggleItem(int WXUNUSED(item), int WXUNUSED(x)) {};
|
||||
virtual void DoToggleItem(int WXUNUSED(item), int WXUNUSED(x)) {}
|
||||
#endif
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
unsigned int m_noItems;
|
||||
|
||||
// List mapping positions->client data
|
||||
wxClientDataDictionary m_clientDataDict;
|
||||
private:
|
||||
void SetSelectionPolicy();
|
||||
};
|
||||
|
Reference in New Issue
Block a user