Check for menu title being non-empty when appending it to the menu bar.

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

diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp
index f871ed3d262d0aa5fc65973c7f072d71af69a929..2668c1b1cde8c34f7c7b1fcf510e7bfc6960fc66 100644 (file)
--- a/src/osx/choice_osx.cpp
+++ b/src/osx/choice_osx.cpp
@@ -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 );
@@ -142,7 +142,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 +230,7 @@ void * wxChoice::DoGetItemClientData(unsigned int n) const
     return (void *)m_datas[n];
 }
 
-bool wxChoice::HandleClicked( double timestampsec )
+bool wxChoice::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
 
@@ -241,7 +241,7 @@ bool wxChoice::HandleClicked( double timestampsec )
         event.SetInt( n );
         event.SetString( GetStringSelection() );
         event.SetEventObject( this );
-        
+
         if ( HasClientObjectData() )
             event.SetClientObject( GetClientObject( n ) );
         else if ( HasClientUntypedData() )
@@ -256,7 +256,8 @@ bool wxChoice::HandleClicked( 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 +281,6 @@ wxSize wxChoice::DoGetBestSize() const
         wxCoord width, height ;
         dc.GetTextExtent( wxT("X"), &width, &height);
         int cx = width ;
-        lbHeight += 4;
 
         lbWidth += cx ;
     }