Make wxDataViewCtrl::GetBestSize() return a height of 80 on OSX as per the other...

[wxWidgets.git] / src / osx / carbon / combobox.cpp

diff --git a/src/osx/carbon/combobox.cpp b/src/osx/carbon/combobox.cpp
index 54c70ebca55c6121be9a8e659237094409b96bf5..6792bbf1ae12d59c5c61f317d1a63a141c93eb46 100644 (file)
--- a/src/osx/carbon/combobox.cpp
+++ b/src/osx/carbon/combobox.cpp
@@ -394,6 +394,13 @@ bool wxComboBox::Create(wxWindow *parent,
     return true;
 }
 
+wxString wxComboBox::DoGetValue() const
+{
+    wxCHECK_MSG( m_text, wxString(), "can't be called for read-only combobox" );
+
+    return m_text->GetValue();
+}
+
 wxString wxComboBox::GetValue() const
 {
     wxString        result;
@@ -652,7 +659,7 @@ bool wxComboBox::CanRedo() const
         return false;
 }
 
-bool wxComboBox::HandleClicked( double timestampsec )
+bool wxComboBox::OSXHandleClicked( double timestampsec )
 {
 /*
     For consistency with other platforms, clicking in the text area does not constitute a selection