X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16edee16a7c3d346b9eab1672a4c696cb0cf6e24..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk1/choice.h diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h index 70fea3819b..c78e8308fe 100644 --- a/include/wx/gtk1/choice.h +++ b/include/wx/gtk1/choice.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.h +// Name: wx/gtk1/choice.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,18 +10,14 @@ #ifndef __GTKCHOICEH__ #define __GTKCHOICEH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "choice.h" -#endif - -class WXDLLIMPEXP_BASE wxSortedArrayString; -class WXDLLIMPEXP_BASE wxArrayString; +class WXDLLIMPEXP_FWD_BASE wxSortedArrayString; +class WXDLLIMPEXP_FWD_BASE wxArrayString; //----------------------------------------------------------------------------- // wxChoice //----------------------------------------------------------------------------- -class wxChoice : public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase { public: wxChoice(); @@ -49,7 +45,7 @@ public: Create(parent, id, pos, size, choices, style, validator, name); } - ~wxChoice(); + virtual ~wxChoice(); bool Create( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -66,16 +62,16 @@ public: const wxString& name = wxChoiceNameStr ); // implement base class pure virtuals - void Delete(int n); - void Clear(); + void DoDeleteOneItem(unsigned int n); + void DoClear(); int GetSelection() const; - void SetSelection( int n ); + virtual void SetSelection(int n); - virtual int GetCount() const; - int FindString( const wxString& string ) const; - wxString GetString( int n ) const; - void SetString( int n, const wxString& string ); + virtual unsigned int GetCount() const; + virtual int FindString(const wxString& s, bool bCase = false) const; + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& string); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -84,30 +80,31 @@ 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, int pos); + virtual int DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type); - virtual void DoSetItemClientData( int n, void* clientData ); - virtual void* DoGetItemClientData( int n ) const; - virtual void DoSetItemClientObject( int n, wxClientData* clientData ); - virtual wxClientData* DoGetItemClientObject( int n ) const; + virtual void DoSetItemClientData(unsigned int n, void* clientData); + virtual void* DoGetItemClientData(unsigned int n) const; virtual wxSize DoGetBestSize() const; virtual bool IsOwnGtkWindow( GdkWindow *window ); private: - // common part of Create() and DoAppend() - int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item); + // 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 // allocate it if it's needed (hence using pointer) wxSortedArrayString *m_strings; - // this circumvents a GTK+ 2.0 bug so that the selection is - // invalidated properly +public: + // this circumvents a GTK+ 2.0 bug so that the selection is + // invalidated properly int m_selection_hack; - + +private: DECLARE_DYNAMIC_CLASS(wxChoice) };