just added a comment

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

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index 779ee74edd7a2c27ba1d09366e982bbb660df3cb..f3ae94abefb3a25a7eba9d954376c81bf2c7dd56 100644 (file)
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -9,46 +9,34 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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/object.h"
 #include "wx/printdlg.h"

+#include "wx/mac/printdlg.h"

 #include "wx/dcprint.h"
 #include "wx/msgdlg.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.
 

-#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;
 }
 
 {
     m_dialogParent = NULL;
     m_printerDC = NULL;
     m_destroyDC = TRUE;
 }
 

-wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintDialogData* data)
+wxMacPrintDialog::wxMacPrintDialog(wxWindow *p, wxPrintDialogData* data)

 {
     Create(p, data);
 }
 
 {
     Create(p, data);
 }
 

-wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data)
+wxMacPrintDialog::wxMacPrintDialog(wxWindow *p, wxPrintData* data)

 {
     wxPrintDialogData data2;
     if ( data )
 {
     wxPrintDialogData data2;
     if ( data )


@@ -57,7 +45,7 @@ wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data)
     Create(p, &data2);
 }
 
     Create(p, &data2);
 }
 

-bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
+bool wxMacPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)

 {
     m_dialogParent = p;
     m_printerDC = NULL;
 {
     m_dialogParent = p;
     m_printerDC = NULL;


@@ -69,7 +57,7 @@ bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
     return TRUE;
 }
 
     return TRUE;
 }
 

-wxPrintDialog::~wxPrintDialog()
+wxMacPrintDialog::~wxMacPrintDialog()

 {
     if (m_destroyDC && m_printerDC) {
         delete m_printerDC;
 {
     if (m_destroyDC && m_printerDC) {
         delete m_printerDC;


@@ -77,141 +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 ;
     int result = wxID_CANCEL ;

-    OSErr err ;
+    OSErr err = noErr ;

     wxString message ;
     
     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( "Print Error %d", err ) ;
-        wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
-    }
-    ::UMAPrClose(NULL) ;
-#else
-#if PM_USE_SESSION_APIS

     Boolean        accepted;
     
     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() ;
-        
-        //  Set up a valid PageFormat object.
-        if (m_printDialogData.GetPrintData().m_macPageFormat == kPMNoPageFormat)
-        {
-            err = PMCreatePageFormat((PMPageFormat *)&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((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
-                    (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat);
-            }
-        }
-        else
-        {
-            err = PMSessionValidatePageFormat((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
-                (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat,
-                kPMDontWantBoolean);
-        }
-        
-        //  Set up a valid PrintSettings object.
-        if (m_printDialogData.GetPrintData().m_macPrintSettings == kPMNoPrintSettings)
-        {
-            err = PMCreatePrintSettings((PMPrintSettings *)&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((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
-                    (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings);
-            }
-        }
-        else
-        {
-            err = PMSessionValidatePrintSettings((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
-                (PMPrintSettings)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((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))
     {
     if ((err != noErr) && (err != kPMCancel))
     {

-        message.Printf( "Print Error %d", err ) ;
-        wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
+        message.Printf( wxT("Print Error %d"), err ) ;
+        wxMessageDialog dialog( NULL , message  , wxEmptyString, wxICON_HAND | wxOK) ;

         dialog.ShowModal();
     }
         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 ;
 }
 
     return result ;
 }
 

-wxDC *wxPrintDialog::GetPrintDC()
+wxDC *wxMacPrintDialog::GetPrintDC()

 {
     return new wxPrinterDC( m_printDialogData.GetPrintData() ) ;
 }
 
 /*
 {
     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);
 }
 
 {
     Create(p, data);
 }
 

-bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data)
+bool wxMacPageSetupDialog::Create(wxWindow *p, wxPageSetupDialogData *data)

 {
     m_dialogParent = p;
     
 {
     m_dialogParent = p;
     


@@ -221,94 +133,55 @@ bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data)
     return TRUE;
 }
 
     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 ;
     int      result = wxID_CANCEL ;

-    OSErr    err ;
+    OSErr    err = noErr ;

     wxString message ;
     
     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( "Print Error %d", err ) ;
-        wxMessageDialog dialog( NULL , message , "", 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() ;
-        
-        //  Set up a valid PageFormat object.
-        if (m_pageSetupData.GetPrintData().m_macPageFormat == kPMNoPageFormat)
-        {
-            err = PMCreatePageFormat((PMPageFormat *)&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((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession,
-                    (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat);
-            }
-        }
-        else
-        {
-            err = PMSessionValidatePageFormat((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession,
-                (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat,
-                kPMDontWantBoolean);
-        }
-        
-        //  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))
     {
     }
     if ((err != noErr) && (err != kPMCancel))
     {

-        message.Printf( "Print Error %d", err ) ;
-        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+        message.Printf( wxT("Print Error %d"), err ) ;
+        wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;

         dialog.ShowModal();
     }
         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
+