respect styles during creation as well

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

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index a5c41e0737c7f70706688537975e782ce4109a90..49781be89ecf8a26122f9e5460bc2996fbfa2e24 100644 (file)
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -1,165 +1,191 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printdlg.cpp
 // Purpose:     wxPrintDialog, wxPageSetupDialog
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printdlg.cpp
 // Purpose:     wxPrintDialog, wxPageSetupDialog

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "printdlg.h"
 #endif
 
 #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/dcprint.h"

-#include "wx/mac/uma.h"
+#include "wx/msgdlg.h"
+#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 )
         data2 = *data;
 {
     wxPrintDialogData data2;
     if ( data )
         data2 = *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_destroyDC = TRUE;
 {
     m_dialogParent = p;
     m_printerDC = NULL;
     m_destroyDC = TRUE;

-
+    

     if ( data )
         m_printDialogData = *data;
     if ( data )
         m_printDialogData = *data;

-
+    

     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
 {

-    if (m_destroyDC && m_printerDC)
+    if (m_destroyDC && m_printerDC) {

         delete m_printerDC;
         delete m_printerDC;

+        m_printerDC = NULL;
+    }

 }
 
 }
 

-int wxPrintDialog::ShowModal()
+int wxMacPrintDialog::ShowModal()

 {
 {

-       int result = wxID_CANCEL ;
-       #if !TARGET_CARBON
-       
-       OSErr err ;
-       wxString message ;
-       ::UMAPrOpen() ;
-       err = PrError() ;
-       
-       if ( !err )
-       {
-               m_printDialogData.ConvertToNative() ;
-               if  ( ::PrJobDialog( m_printDialogData.GetPrintData().m_macPrintInfo ) )
-               {
-                       m_printDialogData.ConvertFromNative() ;
-                       result = wxID_OK ;
-               }
-
-       }
-       else
-       {
-               message.Printf( "Print Error %d", err ) ;
-               wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
-       }
-       ::UMAPrClose() ;
-       #else
-       #pragma warning "TODO:Printing for carbon"
-       #endif
-       return result ;
+    m_printDialogData.GetPrintData().ConvertToNative();
+    ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferFrom( &m_printDialogData ) ;
+    
+    int result = wxID_CANCEL ;
+    OSErr err = noErr ;
+    wxString message ;
+    
+    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 )
+    {
+        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();
+    }
+
+    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() ) ;
 }
 
 /*
 {
     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;

-
+    

     if (data)
         m_pageSetupData = (*data);
     if (data)
         m_pageSetupData = (*data);

-
+    

     return TRUE;
 }
 
     return TRUE;
 }
 

-wxPageSetupDialog::~wxPageSetupDialog()
+wxMacPageSetupDialog::~wxMacPageSetupDialog()

 {
 }
 
 {
 }
 

-int wxPageSetupDialog::ShowModal()
+wxPageSetupData& wxMacPageSetupDialog::GetPageSetupDialogData()
+{ 
+    return m_pageSetupData;
+}
+
+int wxMacPageSetupDialog::ShowModal()

 {
 {

-       int result = wxID_CANCEL ;
-#if !TARGET_CARBON
-
-       OSErr err ;
-       wxString message ;
-       ::UMAPrOpen() ;
-       err = PrError() ;
-       
-       if ( !err )
-       {
-               m_pageSetupData.ConvertToNative() ;
-               if  ( ::PrStlDialog( m_pageSetupData.GetPrintData().m_macPrintInfo ) )
-               {
-                       m_pageSetupData.ConvertFromNative() ;
-                       result = wxID_OK ;
-               }
-
-       }
-       else
-       {
-               message.Printf( "Print Error %d", err ) ;
-               wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-       }
-       ::UMAPrClose() ;
-#else
-#pragma warning "TODO:printing for carbon"
-#endif
-       return result ;
+    m_pageSetupData.GetPrintData().ConvertToNative();
+    ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->TransferFrom( &m_pageSetupData ) ;
+
+    int      result = wxID_CANCEL ;
+    OSErr    err = noErr ;
+    wxString message ;
+    
+    Boolean        accepted;
+
+    err = PMSessionPageSetupDialog( ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->m_macPrintSession,
+        ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->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) 
+    {
+        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();
+    }
+
+    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
+