Rebake from clean wx tree.

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

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 78bdc7059a02d5a4d678c9e2dfa0152d70111358..7fef4303bfc8e5a016d1f06466294d5fa7a5a07f 100644 (file)
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -22,16 +22,16 @@ 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 WXDLLEXPORT wxComboBox : public wxComboCtrl, public wxComboBoxBase
+class WXDLLIMPEXP_CORE wxComboBox : public wxComboCtrl, public wxComboBoxBase

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


@@ -91,7 +91,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();


@@ -151,6 +151,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 +168,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;