X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/953704c1c76cfb9cfb7b91f0e81f98c30d27eb56..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/choice.h diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h index 54102db5b0..5f550d732a 100644 --- a/include/wx/gtk1/choice.h +++ b/include/wx/gtk1/choice.h @@ -10,36 +10,16 @@ #ifndef __GTKCHOICEH__ #define __GTKCHOICEH__ -#ifdef __GNUG__ -#pragma interface +#if defined(__GNUG__) && !defined(__APPLE__) + #pragma interface "choice.h" #endif -#include "wx/defs.h" - -#include "wx/object.h" -#include "wx/list.h" -#include "wx/control.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxChoice; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const char *wxChoiceNameStr; - //----------------------------------------------------------------------------- // wxChoice //----------------------------------------------------------------------------- -class wxChoice : public wxControl +class wxChoice : public wxChoiceBase { - DECLARE_DYNAMIC_CLASS(wxChoice) - public: wxChoice(); wxChoice( wxWindow *parent, wxWindowID id, @@ -50,6 +30,8 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr ) { + m_strings = (wxSortedArrayString *)NULL; + Create(parent, id, pos, size, n, choices, style, validator, name); } ~wxChoice(); @@ -61,42 +43,41 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr ); - void Append( const wxString &item ); - void Append( const wxString &item, void* clientData ); - void Append( const wxString &item, wxClientData* clientData ); - - void SetClientData( int n, void* clientData ); - void* GetClientData( int n ); - void SetClientObject( int n, wxClientData* clientData ); - wxClientData* GetClientObject( int n ); - - void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); } - wxClientData *GetClientObject() const { return wxControl::GetClientObject(); } - void SetClientData( void *data ) { wxControl::SetClientData( data ); } - void *GetClientData() const { return wxControl::GetClientData(); } - - void Clear(); + // implement base class pure virtuals void Delete(int n); + void Clear(); - int FindString( const wxString &string ) const; - int GetColumns() const; - int GetSelection(); - wxString GetString( int n ) const; - wxString GetStringSelection() const; - int Number() const; - void SetColumns( int n = 1 ); + int GetSelection() const; void SetSelection( int n ); - void SetStringSelection( const wxString &string ); - // implementation + virtual int GetCount() const; + int FindString( const wxString& string ) const; + wxString GetString( int n ) const; + void SetString( int n, const wxString& string ); - wxList m_clientDataList; - wxList m_clientObjectList; +protected: + wxList m_clientList; // contains the client data for the items - void DisableEvents(); - void EnableEvents(); - void AppendCommon( const wxString &item ); void ApplyWidgetStyle(); + 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; + +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; + + DECLARE_DYNAMIC_CLASS(wxChoice) };