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
wxControl::SetLabel(label);
m_widget = gtk_label_new( m_label.mbc_str() );
+ SetFont( parent->GetFont() );
+
GtkJustification justify;
if ( style & wxALIGN_CENTER )
justify = GTK_JUSTIFY_CENTER;
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);
-//#endif // GTK 1.2.x
-
+
GtkRequisition req;
(* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
- SetFont( parent->GetFont() );
-
Show( TRUE );
return TRUE;
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()