proper UTF32 / 16 conversions added

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

diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp
index 042a6f2c35e3902fd35e127b135ba72d5fe5d0e3..f269196711157a8e22ccda5890817a5221162d72 100644 (file)
--- a/src/mac/carbon/tooltip.cpp
+++ b/src/mac/carbon/tooltip.cpp
@@ -233,7 +233,7 @@ void wxMacToolTip::Draw()
         LocalToGlobal( (Point *) &tag.absHotRect.top );
         LocalToGlobal( (Point *) &tag.absHotRect.bottom );
         SetPort( port );
-        m_helpTextRef = m_label ;
+        m_helpTextRef.Assign( m_label  , wxFONTENCODING_DEFAULT ) ;
         tag.content[kHMMinimumContentIndex].contentType = kHMCFStringContent ;
         tag.content[kHMMinimumContentIndex].u.tagCFString = m_helpTextRef ;
         tag.content[kHMMaximumContentIndex].contentType = kHMCFStringContent ;
@@ -262,7 +262,7 @@ void wxMacToolTip::Draw()
         int width = 0 ;
         int thiswidth = 0 ;
         int laststop = 0 ;
-        wxCharBuffer text = wxMacStringToCString( m_label ) ;
+        wxCharBuffer text = m_label.mb_str( wxConvLocal)  ;
 
         while( i < length )
         {