X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0416c41834f36316a03720c4ed05cdf36964a2f3..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/gtk/combobox.h?ds=sidebyside diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h index e74e589182..d715d1dae8 100644 --- a/include/wx/gtk/combobox.h +++ b/include/wx/gtk/combobox.h @@ -11,101 +11,92 @@ #ifndef _WX_GTK_COMBOBOX_H_ #define _WX_GTK_COMBOBOX_H_ +#include "wx/choice.h" + +typedef struct _GtkEntry GtkEntry; + //----------------------------------------------------------------------------- // wxComboBox //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase +class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, + public wxTextEntry { public: - inline wxComboBox() {} - inline wxComboBox(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - 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 = wxComboBoxNameStr) + wxComboBox() + : wxChoice(), wxTextEntry() + { + Init(); + } + wxComboBox(wxWindow *parent, + wxWindowID id, + const wxString& value = wxEmptyString, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, const wxString choices[] = NULL, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxComboBoxNameStr) + : wxChoice(), wxTextEntry() { + Init(); Create(parent, id, value, pos, size, n, choices, style, validator, name); } - inline wxComboBox(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) + + wxComboBox(wxWindow *parent, wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxComboBoxNameStr) + : wxChoice(), wxTextEntry() { + Init(); Create(parent, id, value, pos, size, choices, style, validator, name); } - ~wxComboBox(); - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - 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 = wxComboBoxNameStr); + const wxString& value = wxEmptyString, + 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 = wxComboBoxNameStr); bool Create(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - // From wxItemContainerImmutable: - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString &text); - virtual int FindString(const wxString& s, bool bCase = false) const; - virtual void SetSelection(int n); - virtual int GetSelection() const; - wxString GetStringSelection() const; // not a virtual in parent class - - // From wxItemContainer: - virtual void Clear(); - virtual void Delete(unsigned int n); - - // From wxBomboBoxBase: - virtual wxString GetValue() const; - virtual void SetValue(const wxString& value); - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - virtual void SetInsertionPoint( long pos ); - virtual long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; - virtual void Replace( long from, long to, const wxString& value ); - virtual void SetSelection( long from, long to ); - virtual void SetEditable( bool editable ); - virtual void SetInsertionPointEnd() { SetInsertionPoint( -1 ); } - virtual void Remove(long from, long to) { Replace(from, to, wxEmptyString); } - virtual bool IsEditable() const; - virtual void Undo(); - virtual void Redo(); - virtual void SelectAll(); - virtual bool CanCopy() const; - virtual bool CanCut() const; - virtual bool CanPaste() const; - virtual bool CanUndo() const; - virtual bool CanRedo() const; - - // implementation - bool HasSelection() const; - void GetSelection( long* from, long* to ) const; - int GetCurrentSelection() const; - - virtual void SetFocus(); - - void OnSize( wxSizeEvent &event ); + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxComboBoxNameStr); + + // Set/GetSelection() from wxTextEntry and wxChoice + + virtual void SetSelection(int n) { wxChoice::SetSelection(n); } + virtual void SetSelection(long from, long to) + { wxTextEntry::SetSelection(from, to); } + + virtual int GetSelection() const { return wxChoice::GetSelection(); } + virtual void GetSelection(long *from, long *to) const + { return wxTextEntry::GetSelection(from, to); } + + virtual wxString GetStringSelection() const + { + return wxItemContainer::GetStringSelection(); + } + + virtual void Clear() + { + wxTextEntry::Clear(); + wxItemContainer::Clear(); + } + + bool IsEmpty() const { return wxItemContainer::IsEmpty(); } + void OnChar( wxKeyEvent &event ); // Standard event handling @@ -125,42 +116,44 @@ public: void OnUpdateDelete(wxUpdateUIEvent& event); void OnUpdateSelectAll(wxUpdateUIEvent& event); - bool m_ignoreNextUpdate:1; - wxList m_clientDataList; - wxList m_clientObjectList; - int m_prevSelection; - - void DisableEvents(); - void EnableEvents(); + virtual void DisableEvents(); + virtual void EnableEvents(); GtkWidget* GetConnectWidget(); - wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST - static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); protected: // From wxWindowGTK: - virtual void DoApplyWidgetStyle(GtkRcStyle *style); virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - // From wxItemContainer: - virtual int DoAppend(const wxString& item); - virtual int DoInsert(const wxString& item, unsigned int pos); - - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; - virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData); - virtual wxClientData* DoGetItemClientObject(unsigned int n) const; - - // From wxControl: - virtual wxSize DoGetBestSize() const; - // Widgets that use the style->base colour for the BG colour should // override this and return true. virtual bool UseGTKStyleBase() const { return true; } + // Override in derived classes to create combo box widgets with + // custom list stores. + virtual void GTKCreateComboBoxWidget(); + + // return the GtkEntry part of the combobox + GtkEntry *GetEntry() const { return m_entry; } + + GtkEntry* m_entry; + private: + // From wxTextEntry: + virtual wxWindow *GetEditableWindow() { return this; } + virtual GtkEditable *GetEditable() const; + virtual void EnableTextChangedEvents(bool enable) + { + if ( enable ) + EnableEvents(); + else + DisableEvents(); + } + + void Init(); + DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox) DECLARE_EVENT_TABLE() };