fixing some redrawing bugs overpainting foreign window's area under OS9, reintroduced...

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

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 863b944cb4deed30a7f134c003ed2cfe847d6496..37f432cff0a318b36131d7f4eb29fc6729424649 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -49,7 +49,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     Rect bounds ;
     Str255 title ;
     
-    MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
+    MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;
     m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , -12345 , 0 , 
         kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
     
@@ -169,7 +169,7 @@ wxString wxChoice::GetString(int n) const
 void wxChoice::DoSetItemClientData( int n, void* clientData )
 {
     wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),
-                 "invalid index in wxChoice::SetClientData" );
+                 wxT("invalid index in wxChoice::SetClientData") );
     
     m_datas[n] = (char*) clientData ;
 }
@@ -177,7 +177,7 @@ void wxChoice::DoSetItemClientData( int n, void* clientData )
 void *wxChoice::DoGetItemClientData(int n) const
 {
     wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,
-                 "invalid index in wxChoice::GetClientData" );
+                 wxT("invalid index in wxChoice::GetClientData") );
     return (void *)m_datas[n];
 }
 
@@ -238,7 +238,20 @@ wxSize wxChoice::DoGetBestSize() const
         // Find the widest line
         for(int i = 0; i < GetCount(); i++) {
             wxString str(GetString(i));
-            wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
+        #if wxUSE_UNICODE
+            Point bounds={0,0} ;
+            SInt16 baseline ;
+            ::GetThemeTextDimensions( wxMacCFStringHolder( str ) ,
+                kThemeCurrentPortFont,
+                kThemeStateActive,
+                false,
+                &bounds,
+                &baseline );
+            wLine = bounds.h ;
+        #else
+            wxCharBuffer text = wxMacStringToCString( str ) ;
+            wLine = ::TextWidth( text , 0 , strlen(text) ) ;
+        #endif
             lbWidth = wxMax(lbWidth, wLine);
         }
         // Add room for the popup arrow