From 5416dbea9b7caaa79e5e3f5fe890b7b96eafa131 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 22 May 2003 21:18:00 +0000 Subject: [PATCH] wxPrintData::ValidateOrCreate to keep common code for wxMac, used when ConvertToNative is called, not needed here anymore git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/printdlg.cpp | 76 +------------------------------------ src/mac/printdlg.cpp | 76 +------------------------------------ 2 files changed, 4 insertions(+), 148 deletions(-) diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp index 1b18c1d49b..83fe536f3a 100644 --- a/src/mac/carbon/printdlg.cpp +++ b/src/mac/carbon/printdlg.cpp @@ -80,7 +80,7 @@ wxPrintDialog::~wxPrintDialog() int wxPrintDialog::ShowModal() { int result = wxID_CANCEL ; - OSErr err ; + OSErr err = noErr ; wxString message ; #if !TARGET_CARBON @@ -109,56 +109,6 @@ int wxPrintDialog::ShowModal() { 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)m_printDialogData.GetPrintData().m_macPrintSession, - (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat); - } - } - else - { - err = PMSessionValidatePageFormat((PMPrintSession)m_printDialogData.GetPrintData().m_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)m_printDialogData.GetPrintData().m_macPrintSession, - (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings); - } - } - else - { - err = PMSessionValidatePrintSettings((PMPrintSession)m_printDialogData.GetPrintData().m_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) { @@ -228,7 +178,7 @@ wxPageSetupDialog::~wxPageSetupDialog() int wxPageSetupDialog::ShowModal() { int result = wxID_CANCEL ; - OSErr err ; + OSErr err = noErr ; wxString message ; #if !TARGET_CARBON @@ -257,28 +207,6 @@ int wxPageSetupDialog::ShowModal() { 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)m_pageSetupData.GetPrintData().m_macPrintSession, - (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat); - } - } - else - { - err = PMSessionValidatePageFormat((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession, - (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat, - kPMDontWantBoolean); - } - // Display the Page Setup dialog. if (err == noErr) { diff --git a/src/mac/printdlg.cpp b/src/mac/printdlg.cpp index 1b18c1d49b..83fe536f3a 100644 --- a/src/mac/printdlg.cpp +++ b/src/mac/printdlg.cpp @@ -80,7 +80,7 @@ wxPrintDialog::~wxPrintDialog() int wxPrintDialog::ShowModal() { int result = wxID_CANCEL ; - OSErr err ; + OSErr err = noErr ; wxString message ; #if !TARGET_CARBON @@ -109,56 +109,6 @@ int wxPrintDialog::ShowModal() { 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)m_printDialogData.GetPrintData().m_macPrintSession, - (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat); - } - } - else - { - err = PMSessionValidatePageFormat((PMPrintSession)m_printDialogData.GetPrintData().m_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)m_printDialogData.GetPrintData().m_macPrintSession, - (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings); - } - } - else - { - err = PMSessionValidatePrintSettings((PMPrintSession)m_printDialogData.GetPrintData().m_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) { @@ -228,7 +178,7 @@ wxPageSetupDialog::~wxPageSetupDialog() int wxPageSetupDialog::ShowModal() { int result = wxID_CANCEL ; - OSErr err ; + OSErr err = noErr ; wxString message ; #if !TARGET_CARBON @@ -257,28 +207,6 @@ int wxPageSetupDialog::ShowModal() { 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)m_pageSetupData.GetPrintData().m_macPrintSession, - (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat); - } - } - else - { - err = PMSessionValidatePageFormat((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession, - (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat, - kPMDontWantBoolean); - } - // Display the Page Setup dialog. if (err == noErr) {