From 7749035c4edc84ff7ad722c0de8ff1679b68976f Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 12 Jan 2007 18:25:21 +0000 Subject: [PATCH] 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 --- src/mac/carbon/listbox.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index 6697768649..54717cfb18 100644 --- 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(this)); + dc.SetFont(GetFont()); #else wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef)MacGetTopLevelWindowRef() ) ); @@ -288,9 +289,8 @@ wxSize wxListBox::DoGetBestSize() const #else wLine = ::TextWidth( str.c_str(), 0, str.length() ); #endif - - lbWidth = wxMax( lbWidth, wLine ); #endif + lbWidth = wxMax( lbWidth, wLine ); } // Add room for the scrollbar @@ -300,10 +300,10 @@ wxSize wxListBox::DoGetBestSize() const 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 = ::TextWidth( "X", 0, 1 ); + int cx = ::TextWidth( "XX", 0, 1 ); #endif lbWidth += cx;