From 1a5594b80feb9f16584288a2f2136d27316a15e1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 11 May 1999 17:37:43 +0000 Subject: [PATCH] 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 --- src/gtk/stattext.cpp | 7 ++++++- src/gtk1/stattext.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index 8185ab3e26..194fb3da08 100644 --- 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); - 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 ); diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index 8185ab3e26..194fb3da08 100644 --- 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); - 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 ); -- 2.45.2