merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -35,6 +35,8 @@
|
||||
#include "wx/dcmemory.h"
|
||||
#endif
|
||||
|
||||
#if wxUSE_PRINTING_ARCHITECTURE
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
#include "wx/dcprint.h"
|
||||
#include "math.h"
|
||||
@@ -456,7 +458,7 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap &bmp,
|
||||
bits, info,
|
||||
DIB_RGB_COLORS, SRCCOPY) == GDI_ERROR )
|
||||
{
|
||||
wxLogLastError("StretchDIBits");
|
||||
wxLogLastError(wxT("StretchDIBits"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -538,7 +540,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
|
||||
if ( !::GetDIBits(display, GetHbitmapOf(bmp), 0,
|
||||
height, bits, info, DIB_RGB_COLORS) )
|
||||
{
|
||||
wxLogLastError("GetDIBits");
|
||||
wxLogLastError(wxT("GetDIBits"));
|
||||
|
||||
success = FALSE;
|
||||
}
|
||||
@@ -554,7 +556,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
|
||||
SRCCOPY) != GDI_ERROR;
|
||||
if ( !success )
|
||||
{
|
||||
wxLogLastError("StretchDIBits");
|
||||
wxLogLastError(wxT("StretchDIBits"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -593,3 +595,6 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
#endif
|
||||
// wxUSE_PRINTING_ARCHITECTURE
|
||||
|
Reference in New Issue
Block a user