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:
@@ -369,7 +369,7 @@ inline RECT wxGetWindowRect(HWND hwnd)
|
||||
|
||||
if ( !::GetWindowRect(hwnd, &rect) )
|
||||
{
|
||||
wxLogLastError(_T("GetWindowRect"));
|
||||
wxLogLastError(wxT("GetWindowRect"));
|
||||
}
|
||||
|
||||
return rect;
|
||||
@@ -381,7 +381,7 @@ inline RECT wxGetClientRect(HWND hwnd)
|
||||
|
||||
if ( !::GetClientRect(hwnd, &rect) )
|
||||
{
|
||||
wxLogLastError(_T("GetClientRect"));
|
||||
wxLogLastError(wxT("GetClientRect"));
|
||||
}
|
||||
|
||||
return rect;
|
||||
@@ -452,7 +452,7 @@ public:
|
||||
|
||||
void Init(HDC hdc, HGDIOBJ hgdiobj)
|
||||
{
|
||||
wxASSERT_MSG( !m_hdc, _T("initializing twice?") );
|
||||
wxASSERT_MSG( !m_hdc, wxT("initializing twice?") );
|
||||
|
||||
m_hdc = hdc;
|
||||
|
||||
@@ -481,7 +481,7 @@ protected:
|
||||
|
||||
void InitGdiobj(HGDIOBJ gdiobj)
|
||||
{
|
||||
wxASSERT_MSG( !m_gdiobj, _T("initializing twice?") );
|
||||
wxASSERT_MSG( !m_gdiobj, wxT("initializing twice?") );
|
||||
|
||||
m_gdiobj = gdiobj;
|
||||
}
|
||||
@@ -575,7 +575,7 @@ public:
|
||||
{
|
||||
if ( !::SelectClipRgn(hdc, hrgn) )
|
||||
{
|
||||
wxLogLastError(_T("SelectClipRgn"));
|
||||
wxLogLastError(wxT("SelectClipRgn"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -606,7 +606,7 @@ private:
|
||||
m_modeOld = ::SetMapMode(hdc, mm);
|
||||
if ( !m_modeOld )
|
||||
{
|
||||
wxLogLastError(_T("SelectClipRgn"));
|
||||
wxLogLastError(wxT("SelectClipRgn"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -643,7 +643,7 @@ public:
|
||||
m_hGlobal = ::GlobalAlloc(flags, size);
|
||||
if ( !m_hGlobal )
|
||||
{
|
||||
wxLogLastError(_T("GlobalAlloc"));
|
||||
wxLogLastError(wxT("GlobalAlloc"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -656,7 +656,7 @@ public:
|
||||
{
|
||||
if ( m_hGlobal && ::GlobalFree(m_hGlobal) )
|
||||
{
|
||||
wxLogLastError(_T("GlobalFree"));
|
||||
wxLogLastError(wxT("GlobalFree"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -694,7 +694,7 @@ public:
|
||||
m_ptr = GlobalLock(hGlobal);
|
||||
if ( !m_ptr )
|
||||
{
|
||||
wxLogLastError(_T("GlobalLock"));
|
||||
wxLogLastError(wxT("GlobalLock"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -712,7 +712,7 @@ public:
|
||||
DWORD dwLastError = ::GetLastError();
|
||||
if ( dwLastError != NO_ERROR )
|
||||
{
|
||||
wxLogApiError(_T("GlobalUnlock"), dwLastError);
|
||||
wxLogApiError(wxT("GlobalUnlock"), dwLastError);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -745,12 +745,12 @@ public:
|
||||
{
|
||||
// we should only be called if we hadn't been initialized yet
|
||||
wxASSERT_MSG( m_registered == -1,
|
||||
_T("calling ClassRegistrar::Register() twice?") );
|
||||
wxT("calling ClassRegistrar::Register() twice?") );
|
||||
|
||||
m_registered = ::RegisterClass(&wc) ? 1 : 0;
|
||||
if ( !IsRegistered() )
|
||||
{
|
||||
wxLogLastError(_T("RegisterClassEx()"));
|
||||
wxLogLastError(wxT("RegisterClassEx()"));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -771,7 +771,7 @@ public:
|
||||
{
|
||||
if ( !::UnregisterClass(m_clsname.wx_str(), wxhInstance) )
|
||||
{
|
||||
wxLogLastError(_T("UnregisterClass"));
|
||||
wxLogLastError(wxT("UnregisterClass"));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -857,7 +857,7 @@ inline wxString wxGetFullModuleName(HMODULE hmod)
|
||||
MAX_PATH
|
||||
) )
|
||||
{
|
||||
wxLogLastError(_T("GetModuleFileName"));
|
||||
wxLogLastError(wxT("GetModuleFileName"));
|
||||
}
|
||||
|
||||
return fullname;
|
||||
|
Reference in New Issue
Block a user