Replaced the old wxGetResource implementation with one based

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

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 102a55b09ad85b2465e2e58ce2b90d7b1193c19c..b89853149c3583c4e164b02f20df2d0dbac99065 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -48,9 +48,12 @@ bool wxStaticText::Create(wxWindow *parent,
 {
     m_needParent = TRUE;
 
-    wxSize newSize = size;
-
-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxXX creation failed") );
+        return FALSE;
+    }
 
     // notice that we call the base class version which will just remove the
     // '&' characters from the string, but not set the label's text to it
@@ -58,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 )
@@ -68,30 +75,24 @@ bool wxStaticText::Create(wxWindow *parent,
       justify = GTK_JUSTIFY_LEFT;
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 
-    GtkRequisition req;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
-
-    if (newSize.x == -1) newSize.x = req.width;
-    if (newSize.y == -1) newSize.y = req.height;
-
-    SetSize( newSize.x, newSize.y );
+    // GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2
+    static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
+    gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
 
-    m_parent->AddChild( this );
+    SetSizeOrDefault( size );
 
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );
 
     PostCreation();
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
-
     Show( TRUE );
 
     return TRUE;
 }
 
-wxString wxStaticText::GetLabel(void) const
+wxString wxStaticText::GetLabel() const
 {
     char *str = (char *) NULL;
     gtk_label_get( GTK_LABEL(m_widget), &str );
@@ -105,14 +106,11 @@ 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
-
-    // TODO there should be a way to prevent SetLabel() from doing it (an
-    //      additional parameter?)
-    GtkRequisition req;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
-
-    SetSize( req.width, req.height );
+    // adjust the label size to the new label unless disabled
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+    {
+        SetSize( GetBestSize() );
+    }
 }
 
 void wxStaticText::ApplyWidgetStyle()
@@ -120,4 +118,3 @@ void wxStaticText::ApplyWidgetStyle()
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
-