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:
@@ -62,8 +62,8 @@ public:
|
||||
const wxString& name = wxChoiceNameStr );
|
||||
|
||||
// implement base class pure virtuals
|
||||
void Delete(unsigned int n);
|
||||
void Clear();
|
||||
void DoDeleteOneItem(unsigned int n);
|
||||
void DoClear();
|
||||
|
||||
int GetSelection() const;
|
||||
virtual void SetSelection(int n);
|
||||
@@ -80,20 +80,19 @@ protected:
|
||||
wxList m_clientList; // contains the client data for the items
|
||||
|
||||
void DoApplyWidgetStyle(GtkRcStyle *style);
|
||||
virtual int DoAppend(const wxString& item);
|
||||
virtual int DoInsert(const wxString& item, unsigned int pos);
|
||||
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 wxSize DoGetBestSize() const;
|
||||
|
||||
virtual bool IsOwnGtkWindow( GdkWindow *window );
|
||||
|
||||
private:
|
||||
// common part of Create() and DoAppend()
|
||||
// DoInsertItems() helper
|
||||
int GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item);
|
||||
|
||||
// this array is only used for controls with wxCB_SORT style, so only
|
||||
|
Reference in New Issue
Block a user