X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6538e2c55535a747aec939d0f6659f91bc623d4..6ca154fcc14a2532798a23977baee2eed3179d19:/include/wx/gtk1/choice.h diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h index b7dd865d98..a00f825872 100644 --- a/include/wx/gtk1/choice.h +++ b/include/wx/gtk1/choice.h @@ -10,10 +10,13 @@ #ifndef __GTKCHOICEH__ #define __GTKCHOICEH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "choice.h" #endif +class WXDLLIMPEXP_BASE wxSortedArrayString; +class WXDLLIMPEXP_BASE wxArrayString; + //----------------------------------------------------------------------------- // wxChoice //----------------------------------------------------------------------------- @@ -30,8 +33,22 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr ) { + m_strings = (wxSortedArrayString *)NULL; + Create(parent, id, pos, size, n, choices, style, validator, name); } + 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); + } ~wxChoice(); bool Create( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -40,6 +57,13 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr ); + 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 ); // implement base class pure virtuals void Delete(int n); @@ -49,34 +73,41 @@ public: void SetSelection( int n ); virtual int GetCount() const; - int FindString( const wxString &string ) const; + int FindString( const wxString& string ) const; wxString GetString( int n ) const; + void SetString( int n, const wxString& string ); - // implementation - wxList m_clientList; + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - void DisableEvents(); - void EnableEvents(); - void AppendCommon( const wxString &item ); - void ApplyWidgetStyle(); - protected: + wxList m_clientList; // contains the client data for the items + + void DoApplyWidgetStyle(GtkRcStyle *style); virtual int DoAppend(const wxString& item); + virtual int DoInsert(const wxString& item, int pos); + + 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 DoSetClientData( int n, void* clientData ); - virtual void* DoGetClientData( int n ) const; - virtual void DoSetClientObject( int n, wxClientData* clientData ); - virtual wxClientData* DoGetClientObject( int n ) const; - - // the above virtuals hide these virtuals in wxChoiceBase - virtual void DoSetClientData(void* clientData ) - { wxWindowBase::DoSetClientData(clientData); }; - virtual void* DoGetClientData() const - { return(wxWindowBase::DoGetClientData()); }; - virtual void DoSetClientObject( wxClientData* clientData ) - { wxWindowBase::DoSetClientObject(clientData); }; - virtual wxClientData* DoGetClientObject() const - { return(wxWindowBase::DoGetClientObject()); }; + virtual bool IsOwnGtkWindow( GdkWindow *window ); + +private: + // common part of Create() and DoAppend() + int GtkAddHelper(GtkWidget *menu, 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)