corrected use of Print Manager Session APIs for Carbon targets

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

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 8136ac250c42b2fcc96ad48c3ffc59373f7a82b5..6e00a778984022dd9675ba0b10f9c9681b91a08d 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -62,8 +62,6 @@ bool wxStaticText::Create(wxWindow *parent,
     wxControl::SetLabel(label);
     m_widget = gtk_label_new( m_label.mbc_str() );
     
     wxControl::SetLabel(label);
     m_widget = gtk_label_new( m_label.mbc_str() );
     

-    wxControl::SetFont( parent->GetFont() );
-

     GtkJustification justify;
     if ( style & wxALIGN_CENTER )
       justify = GTK_JUSTIFY_CENTER;
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )
       justify = GTK_JUSTIFY_CENTER;


@@ -80,11 +78,22 @@ bool wxStaticText::Create(wxWindow *parent,
     // do not move this call elsewhere
     gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
 
     // do not move this call elsewhere
     gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
 

-    SetSizeOrDefault( size );
-

     m_parent->DoAddChild( this );
 
     PostCreation();
     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() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );


@@ -141,7 +150,7 @@ wxSize wxStaticText::DoGetBestSize() const
     GtkRequisition req;
     req.width = 2;
     req.height = 2;
     GtkRequisition req;
     req.width = 2;
     req.height = 2;

-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request )
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )

         (m_widget, &req );
 
     return wxSize(req.width, req.height);
         (m_widget, &req );
 
     return wxSize(req.width, req.height);