X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8228b8932abaedadbf9568bb3a1eef3ae25fb2a3..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/gtk1/combobox.h diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h index a3a3d2a178..585318f4b3 100644 --- a/include/wx/gtk1/combobox.h +++ b/include/wx/gtk1/combobox.h @@ -3,7 +3,6 @@ // Purpose: // Author: Robert Roebling // Created: 01/02/97 -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -21,20 +20,21 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxComboBox; +class WXDLLIMPEXP_FWD_CORE wxComboBox; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString; //----------------------------------------------------------------------------- // wxComboBox //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase +class WXDLLIMPEXP_CORE wxComboBox : + public wxWindowWithItems { public: inline wxComboBox() {} @@ -61,7 +61,7 @@ public: Create(parent, id, value, pos, size, choices, style, validator, name); } - ~wxComboBox(); + virtual ~wxComboBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, @@ -80,20 +80,21 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr); - void Clear(); - void Delete( int n ); + void DoClear(); + void DoDeleteOneItem(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; - virtual size_t GetCount() const; - 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; + wxString GetValue() const { return DoGetValue(); } void SetValue(const wxString& value); + void WriteText(const wxString& value); void Copy(); void Cut(); @@ -153,22 +154,23 @@ public: bool IsOwnGtkWindow( GdkWindow *window ); void DoApplyWidgetStyle(GtkRcStyle *style); - wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST - static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); protected: - 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; + // implement wxTextEntry pure virtual methods + virtual wxString DoGetValue() const; + virtual wxWindow *GetEditableWindow() { return this; } + // Widgets that use the style->base colour for the BG colour should // override this and return true. virtual bool UseGTKStyleBase() const { return true; }