X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2c9411060933aa5e92edf3e6251f9fc90090d20..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/gtk/choice.h?ds=sidebyside diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index 478a15ce09..31704b746c 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -20,7 +20,10 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString; class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase { public: - wxChoice(); + wxChoice() + { + Init(); + } wxChoice( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -29,8 +32,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr ) { - m_strings = (wxSortedArrayString *)NULL; - + Init(); Create(parent, id, pos, size, n, choices, style, validator, name); } wxChoice( wxWindow *parent, wxWindowID id, @@ -41,15 +43,14 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr ) { - m_strings = (wxSortedArrayString *)NULL; - + Init(); Create(parent, id, pos, size, choices, style, validator, name); } virtual ~wxChoice(); bool Create( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (wxString *) NULL, + int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr ); @@ -71,6 +72,9 @@ public: virtual wxString GetString(unsigned int n) const; virtual void SetString(unsigned int n, const wxString& string); + virtual void SetColumns(int n=1); + virtual int GetColumns() const; + virtual void DisableEvents(); virtual void EnableEvents(); @@ -85,6 +89,10 @@ protected: // contains the client data for the items wxArrayPtrVoid m_clientData; + // index to GtkListStore cell which displays the item text + int m_stringCellIndex; + + virtual wxSize DoGetBestSize() const; virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, void **clientData, wxClientDataType type); @@ -94,8 +102,15 @@ protected: virtual void DoDeleteOneItem(unsigned int n); virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual void DoApplyWidgetStyle(GtkRcStyle *style); + + // in derived classes, implement this to insert list store entry + // with all items default except text + virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ); private: + void Init(); + DECLARE_DYNAMIC_CLASS(wxChoice) };