cocoa needs a special implementation for read-only combo box

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index 05c14a96aa5ca69e8301db02ecf9090fcb7371d0..e3c14f8ad0793438259706744d5ef6313430728c 100644 (file)
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -104,10 +104,10 @@ class WXDLLIMPEXP_CORE wxComboBox :
 
     virtual unsigned int GetCount() const;
 
+    virtual void SetValue(const wxString& value);
 // these methods are provided by wxTextEntry for the native impl.
 #if wxOSX_USE_CARBON
     // Text field functions
-    virtual void SetValue(const wxString& value);
     virtual wxString GetValue() const;
     virtual void WriteText(const wxString& text);
 

diff --git a/src/osx/combobox_osx.cpp b/src/osx/combobox_osx.cpp
index 762d575df1bd63c604060906e2b9d37f79f89061..3487ef9b178b6470cc504da89311d710bc48e928 100644 (file)
--- a/src/osx/combobox_osx.cpp
+++ b/src/osx/combobox_osx.cpp
@@ -189,6 +189,14 @@ wxString wxComboBox::GetStringSelection() const
     return sel == wxNOT_FOUND ? wxString() : GetString(sel);
 }
 
+void wxComboBox::SetValue(const wxString& value)
+{
+    if ( HasFlag(wxCB_READONLY) )
+        SetStringSelection( value ) ;
+    else
+        wxTextEntry::SetValue( value );
+}
+
 void wxComboBox::SetString(unsigned int n, const wxString& s)
 {
     // Notice that we shouldn't delete and insert the item in this control