X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd84061db32633592490da273570b8d78215c6c3..62d7be206678146e889a76e30537c74c0e2c0ecc:/src/msw/printdlg.cpp?ds=sidebyside diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index eb2d5dd126..b9b89b6210 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -46,7 +46,8 @@ // wxWindowsPrintNativeData //---------------------------------------------------------------------------- -#ifdef __WXDEBUG__ +#if wxDEBUG_LEVEL + static wxString wxGetPrintDlgError() { DWORD err = CommDlgExtendedError(); @@ -79,7 +80,9 @@ static wxString wxGetPrintDlgError() } return msg; } -#endif // __WXDEBUG__ + +#endif // wxDEBUG_LEVEL + static HGLOBAL wxCreateDevNames(const wxString& driverName, @@ -129,10 +132,10 @@ wxWindowsPrintNativeData::wxWindowsPrintNativeData() wxWindowsPrintNativeData::~wxWindowsPrintNativeData() { if ( m_devMode ) - ::GlobalFree(wx_static_cast(HGLOBAL, m_devMode)); + ::GlobalFree(static_cast(m_devMode)); if ( m_devNames ) - ::GlobalFree(wx_static_cast(HGLOBAL, m_devNames)); + ::GlobalFree(static_cast(m_devNames)); } bool wxWindowsPrintNativeData::IsOk() const @@ -147,7 +150,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data ) GlobalPtrLock lockDevMode(m_devMode); - LPDEVMODE devMode = wx_static_cast(LPDEVMODE, lockDevMode.Get()); + LPDEVMODE devMode = static_cast(lockDevMode.Get()); //// Orientation if (devMode->dmFields & DM_ORIENTATION) @@ -312,7 +315,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data ) if ( m_devNames ) { GlobalPtrLock lockDevNames(m_devNames); - LPDEVNAMES lpDevNames = wx_static_cast(LPDEVNAMES, lockDevNames.Get()); + LPDEVNAMES lpDevNames = static_cast(lockDevNames.Get()); // TODO: Unicode-ification @@ -335,7 +338,56 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data ) bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) { - HGLOBAL hDevMode = wx_static_cast(HGLOBAL, m_devMode); + HGLOBAL hDevMode = static_cast(m_devMode); + WinPrinter printer; + LPTSTR szPrinterName = (LPTSTR)data.GetPrinterName().wx_str(); + + // From MSDN: How To Modify Printer Settings with the DocumentProperties() Function + // The purpose of this is to fill the DEVMODE with privdata from printer driver. + // If we have a printer name and OpenPrinter sucessfully returns + // this replaces the PrintDlg function which creates the DEVMODE filled only with data from default printer. + if ( !m_devMode && !data.GetPrinterName().IsEmpty() ) + { + // Open printer + if ( printer.Open( data.GetPrinterName() ) == TRUE ) + { + DWORD dwNeeded, dwRet; + + // Step 1: + // Allocate a buffer of the correct size. + dwNeeded = DocumentProperties( NULL, + printer, // Handle to our printer. + szPrinterName, // Name of the printer. + NULL, // Asking for size, so + NULL, // these are not used. + 0 ); // Zero returns buffer size. + + LPDEVMODE tempDevMode = static_cast( GlobalAlloc( GMEM_FIXED | GMEM_ZEROINIT, dwNeeded ) ); + + // Step 2: + // Get the default DevMode for the printer + dwRet = DocumentProperties( NULL, + printer, + szPrinterName, + tempDevMode, // The address of the buffer to fill. + NULL, // Not using the input buffer. + DM_OUT_BUFFER ); // Have the output buffer filled. + + if ( dwRet != IDOK ) + { + // If failure, cleanup + GlobalFree( tempDevMode ); + printer.Close(); + } + else + { + hDevMode = tempDevMode; + m_devMode = hDevMode; + tempDevMode = NULL; + } + } + } + if ( !m_devMode ) { // Use PRINTDLG as a way of creating a DEVMODE object @@ -366,11 +418,9 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) pd.hDevMode = NULL; pd.hDevNames = NULL; -#ifdef __WXDEBUG__ - wxString str(wxT("Printing error: ")); - str += wxGetPrintDlgError(); - wxLogDebug(str); -#endif // __WXDEBUG__ +#if wxDEBUG_LEVEL + wxLogDebug(wxT("Printing error: ") + wxGetPrintDlgError()); +#endif // wxDEBUG_LEVEL } else { @@ -393,7 +443,7 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) if ( hDevMode ) { GlobalPtrLock lockDevMode(hDevMode); - DEVMODE * const devMode = wx_static_cast(DEVMODE *, lockDevMode.Get()); + DEVMODE * const devMode = static_cast(lockDevMode.Get()); //// Orientation devMode->dmOrientation = (short)data.GetOrientation(); @@ -412,10 +462,9 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) { // NB: the cast is needed in the ANSI build, strangely enough // dmDeviceName is BYTE[] and not char[] there - wxStrncpy(wx_reinterpret_cast(wxChar *, devMode->dmDeviceName), + wxStrlcpy(reinterpret_cast(devMode->dmDeviceName), name.wx_str(), - WXSIZEOF(devMode->dmDeviceName) - 1); - devMode->dmDeviceName[WXSIZEOF(devMode->dmDeviceName) - 1] = wxT('\0'); + WXSIZEOF(devMode->dmDeviceName)); } //// Colour @@ -457,6 +506,15 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) devMode->dmPaperLength = (short)(paperSize.y * 10); devMode->dmFields |= DM_PAPERWIDTH; devMode->dmFields |= DM_PAPERLENGTH; + + // A printer driver may or may not also want DM_PAPERSIZE to + // be specified. Also, if the printer driver doesn't implement the DMPAPER_USER + // size, then this won't work, and even if you found the correct id by + // enumerating the driver's paper sizes, it probably won't change the actual size, + // it'll just select that custom paper type with its own current setting. + // For a discussion on this, see http://www.codeguru.com/forum/showthread.php?threadid=458617 + // Although m_customWindowsPaperId is intended to work around this, it's + // unclear how it can help you set the custom paper size programmatically. } //else: neither paper type nor size specified, don't fill DEVMODE // at all so that the system defaults are used @@ -499,6 +557,8 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) break; default: quality = (short)data.GetQuality(); + devMode->dmYResolution = quality; + devMode->dmFields |= DM_YRESOLUTION; break; } devMode->dmPrintQuality = quality; @@ -540,11 +600,26 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) devMode->dmMediaType = data.GetMedia(); devMode->dmFields |= DM_MEDIATYPE; } + + if( printer ) + { + // Step 3: + // Merge the new settings with the old. + // This gives the driver an opportunity to update any private + // portions of the DevMode structure. + DocumentProperties( NULL, + printer, + szPrinterName, + (LPDEVMODE)hDevMode, // Reuse our buffer for output. + (LPDEVMODE)hDevMode, // Pass the driver our changes + DM_IN_BUFFER | // Commands to Merge our changes and + DM_OUT_BUFFER ); // write the result. + } } if ( m_devNames ) { - ::GlobalFree(wx_static_cast(HGLOBAL, m_devNames)); + ::GlobalFree(static_cast(m_devNames)); } // TODO: I hope it's OK to pass some empty strings to DEVNAMES. @@ -675,13 +750,13 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data ) if (pd->hDevNames) GlobalFree(pd->hDevNames); - pd->hDevMode = wx_static_cast(HGLOBAL, native_data->GetDevMode()); + pd->hDevMode = static_cast(native_data->GetDevMode()); native_data->SetDevMode(NULL); // Shouldn't assert; we should be able to test Ok-ness at a higher level //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!")); - pd->hDevNames = wx_static_cast(HGLOBAL, native_data->GetDevNames()); + pd->hDevNames = static_cast(native_data->GetDevNames()); native_data->SetDevNames(NULL); @@ -697,7 +772,7 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data ) pd->hwndOwner = NULL; pd->hInstance = NULL; - pd->lCustData = NULL; + pd->lCustData = 0; pd->lpfnPrintHook = NULL; pd->lpfnSetupHook = NULL; pd->lpPrintTemplateName = NULL; @@ -741,7 +816,7 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data ) { if (native_data->GetDevMode()) { - ::GlobalFree(wx_static_cast(HGLOBAL, native_data->GetDevMode())); + ::GlobalFree(static_cast(native_data->GetDevMode())); } native_data->SetDevMode(pd->hDevMode); pd->hDevMode = NULL; @@ -752,7 +827,7 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data ) { if (native_data->GetDevNames()) { - ::GlobalFree(wx_static_cast(HGLOBAL, native_data->GetDevNames())); + ::GlobalFree(static_cast(native_data->GetDevNames())); } native_data->SetDevNames(pd->hDevNames); pd->hDevNames = NULL;