Try to better revert to the original string value in wxBitmapComboBox::RecreateControl()

[wxWidgets.git] / src / osx / choice_osx.cpp

diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp
index 15e68706841ba57062648fe1b7622107360d30bc..966974de067a369fb6697de8f8eaa0d71114df0d 100644 (file)
--- a/src/osx/choice_osx.cpp
+++ b/src/osx/choice_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: choice.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -72,10 +72,10 @@ bool wxChoice::Create(wxWindow *parent,
 
     if ( !wxChoiceBase::Create( parent, id, pos, size, style, validator, name ) )
         return false;
-        
+
     m_popUpMenu = new wxMenu();
     m_popUpMenu->SetNoEventsMode(true);
-    
+
     m_peer = wxWidgetImpl::CreateChoice( this, parent, id, m_popUpMenu, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate( pos, size );
@@ -126,7 +126,10 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
             m_strings.Insert( items[i], idx );
         }
 
-        m_popUpMenu->Insert( idx, i+1, items[i] );
+        wxString text = items[i];
+        if (text == wxEmptyString)
+            text = " ";  // menu items can't have empty labels
+        m_popUpMenu->Insert( idx, i+1, text );
         m_datas.Insert( NULL, idx );
         AssignNewItemClientData(idx, clientData, i, type);
     }
@@ -142,7 +145,7 @@ void wxChoice::DoDeleteOneItem(unsigned int n)
 
     if ( HasClientObjectData() )
         delete GetClientObject( n );
-    
+
     m_popUpMenu->Delete( m_popUpMenu->FindItemByPosition( n ) );
 
     m_strings.RemoveAt( n ) ;
@@ -230,7 +233,7 @@ void * wxChoice::DoGetItemClientData(unsigned int n) const
     return (void *)m_datas[n];
 }
 
-bool wxChoice::OSXHandleClicked( double timestampsec )
+bool wxChoice::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
 
@@ -241,7 +244,7 @@ bool wxChoice::OSXHandleClicked( double timestampsec )
         event.SetInt( n );
         event.SetString( GetStringSelection() );
         event.SetEventObject( this );
-        
+
         if ( HasClientObjectData() )
             event.SetClientObject( GetClientObject( n ) );
         else if ( HasClientUntypedData() )
@@ -256,7 +259,8 @@ bool wxChoice::OSXHandleClicked( double timestampsec )
 wxSize wxChoice::DoGetBestSize() const
 {
     int lbWidth = GetCount() > 0 ? 20 : 100;  // some defaults
-    int lbHeight = 20;
+    wxSize baseSize = wxWindow::DoGetBestSize();
+    int lbHeight = baseSize.y;
     int wLine;
 
     {
@@ -280,7 +284,6 @@ wxSize wxChoice::DoGetBestSize() const
         wxCoord width, height ;
         dc.GetTextExtent( wxT("X"), &width, &height);
         int cx = width ;
-        lbHeight += 4;
 
         lbWidth += cx ;
     }