DoGetBestSize fix, the lbWidth was not getting updated because of a

misplaced #endif

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 669776864952f84846be0fd270e35fcf30a63404..54717cfb189097ff920896a883cdb223582d49e0 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -246,6 +246,7 @@ wxSize wxListBox::DoGetBestSize() const
     {
 #if wxMAC_USE_CORE_GRAPHICS
         wxClientDC dc(const_cast<wxListBox*>(this));
     {
 #if wxMAC_USE_CORE_GRAPHICS
         wxClientDC dc(const_cast<wxListBox*>(this));

+        dc.SetFont(GetFont());

 #else
         wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef)MacGetTopLevelWindowRef() ) );
 
 #else
         wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef)MacGetTopLevelWindowRef() ) );
 


@@ -288,9 +289,8 @@ wxSize wxListBox::DoGetBestSize() const
 #else
             wLine = ::TextWidth( str.c_str(), 0, str.length() );
 #endif
 #else
             wLine = ::TextWidth( str.c_str(), 0, str.length() );
 #endif

-
-            lbWidth = wxMax( lbWidth, wLine );

 #endif
 #endif

+            lbWidth = wxMax( lbWidth, wLine );

         }
 
         // Add room for the scrollbar
         }
 
         // Add room for the scrollbar


@@ -300,10 +300,10 @@ wxSize wxListBox::DoGetBestSize() const
         int cy = 12;
 #if wxMAC_USE_CORE_GRAPHICS
         wxCoord width, height ;
         int cy = 12;
 #if wxMAC_USE_CORE_GRAPHICS
         wxCoord width, height ;

-        dc.GetTextExtent( wxT("X") , &width, &height);
+        dc.GetTextExtent( wxT("XX") , &width, &height);

         int cx = width ;
 #else
         int cx = width ;
 #else

-        int cx = ::TextWidth( "X", 0, 1 );
+        int cx = ::TextWidth( "XX", 0, 1 );

 #endif
         lbWidth += cx;
 
 #endif
         lbWidth += cx;