X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f52b4e15cbb816d8127d0131d3d8316262d2b4f..f5766910b6731eb03e82371416e9778203396ce7:/src/msw/dcprint.cpp?ds=sidebyside diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index 27ea98fe59..a2e365c072 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "dcprint.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,24 +24,28 @@ #pragma hdrstop #endif +#if wxUSE_PRINTING_ARCHITECTURE + +#include "wx/dcprint.h" + #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include "wx/string.h" #include "wx/log.h" #include "wx/window.h" #include "wx/dcmemory.h" + #include "wx/math.h" #endif -#if wxUSE_PRINTING_ARCHITECTURE - #include "wx/msw/private.h" -#include "wx/msw/dib.h" -#include "wx/dcprint.h" -#include "math.h" -#if wxUSE_COMMON_DIALOGS - #include +#if wxUSE_WXDIB + #include "wx/msw/dib.h" #endif +#include "wx/printdlg.h" +#include "wx/msw/printdlg.h" + #ifndef __WIN32__ #include #endif @@ -56,6 +56,12 @@ #define GDI_ERROR ((int)-1) #endif +#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW + #define wxUSE_PS_PRINTING 1 +#else + #define wxUSE_PS_PRINTING 0 +#endif + // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -119,10 +125,10 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name, m_hDC = wxGetPrinterDC(printData); } - m_ok = m_hDC ? TRUE: FALSE; + m_ok = m_hDC ? true: false; // as we created it, we must delete it as well - m_bOwnsDC = TRUE; + m_bOwnsDC = true; } Init(); @@ -132,11 +138,11 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printData) { m_printData = printData; - m_isInteractive = FALSE; + m_isInteractive = false; m_hDC = wxGetPrinterDC(printData); m_ok = m_hDC != 0; - m_bOwnsDC = TRUE; + m_bOwnsDC = true; Init(); } @@ -144,11 +150,11 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printData) wxPrinterDC::wxPrinterDC(WXHDC dc) { - m_isInteractive = FALSE; + m_isInteractive = false; m_hDC = dc; - m_bOwnsDC = TRUE; - m_ok = TRUE; + m_bOwnsDC = true; + m_ok = true; } void wxPrinterDC::Init() @@ -176,28 +182,24 @@ bool wxPrinterDC::StartDoc(const wxString& message) wxString filename(m_printData.GetFilename()); - if (filename.IsEmpty()) + if (filename.empty()) docinfo.lpszOutput = NULL; else docinfo.lpszOutput = (const wxChar *) filename; -#if defined(__WIN95__) docinfo.lpszDatatype = NULL; docinfo.fwType = 0; -#endif if (!m_hDC) - return FALSE; + return false; int ret = ::StartDoc(GetHdc(), &docinfo); -#ifndef __WIN16__ if (ret <= 0) { DWORD lastError = GetLastError(); wxLogDebug(wxT("wxDC::StartDoc failed with error: %ld\n"), lastError); } -#endif return (ret > 0); } @@ -219,13 +221,14 @@ void wxPrinterDC::EndPage() ::EndPage((HDC) m_hDC); } +#if !wxUSE_PS_PRINTING + // Returns default device and port names static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName) { deviceName.clear(); LPDEVNAMES lpDevNames; - LPTSTR lpszDriverName; LPTSTR lpszDeviceName; LPTSTR lpszPortName; @@ -253,13 +256,12 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName) if (pd.hDevNames) GlobalFree(pd.hDevNames); - return FALSE; + return false; } if (pd.hDevNames) { lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames); - lpszDriverName = (LPTSTR)lpDevNames + lpDevNames->wDriverOffset; lpszDeviceName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset; lpszPortName = (LPTSTR)lpDevNames + lpDevNames->wOutputOffset; @@ -276,59 +278,49 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName) GlobalFree(pd.hDevMode); pd.hDevMode=NULL; } - return ( deviceName != wxT("") ); + return ( !deviceName.empty() ); } +#endif // !wxUSE_PS_PRINTING + // Gets an HDC for the specified printer configuration WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst) { - wxPrintData printData = printDataConst; - printData.ConvertToNative(); - - wxChar* driverName = (wxChar*) NULL; - - wxString devNameStr = printData.GetPrinterName(); - wxChar* portName = (wxChar*) NULL; // Obsolete in WIN32 - - const wxChar* deviceName; - if ( !devNameStr ) - deviceName = (wxChar*) NULL; - else - deviceName = devNameStr.c_str(); - - LPDEVMODE lpDevMode = (LPDEVMODE) NULL; - - HGLOBAL hDevMode = (HGLOBAL)(DWORD) printData.GetNativeData(); - - if ( hDevMode ) - lpDevMode = (DEVMODE*) GlobalLock(hDevMode); - - if ( !devNameStr ) +#if wxUSE_PS_PRINTING + // TODO + wxUnusedVar(printDataConst); + return 0; +#else // native Windows printing + wxWindowsPrintNativeData *data = + (wxWindowsPrintNativeData *) printDataConst.GetNativeData(); + + data->TransferFrom( printDataConst ); + + wxString deviceName = printDataConst.GetPrinterName(); + if ( deviceName.empty() ) { // Retrieve the default device name wxString portName; -#ifdef __WXDEBUG__ - bool ret = -#else // !Debug - (void) -#endif // Debug/Release - wxGetDefaultDeviceName(devNameStr, portName); + if ( !wxGetDefaultDeviceName(deviceName, portName) ) + { + return 0; // Could not get default device name + } + } - wxASSERT_MSG( ret, wxT("Could not get default device name.") ); - deviceName = devNameStr.c_str(); - } + HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode(); -#ifdef __WIN32__ - HDC hDC = CreateDC(driverName, deviceName, portName, (DEVMODE *) lpDevMode); -#else - HDC hDC = CreateDC(driverName, deviceName, portName, (LPSTR) lpDevMode); -#endif + DEVMODE *lpDevMode = hDevMode ? (DEVMODE *)::GlobalLock(hDevMode) : NULL; + + HDC hDC = ::CreateDC(NULL, deviceName, NULL, lpDevMode); + if ( !hDC ) + wxLogLastError(_T("CreateDC(printer)")); - if (hDevMode && lpDevMode) - GlobalUnlock(hDevMode); + if ( lpDevMode ) + ::GlobalUnlock(hDevMode); return (WXHDC) hDC; +#endif // PostScript/Windows printing } // ---------------------------------------------------------------------------- @@ -341,16 +333,18 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc, const wxBitmap& bmp, wxCoord x, wxCoord y) { +#if wxUSE_WXDIB wxDIB dib(bmp); - if ( !dib.IsOk() ) - return FALSE; + bool ok = dib.IsOk(); + if ( !ok ) + return false; DIBSECTION ds; if ( !::GetObject(dib.GetHandle(), sizeof(ds), &ds) ) { wxLogLastError(_T("GetObject(DIBSECTION)")); - return FALSE; + return false; } // ok, we've got all data we need, do blit it @@ -369,10 +363,13 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc, { wxLogLastError(wxT("StretchDIBits")); - return FALSE; + return false; } - return TRUE; + return true; +#else + return false; +#endif } void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp, @@ -387,7 +384,7 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp, if ( !(::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB) || !DrawBitmapUsingStretchDIBits(GetHdc(), bmp, x, y) ) { - // no support for StretchDIBits() or an error occured if we got here + // no support for StretchDIBits() or an error occurred if we got here wxMemoryDC memDC; memDC.SelectObject(bmp); @@ -400,7 +397,7 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp, bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, - wxCoord xsrc, wxCoord ysrc, + wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc), int WXUNUSED(rop), bool useMask, wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask)) { @@ -436,7 +433,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, else // no mask { if ( !(::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB) || - !DrawBitmapUsingStretchDIBits(GetHdc(), bmp, xsrc, ysrc) ) + !DrawBitmapUsingStretchDIBits(GetHdc(), bmp, xdest, ydest) ) { // no support for StretchDIBits @@ -468,7 +465,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, } } - return TRUE; + return true; } #endif