X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0ee33f5c6908b4ac5e1364381f0ef00942e3936..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/printdlg.cpp?ds=inline diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index 2818820a0a..575fb82ffd 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: printdlg.cpp +// Name: src/msw/printdlg.cpp // Purpose: wxPrintDialog, wxPageSetupDialog // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "printdlg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -33,19 +29,19 @@ #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include "wx/app.h" + #include "wx/dcprint.h" + #include "wx/cmndata.h" #endif -#include "wx/cmndata.h" #include "wx/printdlg.h" #include "wx/msw/printdlg.h" -#include "wx/dcprint.h" +#include "wx/msw/dcprint.h" #include "wx/paper.h" #include -#include "wx/msw/wrapcdlg.h" - #ifndef __WIN32__ #include #endif @@ -99,19 +95,19 @@ static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& prin else { hDev = GlobalAlloc(GPTR, 4*sizeof(WORD)+ - ( driverName.Length() + 1 + - printerName.Length() + 1 + - portName.Length()+1 ) * sizeof(wxChar) ); + ( driverName.length() + 1 + + printerName.length() + 1 + + portName.length()+1 ) * sizeof(wxChar) ); LPDEVNAMES lpDev = (LPDEVNAMES)GlobalLock(hDev); lpDev->wDriverOffset = sizeof(WORD) * 4 / sizeof(wxChar); wxStrcpy((wxChar*)lpDev + lpDev->wDriverOffset, driverName); lpDev->wDeviceOffset = (WORD)( lpDev->wDriverOffset + - driverName.Length() + 1 ); + driverName.length() + 1 ); wxStrcpy((wxChar*)lpDev + lpDev->wDeviceOffset, printerName); lpDev->wOutputOffset = (WORD)( lpDev->wDeviceOffset + - printerName.Length() + 1 ); + printerName.length() + 1 ); wxStrcpy((wxChar*)lpDev + lpDev->wOutputOffset, portName); lpDev->wDefault = 0; @@ -141,7 +137,7 @@ wxWindowsPrintNativeData::~wxWindowsPrintNativeData() GlobalFree(hDevNames); } -bool wxWindowsPrintNativeData::Ok() const +bool wxWindowsPrintNativeData::IsOk() const { return (m_devMode != NULL) ; } @@ -176,12 +172,42 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data ) if (devMode->dmFields & DM_COPIES) data.SetNoCopies( devMode->dmCopies ); - if (devMode->dmFields & DM_DEFAULTSOURCE) - data.SetBin( (wxPrintBin)devMode->dmDefaultSource ); - + //// Bin + if (devMode->dmFields & DM_DEFAULTSOURCE) { + switch (devMode->dmDefaultSource) { + case DMBIN_ONLYONE : data.SetBin(wxPRINTBIN_ONLYONE ); break; + case DMBIN_LOWER : data.SetBin(wxPRINTBIN_LOWER ); break; + case DMBIN_MIDDLE : data.SetBin(wxPRINTBIN_MIDDLE ); break; + case DMBIN_MANUAL : data.SetBin(wxPRINTBIN_MANUAL ); break; + case DMBIN_ENVELOPE : data.SetBin(wxPRINTBIN_ENVELOPE ); break; + case DMBIN_ENVMANUAL : data.SetBin(wxPRINTBIN_ENVMANUAL ); break; + case DMBIN_AUTO : data.SetBin(wxPRINTBIN_AUTO ); break; + case DMBIN_TRACTOR : data.SetBin(wxPRINTBIN_TRACTOR ); break; + case DMBIN_SMALLFMT : data.SetBin(wxPRINTBIN_SMALLFMT ); break; + case DMBIN_LARGEFMT : data.SetBin(wxPRINTBIN_LARGEFMT ); break; + case DMBIN_LARGECAPACITY : data.SetBin(wxPRINTBIN_LARGECAPACITY ); break; + case DMBIN_CASSETTE : data.SetBin(wxPRINTBIN_CASSETTE ); break; + case DMBIN_FORMSOURCE : data.SetBin(wxPRINTBIN_FORMSOURCE ); break; + default: + if (devMode->dmDefaultSource>=DMBIN_USER) { + data.SetBin((wxPrintBin)((devMode->dmDefaultSource)-DMBIN_USER+(int)wxPRINTBIN_USER)); + } else { + data.SetBin(wxPRINTBIN_DEFAULT); + } + break; + } + } else { + data.SetBin(wxPRINTBIN_DEFAULT); + } + if (devMode->dmFields & DM_MEDIATYPE) + { + wxASSERT( (int)devMode->dmMediaType != wxPRINTMEDIA_DEFAULT ); + data.SetMedia(devMode->dmMediaType); + } //// Printer name if (devMode->dmDeviceName[0] != 0) - data.SetPrinterName( devMode->dmDeviceName ); + // This syntax fixes a crash when using VS 7.1 + data.SetPrinterName( wxString(devMode->dmDeviceName, CCHDEVICENAME) ); //// Colour if (devMode->dmFields & DM_COLOR) @@ -228,22 +254,24 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data ) } } - if (!foundPaperSize && (devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH)) - { - // DEVMODE is in tenths of a milimeter - data.SetPaperSize( wxSize(devMode->dmPaperWidth / 10, devMode->dmPaperLength / 10) ); - data.SetPaperId( wxPAPER_NONE ); - m_customWindowsPaperId = devMode->dmPaperSize; - } - else - { - // Often will reach this for non-standard paper sizes (sizes which - // wouldn't be in wxWidget's paper database). Setting - // m_customWindowsPaperId to devMode->dmPaperSize should be enough - // to get this paper size working. - data.SetPaperSize( wxSize(0,0) ); - data.SetPaperId( wxPAPER_NONE ); - m_customWindowsPaperId = devMode->dmPaperSize; + if (!foundPaperSize) { + if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH)) + { + // DEVMODE is in tenths of a millimeter + data.SetPaperSize( wxSize(devMode->dmPaperWidth / 10, devMode->dmPaperLength / 10) ); + data.SetPaperId( wxPAPER_NONE ); + m_customWindowsPaperId = devMode->dmPaperSize; + } + else + { + // Often will reach this for non-standard paper sizes (sizes which + // wouldn't be in wxWidget's paper database). Setting + // m_customWindowsPaperId to devMode->dmPaperSize should be enough + // to get this paper size working. + data.SetPaperSize( wxSize(0,0) ); + data.SetPaperId( wxPAPER_NONE ); + m_customWindowsPaperId = devMode->dmPaperSize; + } } //// Duplex @@ -417,38 +445,40 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) devMode->dmFields |= DM_COLOR; //// Paper size - if (data.GetPaperId() == wxPAPER_NONE) + + // Paper id has priority over paper size. If id is specified, then size + // is ignored (as it can be filled in even for standard paper sizes) + + wxPrintPaperType *paperType = NULL; + + const wxPaperSize paperId = data.GetPaperId(); + if ( paperId != wxPAPER_NONE && wxThePrintPaperDatabase ) { - // DEVMODE is in tenths of a milimeter - devMode->dmPaperWidth = (short)(data.GetPaperSize().x * 10); - devMode->dmPaperLength = (short)(data.GetPaperSize().y * 10); - if(m_customWindowsPaperId != 0) - devMode->dmPaperSize = m_customWindowsPaperId; - else - devMode->dmPaperSize = DMPAPER_USER; - devMode->dmFields |= DM_PAPERWIDTH; - devMode->dmFields |= DM_PAPERLENGTH; + paperType = wxThePrintPaperDatabase->FindPaperType(paperId); } - else + + if ( paperType ) { - if (wxThePrintPaperDatabase) + devMode->dmPaperSize = (short)paperType->GetPlatformId(); + devMode->dmFields |= DM_PAPERSIZE; + } + else // custom (or no) paper size + { + const wxSize paperSize = data.GetPaperSize(); + if ( paperSize != wxDefaultSize ) { - wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType( data.GetPaperId() ); - if (paper) - { - devMode->dmPaperSize = (short)paper->GetPlatformId(); - devMode->dmFields |= DM_PAPERSIZE; - } + // Fall back on specifying the paper size explicitly + if(m_customWindowsPaperId != 0) + devMode->dmPaperSize = m_customWindowsPaperId; else - { - // Fall back on specifying the paper size explicitly - devMode->dmPaperWidth = (short)(data.GetPaperSize().x * 10); - devMode->dmPaperLength = (short)(data.GetPaperSize().y * 10); devMode->dmPaperSize = DMPAPER_USER; - devMode->dmFields |= DM_PAPERWIDTH; - devMode->dmFields |= DM_PAPERLENGTH; - } + devMode->dmPaperWidth = (short)(paperSize.x * 10); + devMode->dmPaperLength = (short)(paperSize.y * 10); + devMode->dmFields |= DM_PAPERWIDTH; + devMode->dmFields |= DM_PAPERLENGTH; } + //else: neither paper type nor size specified, don't fill DEVMODE + // at all so that the system defaults are used } //// Duplex @@ -518,13 +548,17 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) case wxPRINTBIN_FORMSOURCE: devMode->dmDefaultSource = DMBIN_FORMSOURCE; break; default: - devMode->dmDefaultSource = (short)(DMBIN_USER + data.GetBin() - wxPRINTBIN_USER); + devMode->dmDefaultSource = (short)(DMBIN_USER + data.GetBin() - wxPRINTBIN_USER); // 256 + data.GetBin() - 14 = 242 + data.GetBin() break; } devMode->dmFields |= DM_DEFAULTSOURCE; } - + if (data.GetMedia() != wxPRINTMEDIA_DEFAULT) + { + devMode->dmMediaType = data.GetMedia(); + devMode->dmFields |= DM_MEDIATYPE; + } GlobalUnlock(hDevMode); } @@ -605,7 +639,7 @@ int wxWindowsPrintDialog::ShowModal() if ( ret && (pd->hDC) ) { - wxPrinterDC *pdc = new wxPrinterDC( (WXHDC) pd->hDC ); + wxPrinterDC *pdc = new wxPrinterDCFromHDC( (WXHDC) pd->hDC ); m_printerDC = pdc; ConvertFromNative( m_printDialogData ); return wxID_OK; @@ -624,7 +658,7 @@ wxDC *wxWindowsPrintDialog::GetPrintDC() return m_printerDC; } else - return (wxDC*) NULL; + return (wxPrinterDC*) NULL; } bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data ) @@ -720,10 +754,6 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data ) pd->Flags |= PD_PAGENUMS; if ( data.GetEnableHelp() ) pd->Flags |= PD_SHOWHELP; -#if WXWIN_COMPATIBILITY_2_4 - if ( data.GetSetupDialog() ) - pd->Flags |= PD_PRINTSETUP; -#endif return true; } @@ -779,9 +809,7 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data ) data.EnableSelection( ((pd->Flags & PD_NOSELECTION) != PD_NOSELECTION) ); data.EnablePageNumbers( ((pd->Flags & PD_NOPAGENUMS) != PD_NOPAGENUMS) ); data.EnableHelp( ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP) ); -#if WXWIN_COMPATIBILITY_2_4 - data.SetSetupDialog( ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP) ); -#endif + return true; } @@ -999,7 +1027,10 @@ bool wxWindowsPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data ) data.EnableHelp( ((pd->Flags & PSD_SHOWHELP) == PSD_SHOWHELP) ); // PAGESETUPDLG is in hundreds of a mm - data.SetPaperSize( wxSize(pd->ptPaperSize.x / 100, pd->ptPaperSize.y / 100) ); + if (data.GetPrintData().GetOrientation() == wxLANDSCAPE) + data.SetPaperSize( wxSize(pd->ptPaperSize.y / 100, pd->ptPaperSize.x / 100) ); + else + data.SetPaperSize( wxSize(pd->ptPaperSize.x / 100, pd->ptPaperSize.y / 100) ); data.SetMinMarginTopLeft( wxPoint(pd->rtMinMargin.left / 100, pd->rtMinMargin.top / 100) ); data.SetMinMarginBottomRight( wxPoint(pd->rtMinMargin.right / 100, pd->rtMinMargin.bottom / 100) );