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

10
src/msw/statbmp.cpp
View File

@@ -119,7 +119,7 @@ static wxGDIImage* ConvertImage( const wxGDIImage& bitmap )
if( !isIcon )
{
wxASSERT_MSG( wxDynamicCast(&bitmap, wxBitmap),
_T("not an icon and not a bitmap?") );
wxT("not an icon and not a bitmap?") );
const wxBitmap& bmp = (const wxBitmap&)bitmap;
wxMask *mask = bmp.GetMask();
@@ -158,7 +158,7 @@ bool wxStaticBitmap::Create(wxWindow *parent,
m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
// create the native control
if ( !MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size) )
if ( !MSWCreateControl(wxT("STATIC"), wxEmptyString, pos, size) )
{
// control creation failed
return false;
@@ -211,10 +211,10 @@ bool wxStaticBitmap::ImageIsOk() const
wxIcon wxStaticBitmap::GetIcon() const
{
wxCHECK_MSG( m_image, wxIcon(), _T("no image in wxStaticBitmap") );
wxCHECK_MSG( m_image, wxIcon(), wxT("no image in wxStaticBitmap") );
// we can't ask for an icon if all we have is a bitmap
wxCHECK_MSG( m_isIcon, wxIcon(), _T("no icon in this wxStaticBitmap") );
wxCHECK_MSG( m_isIcon, wxIcon(), wxT("no icon in this wxStaticBitmap") );
return *(wxIcon *)m_image;
}
@@ -231,7 +231,7 @@ wxBitmap wxStaticBitmap::GetBitmap() const
}
else // we have a bitmap
{
wxCHECK_MSG( m_image, wxBitmap(), _T("no image in wxStaticBitmap") );
wxCHECK_MSG( m_image, wxBitmap(), wxT("no image in wxStaticBitmap") );
return *(wxBitmap *)m_image;
}