X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..8ffd43c56b793781fde046aa532340b92a0067eb:/include/wx/gtk/choice.h?ds=sidebyside diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index fe5586752b..0a7eeca3d8 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -2,13 +2,11 @@ // Name: choice.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKCHOICEH__ #define __GTKCHOICEH__ @@ -37,41 +35,60 @@ extern const char *wxChoiceNameStr; // wxChoice //----------------------------------------------------------------------------- -class wxChoice: public wxControl +class wxChoice : public wxControl { - DECLARE_DYNAMIC_CLASS(wxChoice) - - public: - - wxChoice(void); - inline wxChoice( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ) + DECLARE_DYNAMIC_CLASS(wxChoice) + +public: + wxChoice(); + wxChoice( wxWindow *parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, const wxString choices[] = (const wxString *) NULL, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr ) { - Create(parent, id, pos, size, n, choices, style, validator, name); + Create(parent, id, pos, size, n, choices, style, validator, name); } + ~wxChoice(); bool Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ); + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, const wxString choices[] = (wxString *) NULL, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr ); + void Append( const wxString &item ); - void Clear(void); + 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 Clear(); + void Delete(int n); + int FindString( const wxString &string ) const; - int GetColumns(void) const; - int GetSelection(void); + int GetColumns() const; + int GetSelection(); wxString GetString( int n ) const; - wxString GetStringSelection(void) const; - int Number(void) const; + wxString GetStringSelection() const; + int Number() const; void SetColumns( int n = 1 ); void SetSelection( int n ); void SetStringSelection( const wxString &string ); + + // implementation + + wxList m_clientDataList; + wxList m_clientObjectList; + + void AppendCommon( const wxString &item ); + void ApplyWidgetStyle(); }; #endif // __GTKCHOICEH__