X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..780bb8744b5a9d9492831f0bd338251aa4641c56:/src/mac/printdlg.cpp

diff --git a/src/mac/printdlg.cpp b/src/mac/printdlg.cpp
index 88f6d70b58..ffe0ba15ba 100644
--- a/src/mac/printdlg.cpp
+++ b/src/mac/printdlg.cpp
@@ -16,6 +16,7 @@
 #include "wx/object.h"
 #include "wx/printdlg.h"
 #include "wx/dcprint.h"
+#include "wx/msgdlg.h"
 #include "wx/mac/uma.h"
 
 // Use generic page setup dialog: use your own native one if one exists.
@@ -67,14 +68,12 @@ wxPrintDialog::~wxPrintDialog()
 int wxPrintDialog::ShowModal()
 {
 	int result = wxID_CANCEL ;
-#if !TARGET_CARBON
-	
 	OSErr err ;
 	wxString message ;
-	::UMAPrOpen() ;
-	err = PrError() ;
-	
-	if ( !err )
+
+#if !TARGET_CARBON	
+	err = ::UMAPrOpen() ;
+	if ( err == noErr )
 	{
 		m_printDialogData.ConvertToNative() ;
 		if  ( ::PrJobDialog( m_printDialogData.GetPrintData().m_macPrintInfo ) )
@@ -88,13 +87,96 @@ int wxPrintDialog::ShowModal()
 	{
 		message.Printf( "Print Error %d", err ) ;
 		wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
+		dialog.ShowModal();
 	}
 	::UMAPrClose() ;
 #else
-  #if __UNIX__
-    #warning "TODO:Printing for carbon"
+  #if PM_USE_SESSION_APIS
+    PMPrintSession macPrintSession = kPMNoReference;
+    Boolean        accepted;
+    
+	err = ::UMAPrOpen(&macPrintSession) ;
+	if ( err == noErr )
+	{
+		m_printDialogData.ConvertToNative() ;
+		
+		//  Set up a valid PageFormat object.
+		if (m_printDialogData.GetPrintData().m_macPageFormat == kPMNoPageFormat)
+		{
+	    	err = PMCreatePageFormat(&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(macPrintSession,
+	            	  	m_printDialogData.GetPrintData().m_macPageFormat);
+	    	}
+		}
+		else
+		{
+	    	err = PMSessionValidatePageFormat(macPrintSession,
+	              	m_printDialogData.GetPrintData().m_macPageFormat,
+	              	kPMDontWantBoolean);
+		}
+	
+		//  Set up a valid PrintSettings object.
+		if (m_printDialogData.GetPrintData().m_macPrintSettings == kPMNoPrintSettings)
+		{
+	    	err = PMCreatePrintSettings(&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(macPrintSession,
+	                  m_printDialogData.GetPrintData().m_macPrintSettings);
+	    	}
+		}
+		else
+		{
+	    	err = PMSessionValidatePrintSettings(macPrintSession,
+	              	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(macPrintSession,
+	              	m_printDialogData.GetPrintData().m_macPrintSettings,
+	              	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"
+    #pragma warning "TODO: Printing for carbon without session apis"
   #endif
 #endif
 	return result ;
@@ -137,15 +219,13 @@ wxPageSetupDialog::~wxPageSetupDialog()
 
 int wxPageSetupDialog::ShowModal()
 {
-	int result = wxID_CANCEL ;
-#if !TARGET_CARBON
-
-	OSErr err ;
+	int      result = wxID_CANCEL ;
+	OSErr    err ;
 	wxString message ;
-	::UMAPrOpen() ;
-	err = PrError() ;
-	
-	if ( !err )
+
+#if !TARGET_CARBON
+	err = ::UMAPrOpen() ;
+	if ( err == noErr )
 	{
 		m_pageSetupData.ConvertToNative() ;
 		if  ( ::PrStlDialog( m_pageSetupData.GetPrintData().m_macPrintInfo ) )
@@ -159,13 +239,70 @@ int wxPageSetupDialog::ShowModal()
 	{
 		message.Printf( "Print Error %d", err ) ;
 		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+		dialog.ShowModal();
 	}
 	::UMAPrClose() ;
 #else
-  #if __UNIX__
-    #warning "TODO:Printing for carbon"
+  #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(&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(macPrintSession,
+	            	  	m_pageSetupData.GetPrintData().m_macPageFormat);
+	    	}
+		}
+		else
+		{
+	    	err = PMSessionValidatePageFormat(macPrintSession,
+	              	m_pageSetupData.GetPrintData().m_macPageFormat,
+	              	kPMDontWantBoolean);
+		}
+
+		//  Display the Page Setup dialog.
+		if (err == noErr)
+		{
+	    	err = PMSessionPageSetupDialog(macPrintSession,
+	              	m_pageSetupData.GetPrintData().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) {
+		//    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"
+    #pragma warning "TODO: Printing for carbon without session apis"
   #endif
 #endif
 	return result ;