X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b152d8c56c72577b64de63f4d3b001db5d65f85f..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/univ/combobox.h?ds=sidebyside

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 78bdc7059a..a8ccdf0564 100644
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxListBox;
 // 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
@@ -91,7 +91,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();
@@ -151,6 +151,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 +168,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;