explicitly return NFR_UNICODE from WM_NOTIFYFORMAT when using MSLU

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

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 2d81d33b16655270647a48e9d3640f7784e72291..1c0facdbf70d86610846d12989813d7cef848fd9 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -186,7 +186,7 @@ wxSize wxStaticText::DoGetBestSize() const
     wxString curLine;
     for ( const wxChar *pc = m_label; ; pc++ )
     {
     wxString curLine;
     for ( const wxChar *pc = m_label; ; pc++ )
     {

-        if ( *pc == wxT('\n') || *pc == wxT('\0') )
+        if ( *pc == wxT('\n') || *pc == wxT('\r') || *pc == wxT('\0') )

         {
             if ( !curLine )
             {
         {
             if ( !curLine )
             {


@@ -212,7 +212,7 @@ wxSize wxStaticText::DoGetBestSize() const
                 heightTextTotal++;  // FIXME: why is this necessary?
             }
 
                 heightTextTotal++;  // FIXME: why is this necessary?
             }
 

-            if ( *pc == wxT('\n') ) {
+            if ( *pc == wxT('\n') || *pc == wxT('\r')) {

                curLine.Empty();
             }
             else {
                curLine.Empty();
             }
             else {


@@ -233,8 +233,11 @@ void wxStaticText::SetLabel(const wxString& st )
     SetTitle( st ) ;
     m_label = st ;
     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
     SetTitle( st ) ;
     m_label = st ;
     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )

+    {
+        // temporary fix until layout measurement and drawing are in synch again
+        Refresh() ;

         SetSize( GetBestSize() ) ;
         SetSize( GetBestSize() ) ;

-
+    }

     Refresh() ;
     Update() ;
 }
     Refresh() ;
     Update() ;
 }


@@ -243,10 +246,17 @@ bool wxStaticText::SetFont(const wxFont& font)
 {
     bool ret = wxControl::SetFont(font);
 
 {
     bool ret = wxControl::SetFont(font);
 

-    // adjust the size of the window to fit to the label unless autoresizing is
-    // disabled
-    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-        SetSize( GetBestSize() );
+       if ( ret )
+       {
+           // adjust the size of the window to fit to the label unless autoresizing is
+           // disabled
+           if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+           {
+               // temporary fix until layout measurement and drawing are in synch again
+            Refresh() ;
+               SetSize( GetBestSize() );
+           }
+       }

 
     return ret;
 }
 
     return ret;
 }