Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Globally replace _T() with wxT().

Browse Source 
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:
Vadim Zeitlin
2009-07-23 20:30:22 +00:00
parent 32cdc45397
commit 9a83f86094
798 changed files with 10370 additions and 10349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/msw/dc.cpp
View File

@@ -184,7 +184,7 @@ public:
m_modeOld = ::SetStretchBltMode(m_hdc, COLORONCOLOR);
if ( !m_modeOld )
{
wxLogLastError(_T("SetStretchBltMode"));
wxLogLastError(wxT("SetStretchBltMode"));
}
}
@@ -192,7 +192,7 @@ public:
{
if ( !::SetStretchBltMode(m_hdc, m_modeOld) )
{
wxLogLastError(_T("SetStretchBltMode"));
wxLogLastError(wxT("SetStretchBltMode"));
}
}
@@ -255,7 +255,7 @@ private:
const wxChar *m_dllName;
};
static wxOnceOnlyDLLLoader wxMSIMG32DLL(_T("msimg32"));
static wxOnceOnlyDLLLoader wxMSIMG32DLL(wxT("msimg32"));
// we must ensure that DLLs are unloaded before the static objects cleanup time
// because we may hit the notorious DllMain() dead lock in this case if wx is
@@ -468,7 +468,7 @@ void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn)
#else // !WinCE
if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR )
{
wxLogLastError(_T("ExtSelectClipRgn"));
wxLogLastError(wxT("ExtSelectClipRgn"));
return;
}
@@ -491,7 +491,7 @@ void wxMSWDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h
LogicalToDeviceY(y + h));
if ( !hrgn )
{
wxLogLastError(_T("CreateRectRgn"));
wxLogLastError(wxT("CreateRectRgn"));
}
else
{
@@ -641,7 +641,7 @@ bool wxMSWDCImpl::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
{
WXMICROWIN_CHECK_HDC_RET(false)
wxCHECK_MSG( col, false, _T("NULL colour parameter in wxMSWDCImpl::GetPixel") );
wxCHECK_MSG( col, false, wxT("NULL colour parameter in wxMSWDCImpl::GetPixel") );
// get the color of the pixel
COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));
@@ -1174,7 +1174,7 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool
{
WXMICROWIN_CHECK_HDC
wxCHECK_RET( bmp.IsOk(), _T("invalid bitmap in wxMSWDCImpl::DrawBitmap") );
wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap in wxMSWDCImpl::DrawBitmap") );
int width = bmp.GetWidth(),
height = bmp.GetHeight();
@@ -1469,7 +1469,7 @@ void wxMSWDCImpl::SetFont(const wxFont& font)
HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
if ( hfont == HGDI_ERROR )
{
wxLogLastError(_T("SelectObject(font)"));
wxLogLastError(wxT("SelectObject(font)"));
}
else // selected ok
{
@@ -1485,7 +1485,7 @@ void wxMSWDCImpl::SetFont(const wxFont& font)
{
if ( ::SelectObject(GetHdc(), (HPEN) m_oldFont) == HGDI_ERROR )
{
wxLogLastError(_T("SelectObject(old font)"));
wxLogLastError(wxT("SelectObject(old font)"));
}
m_oldFont = 0;
@@ -1507,7 +1507,7 @@ void wxMSWDCImpl::SetPen(const wxPen& pen)
HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
if ( hpen == HGDI_ERROR )
{
wxLogLastError(_T("SelectObject(pen)"));
wxLogLastError(wxT("SelectObject(pen)"));
}
else // selected ok
{
@@ -1523,7 +1523,7 @@ void wxMSWDCImpl::SetPen(const wxPen& pen)
{
if ( ::SelectObject(GetHdc(), (HPEN) m_oldPen) == HGDI_ERROR )
{
wxLogLastError(_T("SelectObject(old pen)"));
wxLogLastError(wxT("SelectObject(old pen)"));
}
m_oldPen = 0;
@@ -1555,14 +1555,14 @@ void wxMSWDCImpl::SetBrush(const wxBrush& brush)
NULL // [out] previous brush origin
) )
{
wxLogLastError(_T("SetBrushOrgEx()"));
wxLogLastError(wxT("SetBrushOrgEx()"));
}
}
HGDIOBJ hbrush = ::SelectObject(GetHdc(), GetHbrushOf(brush));
if ( hbrush == HGDI_ERROR )
{
wxLogLastError(_T("SelectObject(brush)"));
wxLogLastError(wxT("SelectObject(brush)"));
}
else // selected ok
{
@@ -1578,7 +1578,7 @@ void wxMSWDCImpl::SetBrush(const wxBrush& brush)
{
if ( ::SelectObject(GetHdc(), (HPEN) m_oldBrush) == HGDI_ERROR )
{
wxLogLastError(_T("SelectObject(old brush)"));
wxLogLastError(wxT("SelectObject(old brush)"));
}
m_oldBrush = 0;
@@ -1714,7 +1714,7 @@ void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y
HFONT hfontOld;
if ( font )
{
wxASSERT_MSG( font->IsOk(), _T("invalid font in wxMSWDCImpl::GetTextExtent") );
wxASSERT_MSG( font->IsOk(), wxT("invalid font in wxMSWDCImpl::GetTextExtent") );
hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font));
}
@@ -1727,7 +1727,7 @@ void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y
const size_t len = string.length();
if ( !::GetTextExtentPoint32(GetHdc(), string.wx_str(), len, &sizeRect) )
{
wxLogLastError(_T("GetTextExtentPoint32()"));
wxLogLastError(wxT("GetTextExtentPoint32()"));
}
#if !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
@@ -1887,7 +1887,7 @@ void wxMSWDCImpl::SetMapMode(wxMappingMode mode)
break;
default:
wxFAIL_MSG( _T("unknown mapping mode in SetMapMode") );
wxFAIL_MSG( wxT("unknown mapping mode in SetMapMode") );
}
}
@@ -1978,7 +1978,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
wxRasterOperationMode rop, bool useMask,
wxCoord xsrcMask, wxCoord ysrcMask)
{
wxCHECK_MSG( source, false, _T("wxMSWDCImpl::Blit(): NULL wxDC pointer") );
wxCHECK_MSG( source, false, wxT("wxMSWDCImpl::Blit(): NULL wxDC pointer") );
WXMICROWIN_CHECK_HDC_RET(false)
@@ -2232,7 +2232,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
dwRop
) )
{
wxLogLastError(_T("StretchBlt"));
wxLogLastError(wxT("StretchBlt"));
}
else
{
@@ -2245,7 +2245,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
if ( !::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
hdcSrc, xsrc, ysrc, dwRop) )
{
wxLogLastError(_T("BitBlt"));
wxLogLastError(wxT("BitBlt"));
}
else
{
@@ -2282,7 +2282,7 @@ void wxMSWDCImpl::DoGetSizeMM(int *w, int *h) const
{
int wTotal = ::GetDeviceCaps(GetHdc(), HORZRES);
wxCHECK_RET( wTotal, _T("0 width device?") );
wxCHECK_RET( wTotal, wxT("0 width device?") );
*w = (wPixels * ::GetDeviceCaps(GetHdc(), HORZSIZE)) / wTotal;
}
@@ -2291,7 +2291,7 @@ void wxMSWDCImpl::DoGetSizeMM(int *w, int *h) const
{
int hTotal = ::GetDeviceCaps(GetHdc(), VERTRES);
wxCHECK_RET( hTotal, _T("0 height device?") );
wxCHECK_RET( hTotal, wxT("0 height device?") );
*h = (hPixels * ::GetDeviceCaps(GetHdc(), VERTSIZE)) / hTotal;
}
@@ -2455,8 +2455,8 @@ static bool AlphaBlt(HDC hdcDst,
HDC hdcSrc,
const wxBitmap& bmp)
{
wxASSERT_MSG( bmp.IsOk() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") );
wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") );
wxASSERT_MSG( bmp.IsOk() && bmp.HasAlpha(), wxT("AlphaBlt(): invalid bitmap") );
wxASSERT_MSG( hdcDst && hdcSrc, wxT("AlphaBlt(): invalid HDC") );
// do we have AlphaBlend() and company in the headers?
#if defined(AC_SRC_OVER) && wxUSE_DYNLIB_CLASS
@@ -2466,7 +2466,7 @@ static bool AlphaBlt(HDC hdcDst,
BLENDFUNCTION);
static AlphaBlend_t
pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(_T("AlphaBlend"));
pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(wxT("AlphaBlend"));
if ( pfnAlphaBlend )
{
BLENDFUNCTION bf;
@@ -2483,7 +2483,7 @@ static bool AlphaBlt(HDC hdcDst,
return true;
}
wxLogLastError(_T("AlphaBlend"));
wxLogLastError(wxT("AlphaBlend"));
}
#else
wxUnusedVar(hdcSrc);
@@ -2521,7 +2521,7 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
if ( !::BitBlt(hdcMem, 0, 0, dstWidth, dstHeight, hdcDst, xDst, yDst, SRCCOPY) )
{
wxLogLastError(_T("BitBlt"));
wxLogLastError(wxT("BitBlt"));
}
// combine them with the source bitmap using alpha
@@ -2529,7 +2529,7 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
dataSrc((wxBitmap &)bmpSrc);
wxCHECK_RET( dataDst && dataSrc,
_T("failed to get raw data in wxAlphaBlend") );
wxT("failed to get raw data in wxAlphaBlend") );
wxAlphaPixelData::Iterator pDst(dataDst),
pSrc(dataSrc);
@@ -2563,7 +2563,7 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
// and finally blit them back to the destination DC
if ( !::BitBlt(hdcDst, xDst, yDst, dstWidth, dstHeight, hdcMem, 0, 0, SRCCOPY) )
{
wxLogLastError(_T("BitBlt"));
wxLogLastError(wxT("BitBlt"));
}
}
@@ -2581,7 +2581,7 @@ void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,
typedef BOOL
(WINAPI *GradientFill_t)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG);
static GradientFill_t pfnGradientFill =
(GradientFill_t)wxMSIMG32DLL.GetSymbol(_T("GradientFill"));
(GradientFill_t)wxMSIMG32DLL.GetSymbol(wxT("GradientFill"));
if ( pfnGradientFill )
{
@@ -2626,7 +2626,7 @@ void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,
return;
}
wxLogLastError(_T("GradientFill"));
wxLogLastError(wxT("GradientFill"));
}
#endif // wxUSE_DYNLIB_CLASS
@@ -2639,7 +2639,7 @@ static DWORD wxGetDCLayout(HDC hdc)
{
typedef DWORD (WINAPI *GetLayout_t)(HDC);
static GetLayout_t
wxDL_INIT_FUNC(s_pfn, GetLayout, wxDynamicLibrary(_T("gdi32.dll")));
wxDL_INIT_FUNC(s_pfn, GetLayout, wxDynamicLibrary(wxT("gdi32.dll")));
return s_pfnGetLayout ? s_pfnGetLayout(hdc) : (DWORD)-1;
}
@@ -2658,7 +2658,7 @@ void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection dir)
{
typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD);
static SetLayout_t
wxDL_INIT_FUNC(s_pfn, SetLayout, wxDynamicLibrary(_T("gdi32.dll")));
wxDL_INIT_FUNC(s_pfn, SetLayout, wxDynamicLibrary(wxT("gdi32.dll")));
if ( !s_pfnSetLayout )
return;