X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c8a980fc412792e64256724e02e9d387ee38e21..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/gtk/choice.h diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index a58c6bb583..4c24c8f524 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.h +// Name: wx/gtk/choice.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,18 +7,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKCHOICEH__ -#define __GTKCHOICEH__ +#ifndef _WX_GTK_CHOICE_H_ +#define _WX_GTK_CHOICE_H_ -#ifdef __GNUG__ - #pragma interface "choice.h" -#endif +class WXDLLIMPEXP_FWD_BASE wxSortedArrayString; +class WXDLLIMPEXP_FWD_BASE wxArrayString; //----------------------------------------------------------------------------- // wxChoice //----------------------------------------------------------------------------- -class wxChoice : public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase { public: wxChoice(); @@ -34,7 +33,19 @@ public: Create(parent, id, pos, size, n, choices, style, validator, name); } - ~wxChoice(); + wxChoice( wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr ) + { + m_strings = (wxSortedArrayString *)NULL; + + 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, @@ -42,45 +53,58 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr ); - - // implement base class pure virtuals - void Delete(int n); - void Clear(); + bool Create( wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr ); int GetSelection() const; - void SetSelection( int n ); + void SetSelection(int n); - virtual int GetCount() const; - int FindString( const wxString& string ) const; - wxString GetString( int n ) const; - void SetString( int n, const wxString& string ); + virtual unsigned int GetCount() const; + virtual int FindString(const wxString& s, bool bCase = false) const; + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& string); - // implementation - wxList m_clientList; // contains the client data for the items - - void DisableEvents(); - void EnableEvents(); - void AppendCommon( const wxString &item ); - void ApplyWidgetStyle(); + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); protected: - virtual int DoAppend(const wxString& item); + void DoDeleteOneItem(unsigned int n); + void DoClear(); + + wxArrayPtrVoid m_clientData; // contains the client data for the items - 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 wxSize DoGetBestSize() const; + virtual void DoApplyWidgetStyle(GtkRcStyle *style); + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + + virtual int DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type); + + virtual void DoSetItemClientData(unsigned int n, void* clientData); + virtual void* DoGetItemClientData(unsigned int n) const; private: - // common part of Create() and DoAppend() - size_t AppendHelper(GtkWidget *menu, const wxString& item); + // DoInsertItems() helper + int GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item); // 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; +public: + // this circumvents a GTK+ 2.0 bug so that the selection is + // invalidated properly + int m_selection_hack; + +private: DECLARE_DYNAMIC_CLASS(wxChoice) }; -#endif // __GTKCHOICEH__ +#endif // _WX_GTK_CHOICE_H_