X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93c2f401e9955dc37df1f8dbfea7881c676b8ddb..d44d0cbd7343e36ddd3657dd97cd5eb7018d2585:/src/msw/printdlg.cpp diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index 2327f9d04f..02892c4510 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -38,14 +38,13 @@ #include "wx/cmndata.h" #include "wx/printdlg.h" +#include "wx/msw/printdlg.h" #include "wx/dcprint.h" #include "wx/paper.h" #include -#include "wx/msw/private.h" - -#include +#include "wx/msw/wrapcdlg.h" #ifndef __WIN32__ #include @@ -93,8 +92,8 @@ static wxString wxGetPrintDlgError() static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName) { HGLOBAL hDev = NULL; - // if (!driverName.IsEmpty() && !printerName.IsEmpty() && !portName.IsEmpty()) - if (driverName.IsEmpty() && printerName.IsEmpty() && portName.IsEmpty()) + // if (!driverName.empty() && !printerName.empty() && !portName.empty()) + if (driverName.empty() && printerName.empty() && portName.empty()) { } else @@ -247,7 +246,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data ) { case DMDUP_HORIZONTAL: data.SetDuplex( wxDUPLEX_HORIZONTAL ); break; case DMDUP_VERTICAL: data.SetDuplex( wxDUPLEX_VERTICAL ); break; - default: + default: case DMDUP_SIMPLEX: data.SetDuplex( wxDUPLEX_SIMPLEX ); break; } } @@ -278,6 +277,11 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data ) else data.SetQuality( wxPRINT_QUALITY_HIGH ); + if (devMode->dmDriverExtra > 0) + data.SetPrivData( (char *)devMode+devMode->dmSize, devMode->dmDriverExtra ); + else + data.SetPrivData( NULL, 0 ); + GlobalUnlock(hDevMode); } @@ -296,15 +300,15 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data ) wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset; // Not sure if we should check for this mismatch -// wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!"); +// wxASSERT_MSG( (m_printerName.empty() || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!"); - if (printerName != wxT("")) + if (!printerName.empty()) data.SetPrinterName( printerName ); GlobalUnlock(hDevNames); } } - + return true; } @@ -390,7 +394,7 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) //// Printer name wxString name = data.GetPrinterName(); - if (name != wxT("")) + if (!name.empty()) { //int len = wxMin(31, m_printerName.Len()); wxStrncpy((wxChar*)devMode->dmDeviceName,name.c_str(),31); @@ -469,6 +473,12 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) devMode->dmPrintQuality = quality; devMode->dmFields |= DM_PRINTQUALITY; + if (data.GetPrivDataLen() > 0) + { + memcpy( (char *)devMode+devMode->dmSize, data.GetPrivData(), data.GetPrivDataLen() ); + devMode->dmDriverExtra = (WXWORD)data.GetPrivDataLen(); + } + if (data.GetBin() != wxPRINTBIN_DEFAULT) { switch (data.GetBin()) @@ -504,11 +514,11 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) } // TODO: I hope it's OK to pass some empty strings to DEVNAMES. - m_devNames = (void*) (long) wxCreateDevNames(wxT(""), data.GetPrinterName(), wxT("")); - + m_devNames = (void*) (long) wxCreateDevNames(wxEmptyString, data.GetPrinterName(), wxEmptyString); + return true; } - + // --------------------------------------------------------------------------- // wxPrintDialog // --------------------------------------------------------------------------- @@ -537,7 +547,7 @@ bool wxWindowsPrintDialog::Create(wxWindow *p, wxPrintDialogData* data) // MSW handle m_printDlg = NULL; - + if ( data ) m_printDialogData = *data; @@ -561,7 +571,7 @@ int wxWindowsPrintDialog::ShowModal() ConvertToNative( m_printDialogData ); PRINTDLG *pd = (PRINTDLG*) m_printDlg; - + if (m_dialogParent) pd->hwndOwner = (HWND) m_dialogParent->GetHWND(); else if (wxTheApp->GetTopWindow()) @@ -602,13 +612,13 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data ) wxWindowsPrintNativeData *native_data = (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData(); data.GetPrintData().ConvertToNative(); - + PRINTDLG *pd = (PRINTDLG*) m_printDlg; // Shouldn't have been defined anywhere if (pd) return false; - + pd = new PRINTDLG; memset( pd, 0, sizeof(PRINTDLG) ); m_printDlg = (void*) pd; @@ -625,7 +635,7 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data ) pd->Flags = PD_RETURNDEFAULT; pd->nCopies = 1; - + // Pass the devmode data to the PRINTDLG structure, since it'll // be needed when PrintDlg is called. if (pd->hDevMode) @@ -690,9 +700,11 @@ 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; } @@ -704,7 +716,7 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data ) wxWindowsPrintNativeData *native_data = (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData(); - + // Pass the devmode data back to the wxPrintData structure where it really belongs. if (pd->hDevMode) { @@ -747,71 +759,235 @@ 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; } // --------------------------------------------------------------------------- -// wxPageSetupDialog +// wxWidnowsPageSetupDialog // --------------------------------------------------------------------------- -IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog) +IMPLEMENT_CLASS(wxWindowsPageSetupDialog, wxPageSetupDialogBase) -wxPageSetupDialog::wxPageSetupDialog() +wxWindowsPageSetupDialog::wxWindowsPageSetupDialog() { m_dialogParent = NULL; + m_pageDlg = NULL; } -wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data) +wxWindowsPageSetupDialog::wxWindowsPageSetupDialog(wxWindow *p, wxPageSetupDialogData *data) { Create(p, data); } -bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data) +bool wxWindowsPageSetupDialog::Create(wxWindow *p, wxPageSetupDialogData *data) { m_dialogParent = p; + m_pageDlg = NULL; if (data) m_pageSetupData = (*data); -#if defined(__WIN95__) - m_pageSetupData.SetOwnerWindow(p); -#endif return true; } -wxPageSetupDialog::~wxPageSetupDialog() +wxWindowsPageSetupDialog::~wxWindowsPageSetupDialog() { + PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageDlg; + if ( pd && pd->hDevMode ) + GlobalFree(pd->hDevMode); + if ( pd && pd->hDevNames ) + GlobalFree(pd->hDevNames); + if ( pd ) + delete pd; } -int wxPageSetupDialog::ShowModal() +int wxWindowsPageSetupDialog::ShowModal() { -#ifdef __WIN95__ - m_pageSetupData.ConvertToNative(); - PAGESETUPDLG *p = (PAGESETUPDLG *)m_pageSetupData.GetNativeData(); + ConvertToNative( m_pageSetupData ); + + PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg; if (m_dialogParent) - p->hwndOwner = (HWND) m_dialogParent->GetHWND(); + pd->hwndOwner = (HWND) m_dialogParent->GetHWND(); else if (wxTheApp->GetTopWindow()) - p->hwndOwner = (HWND) wxTheApp->GetTopWindow()->GetHWND(); + pd->hwndOwner = (HWND) wxTheApp->GetTopWindow()->GetHWND(); else - p->hwndOwner = 0; - BOOL retVal = PageSetupDlg( p ) ; - p->hwndOwner = 0; + pd->hwndOwner = 0; + BOOL retVal = PageSetupDlg( pd ) ; + pd->hwndOwner = 0; if (retVal) { - m_pageSetupData.ConvertFromNative(); + ConvertFromNative( m_pageSetupData ); return wxID_OK; } else return wxID_CANCEL; -#else - wxGenericPageSetupDialog *genericPageSetupDialog = new wxGenericPageSetupDialog(GetParent(), & m_pageSetupData); - int ret = genericPageSetupDialog->ShowModal(); - m_pageSetupData = genericPageSetupDialog->GetPageSetupData(); - genericPageSetupDialog->Close(true); - return ret; -#endif +} + +bool wxWindowsPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data ) +{ + wxWindowsPrintNativeData *native_data = + (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData(); + data.GetPrintData().ConvertToNative(); + + PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageDlg; + + // Shouldn't have been defined anywhere + if (pd) + return false; + + pd = new PAGESETUPDLG; + pd->hDevMode = NULL; + pd->hDevNames = NULL; + m_pageDlg = (void *)pd; + + // Pass the devmode data (created in m_printData.ConvertToNative) + // to the PRINTDLG structure, since it'll + // be needed when PrintDlg is called. + + if (pd->hDevMode) + { + GlobalFree(pd->hDevMode); + pd->hDevMode = NULL; + } + pd->hDevMode = (HGLOBAL) native_data->GetDevMode(); + native_data->SetDevMode( (void*) 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!")); + + // Pass the devnames data (created in m_printData.ConvertToNative) + // to the PRINTDLG structure, since it'll + // be needed when PrintDlg is called. + + if (pd->hDevNames) + { + GlobalFree(pd->hDevNames); + pd->hDevNames = NULL; + } + pd->hDevNames = (HGLOBAL) native_data->GetDevNames(); + native_data->SetDevNames((void*) NULL); + +// pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE)); + + pd->Flags = PSD_MARGINS|PSD_MINMARGINS; + + if ( data.GetDefaultMinMargins() ) + pd->Flags |= PSD_DEFAULTMINMARGINS; + if ( !data.GetEnableMargins() ) + pd->Flags |= PSD_DISABLEMARGINS; + if ( !data.GetEnableOrientation() ) + pd->Flags |= PSD_DISABLEORIENTATION; + if ( !data.GetEnablePaper() ) + pd->Flags |= PSD_DISABLEPAPER; + if ( !data.GetEnablePrinter() ) + pd->Flags |= PSD_DISABLEPRINTER; + if ( data.GetDefaultInfo() ) + pd->Flags |= PSD_RETURNDEFAULT; + if ( data.GetEnableHelp() ) + pd->Flags |= PSD_SHOWHELP; + + // We want the units to be in hundredths of a millimetre + pd->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS; + + pd->lStructSize = sizeof( PAGESETUPDLG ); + pd->hwndOwner=(HWND)NULL; +// pd->hDevNames=(HWND)NULL; + pd->hInstance=(HINSTANCE)NULL; + // PAGESETUPDLG is in hundreds of a mm + pd->ptPaperSize.x = data.GetPaperSize().x * 100; + pd->ptPaperSize.y = data.GetPaperSize().y * 100; + + pd->rtMinMargin.left = data.GetMinMarginTopLeft().x * 100; + pd->rtMinMargin.top = data.GetMinMarginTopLeft().y * 100; + pd->rtMinMargin.right = data.GetMinMarginBottomRight().x * 100; + pd->rtMinMargin.bottom = data.GetMinMarginBottomRight().y * 100; + + pd->rtMargin.left = data.GetMarginTopLeft().x * 100; + pd->rtMargin.top = data.GetMarginTopLeft().y * 100; + pd->rtMargin.right = data.GetMarginBottomRight().x * 100; + pd->rtMargin.bottom = data.GetMarginBottomRight().y * 100; + + pd->lCustData = 0; + pd->lpfnPageSetupHook = NULL; + pd->lpfnPagePaintHook = NULL; + pd->hPageSetupTemplate = NULL; + pd->lpPageSetupTemplateName = NULL; + +/* + if ( pd->hDevMode ) + { + DEVMODE *devMode = (DEVMODE*) GlobalLock(pd->hDevMode); + memset(devMode, 0, sizeof(DEVMODE)); + devMode->dmSize = sizeof(DEVMODE); + devMode->dmOrientation = m_orientation; + devMode->dmFields = DM_ORIENTATION; + GlobalUnlock(pd->hDevMode); + } +*/ + return true; +} + +bool wxWindowsPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data ) +{ + PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg; + if ( !pd ) + return false; + + wxWindowsPrintNativeData *native_data = + (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData(); + + // Pass the devmode data back to the wxPrintData structure where it really belongs. + if (pd->hDevMode) + { + if (native_data->GetDevMode()) + { + // Make sure we don't leak memory + GlobalFree((HGLOBAL) native_data->GetDevMode()); + } + native_data->SetDevMode( (void*) pd->hDevMode ); + pd->hDevMode = NULL; + } + + // Isn't this superfluous? It's called again below. + // data.GetPrintData().ConvertFromNative(); + + // Pass the devnames data back to the wxPrintData structure where it really belongs. + if (pd->hDevNames) + { + if (native_data->GetDevNames()) + { + // Make sure we don't leak memory + GlobalFree((HGLOBAL) native_data->GetDevNames()); + } + native_data->SetDevNames((void*) pd->hDevNames); + pd->hDevNames = NULL; + } + + data.GetPrintData().ConvertFromNative(); + + pd->Flags = PSD_MARGINS|PSD_MINMARGINS; + + data.SetDefaultMinMargins( ((pd->Flags & PSD_DEFAULTMINMARGINS) == PSD_DEFAULTMINMARGINS) ); + data.EnableMargins( ((pd->Flags & PSD_DISABLEMARGINS) != PSD_DISABLEMARGINS) ); + data.EnableOrientation( ((pd->Flags & PSD_DISABLEORIENTATION) != PSD_DISABLEORIENTATION) ); + data.EnablePaper( ((pd->Flags & PSD_DISABLEPAPER) != PSD_DISABLEPAPER) ); + data.EnablePrinter( ((pd->Flags & PSD_DISABLEPRINTER) != PSD_DISABLEPRINTER) ); + data.SetDefaultInfo( ((pd->Flags & PSD_RETURNDEFAULT) == PSD_RETURNDEFAULT) ); + 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) ); + + data.SetMinMarginTopLeft( wxPoint(pd->rtMinMargin.left / 100, pd->rtMinMargin.top / 100) ); + data.SetMinMarginBottomRight( wxPoint(pd->rtMinMargin.right / 100, pd->rtMinMargin.bottom / 100) ); + + data.SetMarginTopLeft( wxPoint(pd->rtMargin.left / 100, pd->rtMargin.top / 100) ); + data.SetMarginBottomRight( wxPoint(pd->rtMargin.right / 100, pd->rtMargin.bottom / 100) ); + + return true; } #endif