X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e78c1d7855d1fefcdbff0e093e21e5cf101ca604..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/gtk/choice.h diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index a9d9cc8e95..eb1fe8989b 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -17,6 +17,8 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString; // wxChoice //----------------------------------------------------------------------------- +class wxGtkCollatedArrayString; + class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase { public: @@ -50,7 +52,7 @@ public: 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 ); @@ -62,8 +64,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr ); - void SendSelectionChangedEvent(wxEventType evt_type); - int GetSelection() const; void SetSelection(int n); @@ -72,8 +72,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); @@ -81,7 +84,7 @@ 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; @@ -90,6 +93,7 @@ protected: 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); @@ -99,6 +103,7 @@ 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