typo fixed: should be lpthread, not -lpthread in THREAD_OPTS

[wxWidgets.git] / src / mac / printdlg.cpp

diff --git a/src/mac/printdlg.cpp b/src/mac/printdlg.cpp
index 5fd25c56da379eb19f774b98aead95e3751994e2..adb620e76f4c602ef12da3f168ad81b07edba336 100644 (file)
--- a/src/mac/printdlg.cpp
+++ b/src/mac/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;