redraw forced for size changes (layout for measuring is simpler than word-wrapping...

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 2d81d33b16655270647a48e9d3640f7784e72291..4c8b9414a478fe4b8818e681550fb5aa101ec922 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -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;
 }

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 2d81d33b16655270647a48e9d3640f7784e72291..4c8b9414a478fe4b8818e681550fb5aa101ec922 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -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;
 }