X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7517dcb56e4153e11abc99f464d70ddeb25e3af0..29188693b3b8ba4b07762df012cc652d421dae79:/src/gtk/stattext.cpp diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index 7e3d81d770..b3f96071ae 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -72,12 +72,6 @@ bool wxStaticText::Create(wxWindow *parent, gtk_label_set_justify(GTK_LABEL(m_widget), justify); - // 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); - - gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE ); - #ifdef __WXGTK26__ if (!gtk_check_version(2,6,0)) { @@ -94,6 +88,12 @@ bool wxStaticText::Create(wxWindow *parent, } #endif // __WXGTK26__ + // 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); + + gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE ); + SetLabel(label); m_parent->DoAddChild( this ); @@ -232,7 +232,7 @@ void wxStaticText::DoSetLabel(const wxString& str) { // this function looks like GTKSetLabelForLabel() but here we just want to modify // the GTK control without altering any internal wxStaticText variable - + const wxString labelGTK = GTKConvertMnemonics(str); gtk_label_set_text_with_mnemonic(GTK_LABEL(m_widget), wxGTK_CONV(labelGTK)); }