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:
@@ -311,7 +311,7 @@ bool wxTextEntry::AutoCompleteFileNames()
|
||||
static wxDynamicLibrary s_dllShlwapi;
|
||||
if ( s_pfnSHAutoComplete == (SHAutoComplete_t)-1 )
|
||||
{
|
||||
if ( !s_dllShlwapi.Load(_T("shlwapi.dll"), wxDL_VERBATIM | wxDL_QUIET) )
|
||||
if ( !s_dllShlwapi.Load(wxT("shlwapi.dll"), wxDL_VERBATIM | wxDL_QUIET) )
|
||||
{
|
||||
s_pfnSHAutoComplete = NULL;
|
||||
}
|
||||
@@ -327,7 +327,7 @@ bool wxTextEntry::AutoCompleteFileNames()
|
||||
HRESULT hr = (*s_pfnSHAutoComplete)(GetEditHwnd(), SHACF_FILESYS_ONLY);
|
||||
if ( FAILED(hr) )
|
||||
{
|
||||
wxLogApiError(_T("SHAutoComplete()"), hr);
|
||||
wxLogApiError(wxT("SHAutoComplete()"), hr);
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -363,7 +363,7 @@ bool wxTextEntry::AutoComplete(const wxArrayString& choices)
|
||||
);
|
||||
if ( FAILED(hr) )
|
||||
{
|
||||
wxLogApiError(_T("CoCreateInstance(CLSID_AutoComplete)"), hr);
|
||||
wxLogApiError(wxT("CoCreateInstance(CLSID_AutoComplete)"), hr);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -374,7 +374,7 @@ bool wxTextEntry::AutoComplete(const wxArrayString& choices)
|
||||
m_enumStrings->Release();
|
||||
if ( FAILED(hr) )
|
||||
{
|
||||
wxLogApiError(_T("IAutoComplete::Init"), hr);
|
||||
wxLogApiError(wxT("IAutoComplete::Init"), hr);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user