X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/185fa6bf6f5f19944cf4ce6385df7a4a04c595db..f22e0c3c3f90510f1a92ab148f20b2453e338626:/src/gtk1/stattext.cpp?ds=inline

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 2055e54fd5..b89853149c 100644
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -61,6 +61,10 @@ bool wxStaticText::Create(wxWindow *parent,
     // effect of changing the control size which might not be desirable
     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 )
@@ -75,13 +79,7 @@ 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 );
+    SetSizeOrDefault( size );
 
     m_parent->DoAddChild( this );
 
@@ -89,8 +87,6 @@ bool wxStaticText::Create(wxWindow *parent,
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
-
     Show( TRUE );
 
     return TRUE;
@@ -113,11 +109,7 @@ void wxStaticText::SetLabel( const wxString &label )
     // 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 );
-
-        SetSize( req.width, req.height );
+        SetSize( GetBestSize() );
     }
 }
 
@@ -126,4 +118,3 @@ void wxStaticText::ApplyWidgetStyle()
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
-