X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6081a0462089eaa1da4d38b260af032b349a041..ef70f0ecdbc4268923e132b257c95e8a2525f4ca:/src/msw/dcprint.cpp?ds=sidebyside diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index c39d15dc3f..76b581fa9f 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -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" @@ -68,68 +70,61 @@ IMPLEMENT_CLASS(wxPrinterDC, wxDC) // ---------------------------------------------------------------------------- // This form is deprecated -wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_name, const wxString& file, bool interactive, int orientation) +wxPrinterDC::wxPrinterDC(const wxString& driver_name, + const wxString& device_name, + const wxString& file, + bool interactive, + int orientation) { m_isInteractive = interactive; - if ( !!file ) + if ( !file.empty() ) m_printData.SetFilename(file); #if wxUSE_COMMON_DIALOGS - if (interactive) + if ( interactive ) { PRINTDLG pd; pd.lStructSize = sizeof( PRINTDLG ); - pd.hwndOwner=(HWND) NULL; - pd.hDevMode=(HANDLE)NULL; - pd.hDevNames=(HANDLE)NULL; - pd.Flags=PD_RETURNDC | PD_NOSELECTION | PD_NOPAGENUMS; - pd.nFromPage=0; - pd.nToPage=0; - pd.nMinPage=0; - pd.nMaxPage=0; - pd.nCopies=1; - pd.hInstance=(HINSTANCE)NULL; - - if ( PrintDlg( &pd ) != 0 ) + pd.hwndOwner = (HWND) NULL; + pd.hDevMode = (HANDLE)NULL; + pd.hDevNames = (HANDLE)NULL; + pd.Flags = PD_RETURNDC | PD_NOSELECTION | PD_NOPAGENUMS; + pd.nFromPage = 0; + pd.nToPage = 0; + pd.nMinPage = 0; + pd.nMaxPage = 0; + pd.nCopies = 1; + pd.hInstance = (HINSTANCE)NULL; + + m_ok = PrintDlg( &pd ) != 0; + if ( m_ok ) { m_hDC = (WXHDC) pd.hDC; - m_ok = TRUE; - } - else - { - m_ok = FALSE; - return; } - - // m_dontDelete = TRUE; } else #endif // wxUSE_COMMON_DIALOGS - if ((!driver_name.IsNull() && driver_name != wxT("")) && - (!device_name.IsNull() && device_name != wxT("")) && - (!file.IsNull() && file != wxT(""))) + { + if ( !driver_name.empty() && !device_name.empty() && !file.empty() ) { - m_hDC = (WXHDC) CreateDC(WXSTRINGCAST driver_name, WXSTRINGCAST device_name, WXSTRINGCAST file, NULL); - m_ok = m_hDC ? TRUE: FALSE; + m_hDC = (WXHDC) CreateDC(driver_name, device_name, file, NULL); } - else + else // we don't have all parameters, ask the user { wxPrintData printData; printData.SetOrientation(orientation); m_hDC = wxGetPrinterDC(printData); - m_ok = m_hDC ? TRUE: FALSE; } - if (m_hDC) - { - // int width = GetDeviceCaps(m_hDC, VERTRES); - // int height = GetDeviceCaps(m_hDC, HORZRES); - SetMapMode(wxMM_TEXT); - } - SetBrush(*wxBLACK_BRUSH); - SetPen(*wxBLACK_PEN); + m_ok = m_hDC ? TRUE: FALSE; + + // as we created it, we must delete it as well + m_bOwnsDC = TRUE; + } + + Init(); } wxPrinterDC::wxPrinterDC(const wxPrintData& printData) @@ -139,34 +134,33 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printData) m_isInteractive = FALSE; m_hDC = wxGetPrinterDC(printData); - m_ok = (m_hDC != 0); + m_ok = m_hDC != 0; + m_bOwnsDC = TRUE; - if (m_hDC) - SetMapMode(wxMM_TEXT); - - SetBrush(*wxBLACK_BRUSH); - SetPen(*wxBLACK_PEN); + Init(); } -wxPrinterDC::wxPrinterDC(WXHDC theDC) +wxPrinterDC::wxPrinterDC(WXHDC dc) { m_isInteractive = FALSE; - m_hDC = theDC; + m_hDC = dc; + m_bOwnsDC = TRUE; m_ok = TRUE; - if (m_hDC) +} + +void wxPrinterDC::Init() +{ + if ( m_hDC ) { // int width = GetDeviceCaps(m_hDC, VERTRES); // int height = GetDeviceCaps(m_hDC, HORZRES); SetMapMode(wxMM_TEXT); - } - SetBrush(*wxBLACK_BRUSH); - SetPen(*wxBLACK_PEN); -} -wxPrinterDC::~wxPrinterDC() -{ + SetBrush(*wxBLACK_BRUSH); + SetPen(*wxBLACK_PEN); + } } // ---------------------------------------------------------------------------- @@ -227,19 +221,21 @@ void wxPrinterDC::EndPage() // Returns default device and port names static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName) { - deviceName = ""; + deviceName.clear(); LPDEVNAMES lpDevNames; - LPSTR lpszDriverName; - LPSTR lpszDeviceName; - LPSTR lpszPortName; + LPTSTR lpszDriverName; + LPTSTR lpszDeviceName; + LPTSTR lpszPortName; PRINTDLG pd; // Cygwin has trouble believing PRINTDLG is 66 bytes - thinks it is 68 #ifdef __GNUWIN32__ + memset(&pd, 0, 66); pd.lStructSize = 66; // sizeof(PRINTDLG); #else + memset(&pd, 0, sizeof(PRINTDLG)); pd.lStructSize = sizeof(PRINTDLG); #endif @@ -262,9 +258,9 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName) if (pd.hDevNames) { lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames); - lpszDriverName = (LPSTR)lpDevNames + lpDevNames->wDriverOffset; - lpszDeviceName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset; - lpszPortName = (LPSTR)lpDevNames + lpDevNames->wOutputOffset; + lpszDriverName = (LPTSTR)lpDevNames + lpDevNames->wDriverOffset; + lpszDeviceName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset; + lpszPortName = (LPTSTR)lpDevNames + lpDevNames->wOutputOffset; deviceName = lpszDeviceName; portName = lpszPortName; @@ -357,7 +353,7 @@ WXHDC wxGetPrinterDC(int orientation) } return (WXHDC) hDC; } -#endif +#endif // 0 // Gets an HDC for the specified printer configuration WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst) @@ -456,7 +452,7 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap &bmp, bits, info, DIB_RGB_COLORS, SRCCOPY) == GDI_ERROR ) { - wxLogLastError("StretchDIBits"); + wxLogLastError(wxT("StretchDIBits")); } } @@ -478,7 +474,8 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop, bool useMask) + int WXUNUSED(rop), bool useMask, + wxCoord xsrcMask, wxCoord ysrcMask) { bool success = TRUE; @@ -502,7 +499,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y)); rect.left = xdest + x; rect.right = rect.left + 1; - rect.top = ydest + y; + rect.top = ydest + y; rect.bottom = rect.top + 1; ::FillRect(GetHdc(), &rect, brush); ::DeleteObject(brush); @@ -538,7 +535,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 +551,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, SRCCOPY) != GDI_ERROR; if ( !success ) { - wxLogLastError("StretchDIBits"); + wxLogLastError(wxT("StretchDIBits")); } } @@ -593,3 +590,6 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, return success; } + +#endif + // wxUSE_PRINTING_ARCHITECTURE