- int result = wxID_CANCEL ;
- OSErr err ;
- wxString message ;
- ::PrOpen() ;
- err = PrError() ;
-
- if ( !err )
- {
- m_pageSetupData.ConvertToNative() ;
- if ( m_pageSetupData.m_macPageSetupInfo && ::PrStlDialog( m_pageSetupData.m_macPageSetupInfo ) )
- {
- m_pageSetupData.ConvertFromNative() ;
- result = wxID_OK ;
- }
-
- }
- else
- {
- message.Printf( "Print Error %d", err ) ;
- wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
- }
- ::PrClose() ;
-
- return result ;
+ m_pageSetupData.GetPrintData().ConvertToNative();
+ ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->TransferFrom( &m_pageSetupData ) ;
+
+ int result = wxID_CANCEL ;
+ OSErr err = noErr ;
+ wxString message ;
+
+ Boolean accepted;
+
+ err = PMSessionPageSetupDialog( ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->m_macPrintSession,
+ ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->m_macPageFormat,
+ &accepted);
+ if ((err == noErr) && !accepted)
+ {
+ err = kPMCancel; // user clicked Cancel button
+ }
+
+ // If the user did not cancel, flatten and save the PageFormat object
+ // with our document.
+ if (err == noErr)
+ {
+ result = wxID_OK ;
+ }
+ if ((err != noErr) && (err != kPMCancel))
+ {
+ message.Printf( wxT("Print Error %d"), err ) ;
+ wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
+ dialog.ShowModal();
+ }
+
+ if (result == wxID_OK )
+ {
+ m_pageSetupData.GetPrintData().ConvertFromNative();
+ m_pageSetupData.SetPaperSize( m_pageSetupData.GetPrintData().GetPaperSize() ) ;
+ ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->TransferTo( &m_pageSetupData ) ;
+ }
+ return result;