X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b6a582bef796b43ad4cf0a96bd40bfd631460c6..69f82505ec2cddcd3ecd8d8bed6af0bc3056e576:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 73d152d248..e144201082 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -189,7 +189,7 @@ const gchar *wx_pango_version_check (int major, int minor, int micro) // NOTE: you don't need to use this macro to check for Pango features // added in pango-1.4 or earlier since GTK 2.4 (our minimum requirement // for GTK lib) required pango 1.4... - + #ifdef PANGO_VERSION_MAJOR if (!gtk_check_version (2,11,0)) { @@ -421,7 +421,7 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg) break; default: - wxFAIL_MSG( _T("unexpected return code from GtkAssertDialog") ); + wxFAIL_MSG( wxT("unexpected return code from GtkAssertDialog") ); } gtk_widget_destroy(dialog); @@ -435,7 +435,7 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg) wxString wxGUIAppTraits::GetDesktopEnvironment() const { - wxString de = wxSystemOptions::GetOption(_T("gtk.desktop")); + wxString de = wxSystemOptions::GetOption(wxT("gtk.desktop")); #if wxUSE_DETECT_SM if ( de.empty() ) { @@ -484,18 +484,18 @@ wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt) wxString ret; if (opt->short_name) - ret << _T("-") << opt->short_name; + ret << wxT("-") << opt->short_name; if (opt->long_name) { if (!ret.empty()) - ret << _T(", "); - ret << _T("--") << opt->long_name; + ret << wxT(", "); + ret << wxT("--") << opt->long_name; if (opt->arg_description) - ret << _T("=") << opt->arg_description; + ret << wxT("=") << opt->arg_description; } - return _T(" ") + ret; + return wxT(" ") + ret; } #endif // __WXGTK26__