Rename identifier

[wxWidgets.git] / include / wx / univ / combobox.h

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 2b26eb5180bf2427f7cf9f23dc1a45fc0d371c14..04343ac4fe36545bd25faaa5a3dab7638607095e 100644 (file)
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -22,16 +22,20 @@ class WXDLLIMPEXP_FWD_CORE wxListBox;
 // ----------------------------------------------------------------------------
 
 // choose the next/prev/specified (by numArg) item
 // ----------------------------------------------------------------------------
 
 // 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
 // ----------------------------------------------------------------------------
 
 
 
 // ----------------------------------------------------------------------------
 // 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 wxWindowWithItems<wxComboCtrl, wxItemContainer>

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such


@@ -91,7 +95,7 @@ public:
     // implement the combobox interface
 
     // wxTextCtrl methods
     // 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();
     virtual void SetValue(const wxString& value);
     virtual void WriteText(const wxString& value);
     virtual void Copy();


@@ -118,6 +122,15 @@ public:
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 
     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);
     // wxControlWithItems methods
     virtual void DoClear();
     virtual void DoDeleteOneItem(unsigned int n);


@@ -129,8 +142,6 @@ public:
     virtual int GetSelection() const;
     virtual wxString GetStringSelection() const;
 
     virtual int GetSelection() const;
     virtual wxString GetStringSelection() const;
 

-    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
-

     // we have our own input handler and our own actions
     // (but wxComboCtrl already handled Popup/Dismiss)
     /*
     // we have our own input handler and our own actions
     // (but wxComboCtrl already handled Popup/Dismiss)
     /*


@@ -151,6 +162,8 @@ public:
     virtual void SetClientDataType(wxClientDataType clientDataItemsType);
 
 protected:
     virtual void SetClientDataType(wxClientDataType clientDataItemsType);
 
 protected:

+    virtual wxString DoGetValue() const;
+

     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type);
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type);


@@ -166,6 +179,9 @@ protected:
     wxListBox *GetLBox() const { return m_lbox; }
 
 private:
     wxListBox *GetLBox() const { return m_lbox; }
 
 private:

+    // implement wxTextEntry pure virtual method
+    virtual wxWindow *GetEditableWindow() { return this; }
+

     // the popup listbox
     wxListBox *m_lbox;
 
     // the popup listbox
     wxListBox *m_lbox;