X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/853dcc57c6e5ba58e9e546c65ca4965256f3ac21..d022d3649e7fea5a182667121ceeab00e50a8c49:/include/wx/gtk/combobox.h diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h index 5f33b99a53..a98cc3eb79 100644 --- a/include/wx/gtk/combobox.h +++ b/include/wx/gtk/combobox.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxComboBox; // global data //----------------------------------------------------------------------------- -extern WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[]; extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString; //----------------------------------------------------------------------------- @@ -81,17 +81,16 @@ public: const wxString& name = wxComboBoxNameStr); void Clear(); - void Delete( int n ); + void Delete(unsigned int n); virtual int FindString(const wxString& s, bool bCase = false) const; int GetSelection() const; int GetCurrentSelection() const; - wxString GetString( int n ) const; + virtual wxString GetString(unsigned int n) const; wxString GetStringSelection() const; - int GetCount() const; - int Number() const { return GetCount(); } - void SetSelection( int n ); - void SetString(int n, const wxString &text); + virtual unsigned int GetCount() const; + virtual void SetSelection(int n); + virtual void SetString(unsigned int n, const wxString &text); wxString GetValue() const; void SetValue(const wxString& value); @@ -152,7 +151,6 @@ public: void EnableEvents(); GtkWidget* GetConnectWidget(); bool IsOwnGtkWindow( GdkWindow *window ); - void DoApplyWidgetStyle(GtkRcStyle *style); wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST @@ -160,13 +158,14 @@ public: GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); protected: + void DoApplyWidgetStyle(GtkRcStyle *style); virtual int DoAppend(const wxString& item); - virtual int DoInsert(const wxString& item, int pos); + virtual int DoInsert(const wxString& item, unsigned int pos); - 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 void DoSetItemClientObject(unsigned int n, wxClientData* clientData); + virtual wxClientData* DoGetItemClientObject(unsigned int n) const; virtual wxSize DoGetBestSize() const;