X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5e27805de786dbb3976782ba2a3365c27256031..96bcf4f9cc8401fc499215bbe9181c351cc42d43:/include/wx/gtk1/combobox.h?ds=sidebyside diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h index 472aec940f..f48a786405 100644 --- a/include/wx/gtk1/combobox.h +++ b/include/wx/gtk1/combobox.h @@ -17,6 +17,9 @@ #endif #include "wx/defs.h" + +#if wxUSE_COMBOBOX + #include "wx/object.h" #include "wx/control.h" @@ -31,7 +34,7 @@ class wxComboBox; //----------------------------------------------------------------------------- extern const char* wxComboBoxNameStr; -extern const char* wxEmptyString; +extern const wxChar* wxEmptyString; //----------------------------------------------------------------------------- // wxComboBox @@ -39,12 +42,9 @@ extern const char* wxEmptyString; class wxComboBox : public wxControl { - DECLARE_DYNAMIC_CLASS(wxComboBox) - public: - - inline wxComboBox() {} - inline wxComboBox(wxWindow *parent, wxWindowID id, + inline wxComboBox() {} + inline wxComboBox(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -52,11 +52,11 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr) - { - Create(parent, id, value, pos, size, n, choices, style, validator, name); - } - ~wxComboBox(); - bool Create(wxWindow *parent, wxWindowID id, + { + Create(parent, id, value, pos, size, n, choices, style, validator, name); + } + ~wxComboBox(); + bool Create(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -65,55 +65,72 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr); - 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 Append( const wxString &item ); + void Append( const wxString &item, void* clientData ); + void Append( const wxString &item, wxClientData* clientData ); - void Clear(); - void Delete( int n ); + void SetClientData( int n, void* clientData ); + void* GetClientData( int n ); + void SetClientObject( int n, wxClientData* clientData ); + wxClientData* GetClientObject( int n ); - int FindString( const wxString &item ); - int GetSelection() const; - wxString GetString( int n ) const; - wxString GetStringSelection() const; - int Number() const; - void SetSelection( int n ); - void SetStringSelection( const wxString &string ); - - wxString GetValue() const; - void SetValue(const wxString& value); - - void Copy(); - void Cut(); - void Paste(); - void SetInsertionPoint( long pos ); - void SetInsertionPointEnd(); - long GetInsertionPoint() const; - long GetLastPosition() const; - void Replace( long from, long to, const wxString& value ); - void Remove( long from, long to ); - void SetSelection( long from, long to ); - void SetEditable( bool editable ); + 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(); + void Delete( int n ); - void OnSize( wxSizeEvent &event ); + int FindString( const wxString &item ); + int GetSelection() const; + wxString GetString( int n ) const; + wxString GetStringSelection() const; + int Number() const; + void SetSelection( int n ); + void SetStringSelection( const wxString &string ); + + wxString GetValue() const; + void SetValue(const wxString& value); + + void Copy(); + void Cut(); + void Paste(); + void SetInsertionPoint( long pos ); + void SetInsertionPointEnd(); + long GetInsertionPoint() const; + long GetLastPosition() const; + void Replace( long from, long to, const wxString& value ); + void Remove( long from, long to ); + void SetSelection( long from, long to ); + void SetEditable( bool editable ); -// implementation + // implementation - bool m_alreadySent; - wxList m_clientDataList; - wxList m_clientObjectList; - - void AppendCommon( const wxString &item ); - GtkWidget* GetConnectWidget(); - bool IsOwnGtkWindow( GdkWindow *window ); - void ApplyWidgetStyle(); + void OnSize( wxSizeEvent &event ); + void OnChar( wxKeyEvent &event ); - DECLARE_EVENT_TABLE() + bool m_alreadySent; + wxList m_clientDataList; + wxList m_clientObjectList; + + void DisableEvents(); + void EnableEvents(); + void AppendCommon( const wxString &item ); + GtkWidget* GetConnectWidget(); + bool IsOwnGtkWindow( GdkWindow *window ); + void ApplyWidgetStyle(); + +protected: + virtual wxSize DoGetBestSize() const; + +private: + DECLARE_DYNAMIC_CLASS(wxComboBox) + DECLARE_EVENT_TABLE() }; -#endif // __GTKCOMBOBOXH__ +#endif + +#endif + + // __GTKCOMBOBOXH__