X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63f7d5022e786be61c0226314dac98739f49a426..563f85a9566128124df05eed60634a268dadf4c8:/include/wx/univ/combobox.h?ds=sidebyside

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 30a46691f6..7fef4303bf 100644
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -22,9 +22,9 @@ 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")
 
 
 // ----------------------------------------------------------------------------
@@ -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);