X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd9811b13784a58dd58126bc4b7d5f4c195839b2..2e1a688e3e9c6c265620e4f05d579077367e9fdb:/src/gtk1/stattext.cpp?ds=sidebyside diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index af8c6a1063..f2340eaa85 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -51,7 +51,7 @@ bool wxStaticText::Create(wxWindow *parent, if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { - wxFAIL_MSG( _T("wxXX creation failed") ); + wxFAIL_MSG( wxT("wxXX creation failed") ); return FALSE; } @@ -71,11 +71,9 @@ bool wxStaticText::Create(wxWindow *parent, justify = GTK_JUSTIFY_LEFT; gtk_label_set_justify(GTK_LABEL(m_widget), justify); -//#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 ); @@ -98,7 +96,7 @@ bool wxStaticText::Create(wxWindow *parent, return TRUE; } -wxString wxStaticText::GetLabel(void) const +wxString wxStaticText::GetLabel() const { char *str = (char *) NULL; gtk_label_get( GTK_LABEL(m_widget), &str );