added support for label alignments in wxStaticText::Create()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 62340474fc0669ad50cbd4782a733a38871c0763..6f931be64a786277ebd98f5c61fe77afa1390f62 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -43,6 +43,14 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
   PreCreation( parent, id, pos, size, style, name );
   
   m_widget = gtk_label_new( label );
   PreCreation( parent, id, pos, size, style, name );
   
   m_widget = gtk_label_new( 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;
   
   if (newSize.x == -1) newSize.x = gdk_string_measure( m_widget->style->font, label );
   if (newSize.y == -1) newSize.y = 26;

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 62340474fc0669ad50cbd4782a733a38871c0763..6f931be64a786277ebd98f5c61fe77afa1390f62 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -43,6 +43,14 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
   PreCreation( parent, id, pos, size, style, name );
   
   m_widget = gtk_label_new( label );
   PreCreation( parent, id, pos, size, style, name );
   
   m_widget = gtk_label_new( 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;
   
   if (newSize.x == -1) newSize.x = gdk_string_measure( m_widget->style->font, label );
   if (newSize.y == -1) newSize.y = 26;