fix for preserving the clip rgn (control redraws missing after switch to faster redra...

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

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index e7eadd76b71ecbd797c9a4c4b51eaa4045894e41..89f2789250c8d9f300fe459544eb2cb0f546a090 100644 (file)
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -17,17 +17,7 @@
 #include "wx/printdlg.h"
 #include "wx/dcprint.h"
 #include "wx/msgdlg.h"
 #include "wx/printdlg.h"
 #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
+#include "wx/mac/private/print.h"

 
 // Use generic page setup dialog: use your own native one if one exists.
 
 
 // Use generic page setup dialog: use your own native one if one exists.
 


@@ -79,63 +69,11 @@ wxPrintDialog::~wxPrintDialog()
 
 int wxPrintDialog::ShowModal()
 {
 
 int wxPrintDialog::ShowModal()
 {

-    int result = wxID_CANCEL ;
-    OSErr err = noErr ;
-    wxString message ;
-    
-#if !TARGET_CARBON    
-    err = ::UMAPrOpen(NULL) ;
-    if ( err == noErr )
-    {
-        m_printDialogData.ConvertToNative() ;
-        if  ( ::PrJobDialog( (THPrint) m_printDialogData.GetPrintData().m_macPrintSettings ) )
-        {
-            m_printDialogData.ConvertFromNative() ;
-            result = wxID_OK ;
-        }
-        
-    }
-    else
-    {
-        message.Printf( wxT("Print Error %d"), err ) ;
-        wxMessageDialog dialog( NULL , message  , wxT(""), wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
-    }
-    ::UMAPrClose(NULL) ;
-#else
-#if PM_USE_SESSION_APIS
-    Boolean        accepted;
+    m_printDialogData.ConvertToNative() ;
+    int result = m_printDialogData.GetPrintData().m_nativePrintData->ShowPrintDialog() ;
+    if ( result == wxID_OK )
+        m_printDialogData.ConvertFromNative() ;

     
     

-    {
-        m_printDialogData.ConvertToNative() ;
-        //  Display the Print dialog.
-        if (err == noErr)
-        {
-            err = PMSessionPrintDialog((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
-                (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings,
-                (PMPageFormat)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( wxT("Print Error %d"), err ) ;
-        wxMessageDialog dialog( NULL , message  , wxEmptyString, wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
-    }
-#else
-#pragma warning "TODO: Printing for carbon without session apis"
-#endif
-#endif

     return result ;
 }
 
     return result ;
 }
 


@@ -176,65 +114,11 @@ wxPageSetupDialog::~wxPageSetupDialog()
 
 int wxPageSetupDialog::ShowModal()
 {
 
 int wxPageSetupDialog::ShowModal()
 {

-    int      result = wxID_CANCEL ;
-    OSErr    err = noErr ;
-    wxString message ;
-    
-#if !TARGET_CARBON
-    err = ::UMAPrOpen(NULL) ;
-    if ( err == noErr )
-    {
-        m_pageSetupData.ConvertToNative() ;
-        if  ( ::PrStlDialog(  (THPrint) m_pageSetupData.GetPrintData().m_macPrintSettings ) )
-        {
-            m_pageSetupData.ConvertFromNative() ;
-            result = wxID_OK ;
-        }
-        
-    }
-    else
-    {
-        message.Printf( wxT("Print Error %d"), err ) ;
-        wxMessageDialog dialog( NULL , message , wxEmptyString , wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
-    }
-    ::UMAPrClose(NULL) ;
-#else
-#if PM_USE_SESSION_APIS
-    Boolean        accepted;
-    {
-        m_pageSetupData.ConvertToNative() ;
+    m_pageSetupData.ConvertToNative() ;
+    int result = m_pageSetupData.GetPrintData().m_nativePrintData->ShowPageSetupDialog() ;
+    if (result == wxID_OK )
+        m_pageSetupData.ConvertFromNative() ;

         
         

-        //  Display the Page Setup dialog.
-        if (err == noErr)
-        {
-            err = PMSessionPageSetupDialog((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession,
-                (PMPageFormat)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( wxT("Print Error %d"), err ) ;
-        wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
-    }
-#else
-#pragma warning "TODO: Printing for carbon without session apis"
-#endif
-#endif

     return result ;
 }
 
     return result ;
 }