don't call SelectObject() twice in SetBrush() nor SetFont() neither

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index b2a7d103da4694cb0a3837cf72c7a4d009193e86..4c8b9414a478fe4b8818e681550fb5aa101ec922 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -41,22 +41,17 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-    SetName(name);
-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
-
-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-
-    m_windowStyle = style;
     m_label = wxStripMenuCodes(label) ;
 
-    bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
+    if ( !wxControl::Create( parent, id, pos, size, style,
+                             wxDefaultValidator , name ) )
+    {
+        return false;
+    }
+
     SetBestSize( size ) ;
 
-    return ret;
+    return true;
 }
 
 const wxString punct = wxT(" ,.-;:!?");
@@ -238,8 +233,11 @@ void wxStaticText::SetLabel(const wxString& st )
     SetTitle( st ) ;
     m_label = st ;
     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+    {
+        // temporary fix until layout measurement and drawing are in synch again
+        Refresh() ;
         SetSize( GetBestSize() ) ;
-
+    }
     Refresh() ;
     Update() ;
 }
@@ -248,10 +246,17 @@ bool wxStaticText::SetFont(const wxFont& 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;
 }