X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f415cab9ef1433413a1a68a982ee9b17c5a8deda..107defe36a68091303be9a11c8abb83432acee8c:/src/msw/dcprint.cpp?ds=sidebyside diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index 32dad051fe..9ca81119cb 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -27,6 +27,7 @@ #if wxUSE_PRINTING_ARCHITECTURE #include "wx/dcprint.h" +#include "wx/msw/dcprint.h" #ifndef WX_PRECOMP #include "wx/msw/wrapcdlg.h" @@ -66,7 +67,7 @@ // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_CLASS(wxPrinterDC, wxDC) +IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxMSWDCImpl) // ============================================================================ // implementation @@ -76,12 +77,13 @@ IMPLEMENT_CLASS(wxPrinterDC, wxDC) // wxPrinterDC construction // ---------------------------------------------------------------------------- +#if 0 // This form is deprecated wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_name, const wxString& file, bool interactive, - int orientation) + wxPrintOrientation orientation) { m_isInteractive = interactive; @@ -116,7 +118,10 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name, { if ( !driver_name.empty() && !device_name.empty() && !file.empty() ) { - m_hDC = (WXHDC) CreateDC(driver_name, device_name, file, NULL); + m_hDC = (WXHDC) CreateDC(driver_name.wx_str(), + device_name.wx_str(), + file.fn_str(), + NULL); } else // we don't have all parameters, ask the user { @@ -133,8 +138,10 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name, Init(); } +#endif -wxPrinterDC::wxPrinterDC(const wxPrintData& printData) +wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printData ) : + wxMSWDCImpl( owner ) { m_printData = printData; @@ -148,7 +155,8 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printData) } -wxPrinterDC::wxPrinterDC(WXHDC dc) +wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, WXHDC dc ) : + wxMSWDCImpl( owner ) { m_isInteractive = false; @@ -157,7 +165,7 @@ wxPrinterDC::wxPrinterDC(WXHDC dc) m_ok = true; } -void wxPrinterDC::Init() +void wxPrinterDCImpl::Init() { if ( m_hDC ) { @@ -171,21 +179,21 @@ void wxPrinterDC::Init() } // ---------------------------------------------------------------------------- -// wxPrinterDC {Start/End}{Page/Doc} methods +// wxPrinterDCImpl {Start/End}{Page/Doc} methods // ---------------------------------------------------------------------------- -bool wxPrinterDC::StartDoc(const wxString& message) +bool wxPrinterDCImpl::StartDoc(const wxString& message) { DOCINFO docinfo; docinfo.cbSize = sizeof(DOCINFO); - docinfo.lpszDocName = (const wxChar*)message; + docinfo.lpszDocName = message.wx_str(); wxString filename(m_printData.GetFilename()); if (filename.empty()) docinfo.lpszOutput = NULL; else - docinfo.lpszOutput = (const wxChar *) filename; + docinfo.lpszOutput = filename.wx_str(); docinfo.lpszDatatype = NULL; docinfo.fwType = 0; @@ -193,39 +201,37 @@ bool wxPrinterDC::StartDoc(const wxString& message) if (!m_hDC) return false; - int ret = ::StartDoc(GetHdc(), &docinfo); - - if (ret <= 0) + if ( ::StartDoc(GetHdc(), &docinfo) <= 0 ) { - DWORD lastError = GetLastError(); - wxLogDebug(wxT("wxDC::StartDoc failed with error: %ld\n"), lastError); + wxLogLastError(wxT("StartDoc")); + return false; } - return (ret > 0); + return true; } -void wxPrinterDC::EndDoc() +void wxPrinterDCImpl::EndDoc() { if (m_hDC) ::EndDoc((HDC) m_hDC); } -void wxPrinterDC::StartPage() +void wxPrinterDCImpl::StartPage() { if (m_hDC) ::StartPage((HDC) m_hDC); } -void wxPrinterDC::EndPage() +void wxPrinterDCImpl::EndPage() { if (m_hDC) ::EndPage((HDC) m_hDC); } -wxRect wxPrinterDC::GetPaperRect() +wxRect wxPrinterDCImpl::GetPaperRect() const { - if (!Ok()) return wxRect(0, 0, 0, 0); + if (!IsOk()) return wxRect(0, 0, 0, 0); int w = ::GetDeviceCaps((HDC) m_hDC, PHYSICALWIDTH); int h = ::GetDeviceCaps((HDC) m_hDC, PHYSICALHEIGHT); int x = -::GetDeviceCaps((HDC) m_hDC, PHYSICALOFFSETX); @@ -321,23 +327,29 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst) } - HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode(); - - DEVMODE *lpDevMode = hDevMode ? (DEVMODE *)::GlobalLock(hDevMode) : NULL; + GlobalPtrLock lockDevMode; + const HGLOBAL devMode = data->GetDevMode(); + if ( devMode ) + lockDevMode.Init(devMode); - HDC hDC = ::CreateDC(NULL, deviceName, NULL, lpDevMode); + HDC hDC = ::CreateDC + ( + NULL, // no driver name as we use device name + deviceName.wx_str(), + NULL, // unused + static_cast(lockDevMode.Get()) + ); if ( !hDC ) - wxLogLastError(_T("CreateDC(printer)")); - - if ( lpDevMode ) - ::GlobalUnlock(hDevMode); + { + wxLogLastError(wxT("CreateDC(printer)")); + } return (WXHDC) hDC; #endif // PostScript/Windows printing } // ---------------------------------------------------------------------------- -// wxPrinterDC bit blitting/bitmap drawing +// wxPrinterDCImpl bit blitting/bitmap drawing // ---------------------------------------------------------------------------- // helper of DoDrawBitmap() and DoBlit() @@ -355,7 +367,7 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc, DIBSECTION ds; if ( !::GetObject(dib.GetHandle(), sizeof(ds), &ds) ) { - wxLogLastError(_T("GetObject(DIBSECTION)")); + wxLogLastError(wxT("GetObject(DIBSECTION)")); return false; } @@ -385,11 +397,11 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc, #endif } -void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp, +void wxPrinterDCImpl::DoDrawBitmap(const wxBitmap& bmp, wxCoord x, wxCoord y, bool useMask) { - wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxPrinterDC::DrawBitmap") ); + wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") ); int width = bmp.GetWidth(), height = bmp.GetHeight(); @@ -399,29 +411,35 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp, { // no support for StretchDIBits() or an error occurred if we got here wxMemoryDC memDC; - memDC.SelectObject(bmp); - Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask); + memDC.SelectObjectAsSource(bmp); + + GetOwner()->Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask); memDC.SelectObject(wxNullBitmap); } } -bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, +bool wxPrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc), - int WXUNUSED(rop), bool useMask, + wxRasterOperationMode WXUNUSED(rop), bool useMask, wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask)) { - wxBitmap& bmp = source->GetSelectedBitmap(); + wxDCImpl *impl = source->GetImpl(); + wxMSWDCImpl *msw_impl = wxDynamicCast(impl, wxMSWDCImpl); + if (!msw_impl) + return false; + + wxBitmap& bmp = msw_impl->GetSelectedBitmap(); wxMask *mask = useMask ? bmp.GetMask() : NULL; if ( mask ) { // If we are printing source colours are screen colours not printer // colours and so we need copy the bitmap pixel by pixel. RECT rect; - HDC dcSrc = GetHdcOf(*source); + HDC dcSrc = GetHdcOf(*msw_impl); MemoryHDC dcMask(dcSrc); SelectInHDC selectMask(dcMask, (HBITMAP)mask->GetMaskBitmap()); @@ -452,7 +470,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, // as we are printing, source colours are screen colours not // printer colours and so we need copy the bitmap pixel by pixel. - HDC dcSrc = GetHdcOf(*source); + HDC dcSrc = GetHdcOf(*msw_impl); RECT rect; for (int y = 0; y < height; y++) {