X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c63312c472c83be6d3b935f0ceeef484a7d611ce..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk1/choice.h diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h index 9d80932e74..c78e8308fe 100644 --- a/include/wx/gtk1/choice.h +++ b/include/wx/gtk1/choice.h @@ -10,8 +10,8 @@ #ifndef __GTKCHOICEH__ #define __GTKCHOICEH__ -class WXDLLIMPEXP_BASE wxSortedArrayString; -class WXDLLIMPEXP_BASE wxArrayString; +class WXDLLIMPEXP_FWD_BASE wxSortedArrayString; +class WXDLLIMPEXP_FWD_BASE wxArrayString; //----------------------------------------------------------------------------- // wxChoice @@ -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