Corrected small mistake (set static variable)

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index af8c6a1063c0096a60bf046886e0845358d64b29..2055e54fd51de5510f31cdb94a6fd18cd808c2d1 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -51,8 +51,8 @@ bool wxStaticText::Create(wxWindow *parent,
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {

-        wxFAIL_MSG( _T("wxXX creation failed") );
-       return FALSE;
+        wxFAIL_MSG( wxT("wxXX creation failed") );
+        return FALSE;

     }
 
     // notice that we call the base class version which will just remove the
     }
 
     // notice that we call the base class version which will just remove the


@@ -71,12 +71,10 @@ bool wxStaticText::Create(wxWindow *parent,
       justify = GTK_JUSTIFY_LEFT;
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 
       justify = GTK_JUSTIFY_LEFT;
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 

-//#if GTK_MINOR_VERSION == 2

     // 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);
     // 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);

-//#endif // GTK 1.2.x
-    
+

     GtkRequisition req;
     (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
 
     GtkRequisition req;
     (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
 


@@ -98,7 +96,7 @@ bool wxStaticText::Create(wxWindow *parent,
     return TRUE;
 }
 
     return TRUE;
 }
 

-wxString wxStaticText::GetLabel(void) const
+wxString wxStaticText::GetLabel() const

 {
     char *str = (char *) NULL;
     gtk_label_get( GTK_LABEL(m_widget), &str );
 {
     char *str = (char *) NULL;
     gtk_label_get( GTK_LABEL(m_widget), &str );


@@ -112,14 +110,15 @@ void wxStaticText::SetLabel( const wxString &label )
 
     gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
 
 
     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 );
+    // 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( req.width, req.height );
+    }

 }
 
 void wxStaticText::ApplyWidgetStyle()
 }
 
 void wxStaticText::ApplyWidgetStyle()