Warning fix about assigning unused value + little source cleaning.

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

diff --git a/src/mac/classic/stattext.cpp b/src/mac/classic/stattext.cpp
index 1c0facdbf70d86610846d12989813d7cef848fd9..38c4b1041b61a11dd688129b59fe2f1e917e4981 100644 (file)
--- a/src/mac/classic/stattext.cpp
+++ b/src/mac/classic/stattext.cpp
@@ -236,6 +236,7 @@ void wxStaticText::SetLabel(const wxString& st )
     {
         // temporary fix until layout measurement and drawing are in synch again
         Refresh() ;
     {
         // temporary fix until layout measurement and drawing are in synch again
         Refresh() ;

+        InvalidateBestSize();

         SetSize( GetBestSize() ) ;
     }
     Refresh() ;
         SetSize( GetBestSize() ) ;
     }
     Refresh() ;


@@ -253,7 +254,8 @@ bool wxStaticText::SetFont(const wxFont& font)
            if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
            {
                // temporary fix until layout measurement and drawing are in synch again
            if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
            {
                // temporary fix until layout measurement and drawing are in synch again

-            Refresh() ;
+                Refresh() ;
+                InvalidateBestSize();

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