X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfb00da4c4cdcd7292a6021441f858ddc1cd2818..e795e8b56f213f97745636a017609091746894a0:/src/mac/carbon/printdlg.cpp

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index e7eadd76b7..f3ae94abef 100644
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -9,46 +9,34 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "printdlg.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/object.h"
 #include "wx/printdlg.h"
+#include "wx/mac/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.
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog)
-IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxMacPrintDialog, wxPrintDialogBase)
 
-wxPrintDialog::wxPrintDialog()
+wxMacPrintDialog::wxMacPrintDialog()
 {
     m_dialogParent = NULL;
     m_printerDC = NULL;
     m_destroyDC = TRUE;
 }
 
-wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintDialogData* data)
+wxMacPrintDialog::wxMacPrintDialog(wxWindow *p, wxPrintDialogData* data)
 {
     Create(p, data);
 }
 
-wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data)
+wxMacPrintDialog::wxMacPrintDialog(wxWindow *p, wxPrintData* data)
 {
     wxPrintDialogData data2;
     if ( data )
@@ -57,7 +45,7 @@ wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data)
     Create(p, &data2);
 }
 
-bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
+bool wxMacPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
 {
     m_dialogParent = p;
     m_printerDC = NULL;
@@ -69,7 +57,7 @@ bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
     return TRUE;
 }
 
-wxPrintDialog::~wxPrintDialog()
+wxMacPrintDialog::~wxMacPrintDialog()
 {
     if (m_destroyDC && m_printerDC) {
         delete m_printerDC;
@@ -77,90 +65,65 @@ wxPrintDialog::~wxPrintDialog()
     }
 }
 
-int wxPrintDialog::ShowModal()
+int wxMacPrintDialog::ShowModal()
 {
+    m_printDialogData.GetPrintData().ConvertToNative();
+    ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferFrom( &m_printDialogData ) ;
+    
     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;
     
+    err = PMSessionPrintDialog( ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPrintSession,
+        ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPrintSettings,
+        ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPageFormat,
+        &accepted);
+    if ((err == noErr) && !accepted)
+    {
+        err = kPMCancel; // user clicked Cancel button
+    }
+
+    if  ( err == noErr )
     {
-        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 ;
-        }
+        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
+
+    if ( result == wxID_OK )
+    {
+        m_printDialogData.GetPrintData().ConvertFromNative();
+        ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferTo( &m_printDialogData ) ;
+    }
+    
     return result ;
 }
 
-wxDC *wxPrintDialog::GetPrintDC()
+wxDC *wxMacPrintDialog::GetPrintDC()
 {
     return new wxPrinterDC( m_printDialogData.GetPrintData() ) ;
 }
 
 /*
-* wxPageSetupDialog
+* wxMacPageSetupDialog
 */
 
-wxPageSetupDialog::wxPageSetupDialog():
-wxDialog()
-{
-    m_dialogParent = NULL;
-}
+IMPLEMENT_CLASS(wxMacPageSetupDialog, wxPageSetupDialogBase)
 
-wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data):
-wxDialog()
+wxMacPageSetupDialog::wxMacPageSetupDialog(wxWindow *p, wxPageSetupDialogData *data) :
+wxPageSetupDialogBase()
 {
     Create(p, data);
 }
 
-bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data)
+bool wxMacPageSetupDialog::Create(wxWindow *p, wxPageSetupDialogData *data)
 {
     m_dialogParent = p;
     
@@ -170,60 +133,39 @@ bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data)
     return TRUE;
 }
 
-wxPageSetupDialog::~wxPageSetupDialog()
+wxMacPageSetupDialog::~wxMacPageSetupDialog()
 {
 }
 
-int wxPageSetupDialog::ShowModal()
+wxPageSetupData& wxMacPageSetupDialog::GetPageSetupDialogData()
+{ 
+    return m_pageSetupData;
+}
+
+int wxMacPageSetupDialog::ShowModal()
 {
+    m_pageSetupData.GetPrintData().ConvertToNative();
+    ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->TransferFrom( &m_pageSetupData ) ;
+
     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
+    Boolean        accepted;
+
+    err = PMSessionPageSetupDialog( ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->m_macPrintSession,
+        ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->m_macPageFormat,
+        &accepted);
+    if ((err == noErr) && !accepted)
     {
-        message.Printf( wxT("Print Error %d"), err ) ;
-        wxMessageDialog dialog( NULL , message , wxEmptyString , wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
+        err = kPMCancel; // user clicked Cancel button
     }
-    ::UMAPrClose(NULL) ;
-#else
-#if PM_USE_SESSION_APIS
-    Boolean        accepted;
+
+    //  If the user did not cancel, flatten and save the PageFormat object
+    //  with our document.
+    if (err == noErr) 
     {
-        m_pageSetupData.ConvertToNative() ;
-        
-        //  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 ;
-        }
+        result = wxID_OK ;
     }
     if ((err != noErr) && (err != kPMCancel))
     {
@@ -231,10 +173,15 @@ int wxPageSetupDialog::ShowModal()
         wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
         dialog.ShowModal();
     }
-#else
-#pragma warning "TODO: Printing for carbon without session apis"
-#endif
-#endif
-    return result ;
+
+    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;
 }
 
+#endif
+