Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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__
|
||||
|
Reference in New Issue
Block a user