X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..c9ccc09c64f4c29d4667796bef7b507d9e8d25ed:/include/wx/univ/combobox.h

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 2b26eb5180..93b3128633 100644
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -22,16 +22,19 @@ class WXDLLIMPEXP_FWD_CORE wxListBox;
 // ----------------------------------------------------------------------------
 
 // choose the next/prev/specified (by numArg) item
-#define wxACTION_COMBOBOX_SELECT_NEXT _T("next")
-#define wxACTION_COMBOBOX_SELECT_PREV _T("prev")
-#define wxACTION_COMBOBOX_SELECT      _T("select")
+#define wxACTION_COMBOBOX_SELECT_NEXT wxT("next")
+#define wxACTION_COMBOBOX_SELECT_PREV wxT("prev")
+#define wxACTION_COMBOBOX_SELECT      wxT("select")
 
 
 // ----------------------------------------------------------------------------
 // wxComboBox: a combination of text control and a listbox
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxComboBox : public wxComboCtrl, public wxComboBoxBase
+// NB: Normally we'd like wxComboBox to inherit from wxComboBoxBase, but here
+//     we can't really do that since both wxComboBoxBase and wxComboCtrl inherit
+//     from wxTextCtrl.
+class WXDLLIMPEXP_CORE wxComboBox : public wxComboCtrl, public wxItemContainer
 {
 public:
     // ctors and such
@@ -91,7 +94,7 @@ public:
     // implement the combobox interface
 
     // wxTextCtrl methods
-    virtual wxString GetValue() const;
+    virtual wxString GetValue() const { return DoGetValue(); }
     virtual void SetValue(const wxString& value);
     virtual void WriteText(const wxString& value);
     virtual void Copy();
@@ -118,6 +121,15 @@ public:
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 
+    // override these methods to disambiguate between two base classes versions
+    virtual void Clear()
+    {
+        wxComboCtrl::Clear();
+        wxItemContainer::Clear();
+    }
+
+    bool IsEmpty() const { return wxItemContainer::IsEmpty(); }
+
     // wxControlWithItems methods
     virtual void DoClear();
     virtual void DoDeleteOneItem(unsigned int n);
@@ -151,6 +163,8 @@ public:
     virtual void SetClientDataType(wxClientDataType clientDataItemsType);
 
 protected:
+    virtual wxString DoGetValue() const;
+
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type);
@@ -166,6 +180,9 @@ protected:
     wxListBox *GetLBox() const { return m_lbox; }
 
 private:
+    // implement wxTextEntry pure virtual method
+    virtual wxWindow *GetEditableWindow() { return this; }
+
     // the popup listbox
     wxListBox *m_lbox;