From 02526cc9d207fd04da9a62d9c58566adcebaef02 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 23 Sep 2014 17:40:39 +0000
Subject: [PATCH] use DoGetValue() in parent class will be enough, and add
 readonly support to SetValue()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/univ/combobox.h |  2 --
 src/univ/combobox.cpp      | 11 +++--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index d4940f87c2..b584bbea26 100644
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -163,8 +163,6 @@ public:
     virtual void SetClientDataType(wxClientDataType clientDataItemsType) wxOVERRIDE;
 
 protected:
-    virtual wxString DoGetValue() const wxOVERRIDE;
-
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type) wxOVERRIDE;
diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index a153ca50d5..3afcf097d3 100644
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -270,17 +270,12 @@ wxComboBox::~wxComboBox()
 // wxComboBox methods forwarded to wxTextCtrl
 // ----------------------------------------------------------------------------
 
-wxString wxComboBox::DoGetValue() const
-{
-    return GetTextCtrl() ? GetTextCtrl()->GetValue() : m_valueString;
-}
-
 void wxComboBox::SetValue(const wxString& value)
 {
-    if ( GetTextCtrl() )
-        GetTextCtrl()->SetValue(value);
+    if ( HasFlag(wxCB_READONLY) )
+        SetStringSelection(value);
     else
-        m_valueString = value;
+        GetTextCtrl()->SetValue(value);
 }
 
 void wxComboBox::WriteText(const wxString& value)