X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/962cbf2ee0ba655db3e6db00ade68b5f1e85ba1e..9b69526274b023fa1460b29a92bea8bf82e4703f:/src/mac/carbon/printdlg.cpp?ds=sidebyside

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index 5fd25c56da..adb620e76f 100644
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -18,6 +18,16 @@
 #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 <PMCore.h>
+#  endif
+#  include <PMApplication.h>
+#endif
 
 // Use generic page setup dialog: use your own native one if one exists.
 
@@ -72,11 +82,11 @@ int wxPrintDialog::ShowModal()
 	wxString message ;
 
 #if !TARGET_CARBON	
-	err = ::UMAPrOpen() ;
+	err = ::UMAPrOpen(NULL) ;
 	if ( err == noErr )
 	{
 		m_printDialogData.ConvertToNative() ;
-		if  ( ::PrJobDialog( (THPrint) m_printDialogData.GetPrintData().m_macPrintInfo ) )
+		if  ( ::PrJobDialog( (THPrint) m_printDialogData.GetPrintData().m_macPrintSettings ) )
 		{
 			m_printDialogData.ConvertFromNative() ;
 			result = wxID_OK ;
@@ -89,7 +99,7 @@ int wxPrintDialog::ShowModal()
 		wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
 		dialog.ShowModal();
 	}
-	::UMAPrClose() ;
+	::UMAPrClose(NULL) ;
 #else
   #if PM_USE_SESSION_APIS
     PMPrintSession macPrintSession = kPMNoReference;
@@ -224,11 +234,11 @@ int wxPageSetupDialog::ShowModal()
 	wxString message ;
 
 #if !TARGET_CARBON
-	err = ::UMAPrOpen() ;
+	err = ::UMAPrOpen(NULL) ;
 	if ( err == noErr )
 	{
 		m_pageSetupData.ConvertToNative() ;
-		if  ( ::PrStlDialog(  (THPrint) m_pageSetupData.GetPrintData().m_macPrintInfo ) )
+		if  ( ::PrStlDialog(  (THPrint) m_pageSetupData.GetPrintData().m_macPrintSettings ) )
 		{
 			m_pageSetupData.ConvertFromNative() ;
 			result = wxID_OK ;
@@ -241,7 +251,7 @@ int wxPageSetupDialog::ShowModal()
 		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
 		dialog.ShowModal();
 	}
-	::UMAPrClose() ;
+	::UMAPrClose(NULL) ;
 #else
   #if PM_USE_SESSION_APIS
     PMPrintSession macPrintSession = kPMNoReference;