X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97d7bfb8b470d62d8b2f142d5287b8217d9f3e8b..307fc8d5821e4dcffd7f2975ce62791c5f37982d:/src/gtk/stattext.cpp diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index 6816895a37..39664e6f76 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/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,17 +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); - GtkRequisition req; - (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req ); - - wxSize newSize = size; - if (newSize.x == -1) newSize.x = req.width; - if (newSize.y == -1) newSize.y = req.height; - SetSize( newSize.x, newSize.y ); + // 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() ); @@ -113,14 +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) ) - { - GtkRequisition req; - (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) - (m_widget, &req ); + if (!HasFlag(wxST_NO_AUTORESIZE)) + SetSize( GetBestSize() ); +} - SetSize( req.width, req.height ); - } +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() @@ -129,3 +138,21 @@ void wxStaticText::ApplyWidgetStyle() 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(m_widget)->klass )->size_request ) + (m_widget, &req ); + + return wxSize(req.width, req.height); +} +