Fixed some off-by-one errors that were visible on wxGTK but actually

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

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index b89853149c3583c4e164b02f20df2d0dbac99065..6e00a778984022dd9675ba0b10f9c9681b91a08d 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -62,10 +62,6 @@ bool wxStaticText::Create(wxWindow *parent,
     wxControl::SetLabel(label);
     m_widget = gtk_label_new( m_label.mbc_str() );
     
-    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
-
-    SetFont( parent->GetFont() );
-
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )
       justify = GTK_JUSTIFY_CENTER;
@@ -79,11 +75,25 @@ bool wxStaticText::Create(wxWindow *parent,
     static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
     gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
 
-    SetSizeOrDefault( size );
+    // do not move this call elsewhere
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
 
     m_parent->DoAddChild( this );
 
     PostCreation();
+    
+    ApplyWidgetStyle();
+
+    wxControl::SetFont( parent->GetFont() );
+    
+    wxSize size_best( DoGetBestSize() );
+    wxSize new_size( size );
+    if (new_size.x == -1)
+        new_size.x = size_best.x;
+    if (new_size.y == -1)
+        new_size.y = size_best.y;
+    if ((new_size.x != size.x) || (new_size.y != size.y))
+        SetSize( new_size.x, new_size.y );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
@@ -107,10 +117,19 @@ void wxStaticText::SetLabel( const wxString &label )
     gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
 
     // adjust the label size to the new label unless disabled
-    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-    {
+    if (!HasFlag(wxST_NO_AUTORESIZE))
         SetSize( GetBestSize() );
-    }
+}
+
+bool wxStaticText::SetFont( const wxFont &font )
+{
+    bool ret = wxControl::SetFont(font);
+
+    // adjust the label size to the new label unless disabled
+    if (!HasFlag(wxST_NO_AUTORESIZE))
+        SetSize( GetBestSize() );
+    
+    return ret;
 }
 
 void wxStaticText::ApplyWidgetStyle()
@@ -118,3 +137,22 @@ void wxStaticText::ApplyWidgetStyle()
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
+
+wxSize wxStaticText::DoGetBestSize() const
+{
+    // Do not return any arbitrary default value...
+    wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") );
+
+    // this invalidates the size request
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+
+    GtkRequisition req;
+    req.width = 2;
+    req.height = 2;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
+        (m_widget, &req );
+
+    return wxSize(req.width, req.height);
+}
+