many changes; major ones:
1. start of !wxUSE_GUI support 2. _T() macro renamed to T() 3. wxConvertWX2MB and MB2WX macro added git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -177,7 +177,7 @@ void wxDC::DoSetClippingRegion(long cx, long cy, long cw, long ch)
|
||||
|
||||
void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
|
||||
{
|
||||
wxCHECK_RET( region.GetHRGN(), _T("invalid clipping region") );
|
||||
wxCHECK_RET( region.GetHRGN(), T("invalid clipping region") );
|
||||
|
||||
wxRect box = region.GetBox();
|
||||
|
||||
@@ -252,7 +252,7 @@ void wxDC::Clear()
|
||||
}
|
||||
else
|
||||
{
|
||||
wxCHECK_RET( m_selectedBitmap.Ok(), _T("this DC can't be cleared") );
|
||||
wxCHECK_RET( m_selectedBitmap.Ok(), T("this DC can't be cleared") );
|
||||
|
||||
rect.left = 0; rect.top = 0;
|
||||
rect.right = m_selectedBitmap.GetWidth();
|
||||
@@ -595,7 +595,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask )
|
||||
HDC memdc = ::CreateCompatibleDC( cdc );
|
||||
HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( );
|
||||
|
||||
wxASSERT_MSG( hbitmap, _T("bitmap is ok but HBITMAP is NULL?") );
|
||||
wxASSERT_MSG( hbitmap, T("bitmap is ok but HBITMAP is NULL?") );
|
||||
|
||||
::SelectObject( memdc, hbitmap );
|
||||
::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY);
|
||||
@@ -718,7 +718,7 @@ void wxDC::SetFont(const wxFont& the_font)
|
||||
HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
|
||||
if (f == (HFONT) NULL)
|
||||
{
|
||||
wxLogDebug(_T("::SelectObject failed in wxDC::SetFont."));
|
||||
wxLogDebug(T("::SelectObject failed in wxDC::SetFont."));
|
||||
}
|
||||
if (!m_oldFont)
|
||||
m_oldFont = (WXHFONT) f;
|
||||
|
||||
Reference in New Issue
Block a user