several fixes

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

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 62340474fc0669ad50cbd4782a733a38871c0763..b125eeb11f7e152f29aeb16fe5a3b6189e2687fb 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -27,14 +27,14 @@ wxStaticText::wxStaticText(void)
 
 wxStaticText::wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label, 
       const wxPoint &pos, const wxSize &size, 
-      const long style, const wxString &name )
+      long style, const wxString &name )
 {
   Create( parent, id, label, pos, size, style, name );
 };
 
 bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &label, 
       const wxPoint &pos, const wxSize &size, 
-      const long style, const wxString &name )
+      long style, const wxString &name )
 {
   m_needParent = TRUE;
   
@@ -42,7 +42,17 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
   
   PreCreation( parent, id, pos, size, style, name );
   
-  m_widget = gtk_label_new( label );
+  wxControl::SetLabel(label);
+  m_widget = gtk_label_new( m_label );
+
+  GtkJustification justify;
+  if ( style & wxALIGN_CENTER )
+    justify = GTK_JUSTIFY_CENTER;
+  else if ( style & wxALIGN_RIGHT )
+    justify = GTK_JUSTIFY_RIGHT;
+  else // wxALIGN_LEFT is 0
+    justify = GTK_JUSTIFY_LEFT;
+  gtk_label_set_justify(GTK_LABEL(m_widget), justify);
   
   if (newSize.x == -1) newSize.x = gdk_string_measure( m_widget->style->font, label );
   if (newSize.y == -1) newSize.y = 26;
@@ -65,5 +75,7 @@ wxString wxStaticText::GetLabel(void) const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
-  gtk_label_set( GTK_LABEL(m_widget), label );
+  wxControl::SetLabel(label);
+
+  gtk_label_set( GTK_LABEL(m_widget), m_label );
 };