GetColumnTextValue() can't return a reference to a temporary string, so changed it...

[wxWidgets.git] / src / mac / carbon / choice.cpp

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index ff814d85612c467da7b0385e98fe893e58065bfc..b0ba01d97debc5e1cddc9b5957889e335439a923 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -101,7 +101,7 @@ bool wxChoice::Create(wxWindow *parent,
         SetSelection( 0 );
 
     // Needed because it is a wxControlWithItems
-    SetBestSize( size );
+    SetInitialSize( size );
 
     return true;
 }
@@ -359,6 +359,7 @@ wxSize wxChoice::DoGetBestSize() const
         wxCoord width, height ;
         dc.GetTextExtent( wxT("X"), &width, &height);
         int cx = width ;
+        lbHeight += 4;
 #else
         // And just a bit more
         int cx = ::TextWidth( "X" , 0 , 1 ) ;