X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0662f99096f665089e23dc7d342ac85ceb72f9e3..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/gtk/choice.h?ds=sidebyside diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index 6da310248b..d952a0fa2c 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -2,7 +2,6 @@ // Name: wx/gtk/choice.h // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,10 +16,15 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString; // wxChoice //----------------------------------------------------------------------------- +class wxGtkCollatedArrayString; + 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 +33,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 +44,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 ); @@ -61,8 +63,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr ); - void SendSelectionChangedEvent(wxEventType evt_type); - int GetSelection() const; void SetSelection(int n); @@ -71,8 +71,11 @@ public: virtual wxString GetString(unsigned int n) const; virtual void SetString(unsigned int n, const wxString& string); - virtual void DisableEvents(); - virtual void EnableEvents(); + virtual void SetColumns(int n=1); + virtual int GetColumns() const; + + virtual void GTKDisableEvents(); + virtual void GTKEnableEvents(); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -80,12 +83,16 @@ public: protected: // 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; + wxGtkCollatedArrayString *m_strings; // 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 wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, void **clientData, wxClientDataType type); @@ -95,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) };