labels respect alignment now even with GTK 1.2

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 8185ab3e26f4ad52722fd236e2084df7d457e6a6..194fb3da086e2044c8c1b2dbd270160426efd3d6 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -67,7 +67,12 @@ bool wxStaticText::Create(wxWindow *parent,
     else // wxALIGN_LEFT is 0
       justify = GTK_JUSTIFY_LEFT;
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
     else // wxALIGN_LEFT is 0
       justify = GTK_JUSTIFY_LEFT;
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);

-    gtk_misc_set_alignment(GTK_MISC(m_widget), 0.0, 0.0);
+
+#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 );
     
     GtkRequisition req;
     (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 8185ab3e26f4ad52722fd236e2084df7d457e6a6..194fb3da086e2044c8c1b2dbd270160426efd3d6 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -67,7 +67,12 @@ bool wxStaticText::Create(wxWindow *parent,
     else // wxALIGN_LEFT is 0
       justify = GTK_JUSTIFY_LEFT;
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
     else // wxALIGN_LEFT is 0
       justify = GTK_JUSTIFY_LEFT;
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);

-    gtk_misc_set_alignment(GTK_MISC(m_widget), 0.0, 0.0);
+
+#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 );
     
     GtkRequisition req;
     (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );