X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66a09d4776b8ae390d5aa51dbd678b694f2c81d6..e778ad8607ac24c10a854709114bd2c90765618c:/src/mac/carbon/printdlg.cpp diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp index adb620e76f..89f2789250 100644 --- a/src/mac/carbon/printdlg.cpp +++ b/src/mac/carbon/printdlg.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: printdlg.cpp // Purpose: wxPrintDialog, wxPageSetupDialog -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -17,17 +17,7 @@ #include "wx/printdlg.h" #include "wx/dcprint.h" #include "wx/msgdlg.h" -#include "wx/mac/uma.h" -#ifndef __DARWIN__ - #include "Printing.h" -#endif - -#if defined(TARGET_CARBON) && !defined(__DARWIN__) -# if PM_USE_SESSION_APIS -# include -# endif -# include -#endif +#include "wx/mac/private/print.h" // Use generic page setup dialog: use your own native one if one exists. @@ -53,7 +43,7 @@ wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data) wxPrintDialogData data2; if ( data ) data2 = *data; - + Create(p, &data2); } @@ -62,134 +52,29 @@ bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data) m_dialogParent = p; m_printerDC = NULL; m_destroyDC = TRUE; - + if ( data ) m_printDialogData = *data; - + return TRUE; } wxPrintDialog::~wxPrintDialog() { - if (m_destroyDC && m_printerDC) + if (m_destroyDC && m_printerDC) { delete m_printerDC; + m_printerDC = NULL; + } } int wxPrintDialog::ShowModal() { - int result = wxID_CANCEL ; - OSErr err ; - wxString message ; - -#if !TARGET_CARBON - err = ::UMAPrOpen(NULL) ; - if ( err == noErr ) - { - m_printDialogData.ConvertToNative() ; - if ( ::PrJobDialog( (THPrint) m_printDialogData.GetPrintData().m_macPrintSettings ) ) - { - m_printDialogData.ConvertFromNative() ; - result = wxID_OK ; - } - - } - else - { - message.Printf( "Print Error %d", err ) ; - wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ; - dialog.ShowModal(); - } - ::UMAPrClose(NULL) ; -#else - #if PM_USE_SESSION_APIS - PMPrintSession macPrintSession = kPMNoReference; - Boolean accepted; + m_printDialogData.ConvertToNative() ; + int result = m_printDialogData.GetPrintData().m_nativePrintData->ShowPrintDialog() ; + if ( result == wxID_OK ) + m_printDialogData.ConvertFromNative() ; - err = ::UMAPrOpen(&macPrintSession) ; - if ( err == noErr ) - { - m_printDialogData.ConvertToNative() ; - - // Set up a valid PageFormat object. - if (m_printDialogData.GetPrintData().m_macPageFormat == kPMNoPageFormat) - { - err = PMCreatePageFormat((PMPageFormat *)&m_printDialogData.GetPrintData().m_macPageFormat); - - // Note that PMPageFormat is not session-specific, but calling - // PMSessionDefaultPageFormat assigns values specific to the printer - // associated with the current printing session. - if ((err == noErr) && - (m_printDialogData.GetPrintData().m_macPageFormat != kPMNoPageFormat)) - { - err = PMSessionDefaultPageFormat((PMPrintSession)macPrintSession, - (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat); - } - } - else - { - err = PMSessionValidatePageFormat((PMPrintSession)macPrintSession, - (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat, - kPMDontWantBoolean); - } - - // Set up a valid PrintSettings object. - if (m_printDialogData.GetPrintData().m_macPrintSettings == kPMNoPrintSettings) - { - err = PMCreatePrintSettings((PMPrintSettings *)&m_printDialogData.GetPrintData().m_macPrintSettings); - - // Note that PMPrintSettings is not session-specific, but calling - // PMSessionDefaultPrintSettings assigns values specific to the printer - // associated with the current printing session. - if ((err == noErr) && - (m_printDialogData.GetPrintData().m_macPrintSettings != kPMNoPrintSettings)) - { - err = PMSessionDefaultPrintSettings((PMPrintSession)macPrintSession, - (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings); - } - } - else - { - err = PMSessionValidatePrintSettings((PMPrintSession)macPrintSession, - (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings, - kPMDontWantBoolean); - } - // Set a valid page range before displaying the Print dialog - if (err == noErr) - { - // err = PMSetPageRange(m_printDialogData.GetPrintData().m_macPrintSettings, - // minPage, maxPage); - } - - // Display the Print dialog. - if (err == noErr) - { - err = PMSessionPrintDialog((PMPrintSession)macPrintSession, - (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings, - (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat, - &accepted); - if ((err == noErr) && !accepted) - { - err = kPMCancel; // user clicked Cancel button - } - } - if ( err == noErr ) - { - m_printDialogData.ConvertFromNative() ; - result = wxID_OK ; - } - } - if ((err != noErr) && (err != kPMCancel)) - { - message.Printf( "Print Error %d", err ) ; - wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ; - dialog.ShowModal(); - } - ::UMAPrClose(&macPrintSession) ; - #else - #pragma warning "TODO: Printing for carbon without session apis" - #endif -#endif - return result ; + return result ; } wxDC *wxPrintDialog::GetPrintDC() @@ -198,17 +83,17 @@ wxDC *wxPrintDialog::GetPrintDC() } /* - * wxPageSetupDialog - */ +* wxPageSetupDialog +*/ wxPageSetupDialog::wxPageSetupDialog(): - wxDialog() +wxDialog() { - m_dialogParent = NULL; + m_dialogParent = NULL; } wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data): - wxDialog() +wxDialog() { Create(p, data); } @@ -216,10 +101,10 @@ wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data): bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data) { m_dialogParent = p; - + if (data) m_pageSetupData = (*data); - + return TRUE; } @@ -229,92 +114,11 @@ wxPageSetupDialog::~wxPageSetupDialog() int wxPageSetupDialog::ShowModal() { - int result = wxID_CANCEL ; - OSErr err ; - wxString message ; - -#if !TARGET_CARBON - err = ::UMAPrOpen(NULL) ; - if ( err == noErr ) - { - m_pageSetupData.ConvertToNative() ; - if ( ::PrStlDialog( (THPrint) m_pageSetupData.GetPrintData().m_macPrintSettings ) ) - { - m_pageSetupData.ConvertFromNative() ; - result = wxID_OK ; - } - - } - else - { - message.Printf( "Print Error %d", err ) ; - wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ; - dialog.ShowModal(); - } - ::UMAPrClose(NULL) ; -#else - #if PM_USE_SESSION_APIS - PMPrintSession macPrintSession = kPMNoReference; - Boolean accepted; - - err = ::UMAPrOpen(&macPrintSession) ; - if ( err == noErr ) - { - m_pageSetupData.ConvertToNative() ; - - // Set up a valid PageFormat object. - if (m_pageSetupData.GetPrintData().m_macPageFormat == kPMNoPageFormat) - { - err = PMCreatePageFormat((PMPageFormat *)&m_pageSetupData.GetPrintData().m_macPageFormat); - - // Note that PMPageFormat is not session-specific, but calling - // PMSessionDefaultPageFormat assigns values specific to the printer - // associated with the current printing session. - if ((err == noErr) && - (m_pageSetupData.GetPrintData().m_macPageFormat != kPMNoPageFormat)) - { - err = PMSessionDefaultPageFormat((PMPrintSession)macPrintSession, - (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat); - } - } - else - { - err = PMSessionValidatePageFormat((PMPrintSession)macPrintSession, - (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat, - kPMDontWantBoolean); - } - - // Display the Page Setup dialog. - if (err == noErr) - { - err = PMSessionPageSetupDialog((PMPrintSession)macPrintSession, - (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat, - &accepted); - if ((err == noErr) && !accepted) - { - err = kPMCancel; // user clicked Cancel button - } - } + m_pageSetupData.ConvertToNative() ; + int result = m_pageSetupData.GetPrintData().m_nativePrintData->ShowPageSetupDialog() ; + if (result == wxID_OK ) + m_pageSetupData.ConvertFromNative() ; - // If the user did not cancel, flatten and save the PageFormat object - // with our document. - if (err == noErr) { - // err = FlattenAndSavePageFormat(m_pageSetupData.GetPrintData().m_macPageFormat); - m_pageSetupData.ConvertFromNative() ; - result = wxID_OK ; - } - } - if ((err != noErr) && (err != kPMCancel)) - { - message.Printf( "Print Error %d", err ) ; - wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ; - dialog.ShowModal(); - } - ::UMAPrClose(&macPrintSession) ; - #else - #pragma warning "TODO: Printing for carbon without session apis" - #endif -#endif - return result ; + return result ; }