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:
@@ -478,8 +478,8 @@ wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
|
||||
wxMAKE_ATOM(_NET_WM_STATE_FULLSCREEN, disp);
|
||||
if (wxQueryWMspecSupport(disp, root, _NET_WM_STATE_FULLSCREEN))
|
||||
{
|
||||
wxLogTrace(_T("fullscreen"),
|
||||
_T("detected _NET_WM_STATE_FULLSCREEN support"));
|
||||
wxLogTrace(wxT("fullscreen"),
|
||||
wxT("detected _NET_WM_STATE_FULLSCREEN support"));
|
||||
return wxX11_FS_WMSPEC;
|
||||
}
|
||||
|
||||
@@ -487,12 +487,12 @@ wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
|
||||
// kwin doesn't understand any other method:
|
||||
if (wxKwinRunning(disp, root))
|
||||
{
|
||||
wxLogTrace(_T("fullscreen"), _T("detected kwin"));
|
||||
wxLogTrace(wxT("fullscreen"), wxT("detected kwin"));
|
||||
return wxX11_FS_KDE;
|
||||
}
|
||||
|
||||
// finally, fall back to ICCCM heuristic method:
|
||||
wxLogTrace(_T("fullscreen"), _T("unknown WM, using _WIN_LAYER"));
|
||||
wxLogTrace(wxT("fullscreen"), wxT("unknown WM, using _WIN_LAYER"));
|
||||
return wxX11_FS_GENERIC;
|
||||
}
|
||||
|
||||
@@ -823,7 +823,7 @@ bool wxGetKeyState(wxKeyCode key)
|
||||
if ( IsModifierKey(iKey) ) // If iKey is a modifier key, use a different method
|
||||
{
|
||||
XModifierKeymap *map = XGetModifierMapping(pDisplay);
|
||||
wxCHECK_MSG( map, false, _T("failed to get X11 modifiers map") );
|
||||
wxCHECK_MSG( map, false, wxT("failed to get X11 modifiers map") );
|
||||
|
||||
for (int i = 0; i < 8; ++i)
|
||||
{
|
||||
@@ -910,7 +910,7 @@ bool wxDoLaunchDefaultBrowser(const wxString& url, int flags)
|
||||
if (res >= 0 && errors.GetCount() == 0)
|
||||
{
|
||||
wxString cmd = output[0];
|
||||
cmd << _T(' ') << url;
|
||||
cmd << wxT(' ') << url;
|
||||
if (wxExecute(cmd))
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user