added generic color dialog to setup

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

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index 5f914ddbfd90632dd3091071bfd7831794f984a0..ffe0ba15bab6d6b9f3b19d9ae03ae246b899756a 100644 (file)
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -16,6 +16,8 @@
 #include "wx/object.h"
 #include "wx/printdlg.h"
 #include "wx/dcprint.h"
 #include "wx/object.h"
 #include "wx/printdlg.h"
 #include "wx/dcprint.h"

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


@@ -68,13 +70,13 @@ int wxPrintDialog::ShowModal()
        int result = wxID_CANCEL ;
        OSErr err ;
        wxString message ;
        int result = wxID_CANCEL ;
        OSErr err ;
        wxString message ;

-       ::PrOpen() ;
-       err = PrError() ;
-       
-       if ( !err )
+
+#if !TARGET_CARBON     
+       err = ::UMAPrOpen() ;
+       if ( err == noErr )

        {
                m_printDialogData.ConvertToNative() ;
        {
                m_printDialogData.ConvertToNative() ;

-               if  ( m_printDialogData.m_macPrintInfo && ::PrJobDialog( m_printDialogData.m_macPrintInfo ) )
+               if  ( ::PrJobDialog( m_printDialogData.GetPrintData().m_macPrintInfo ) )

                {
                        m_printDialogData.ConvertFromNative() ;
                        result = wxID_OK ;
                {
                        m_printDialogData.ConvertFromNative() ;
                        result = wxID_OK ;


@@ -85,9 +87,98 @@ int wxPrintDialog::ShowModal()
        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;

+               dialog.ShowModal();

        }
        }

-       ::PrClose() ;
+       ::UMAPrClose() ;
+#else
+  #if PM_USE_SESSION_APIS
+    PMPrintSession macPrintSession = kPMNoReference;
+    Boolean        accepted;
+    
+       err = ::UMAPrOpen(&macPrintSession) ;
+       if ( err == noErr )
+       {
+               m_printDialogData.ConvertToNative() ;
+               
+               //  Set up a valid PageFormat object.
+               if (m_printDialogData.GetPrintData().m_macPageFormat == kPMNoPageFormat)
+               {
+               err = PMCreatePageFormat(&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(macPrintSession,
+                               m_printDialogData.GetPrintData().m_macPageFormat);
+               }
+               }
+               else
+               {
+               err = PMSessionValidatePageFormat(macPrintSession,
+                       m_printDialogData.GetPrintData().m_macPageFormat,
+                       kPMDontWantBoolean);
+               }
+       
+               //  Set up a valid PrintSettings object.
+               if (m_printDialogData.GetPrintData().m_macPrintSettings == kPMNoPrintSettings)
+               {
+               err = PMCreatePrintSettings(&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(macPrintSession,
+                         m_printDialogData.GetPrintData().m_macPrintSettings);
+               }
+               }
+               else
+               {
+               err = PMSessionValidatePrintSettings(macPrintSession,
+                       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(macPrintSession,
+                       m_printDialogData.GetPrintData().m_macPrintSettings,
+                       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( "Print Error %d", err ) ;
+               wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
+               dialog.ShowModal();
+       }
+       ::UMAPrClose(&macPrintSession) ;
+  #else
+    #pragma warning "TODO: Printing for carbon without session apis"
+  #endif
+#endif

        return result ;
 }
 
        return result ;
 }
 


@@ -128,16 +219,16 @@ wxPageSetupDialog::~wxPageSetupDialog()
 
 int wxPageSetupDialog::ShowModal()
 {
 
 int wxPageSetupDialog::ShowModal()
 {

-       int result = wxID_CANCEL ;
-       OSErr err ;
+       int      result = wxID_CANCEL ;
+       OSErr    err ;

        wxString message ;
        wxString message ;

-       ::PrOpen() ;
-       err = PrError() ;
-       
-       if ( !err )
+
+#if !TARGET_CARBON
+       err = ::UMAPrOpen() ;
+       if ( err == noErr )

        {
                m_pageSetupData.ConvertToNative() ;
        {
                m_pageSetupData.ConvertToNative() ;

-               if  ( m_pageSetupData.m_macPageSetupInfo && ::PrStlDialog( m_pageSetupData.m_macPageSetupInfo ) )
+               if  ( ::PrStlDialog( m_pageSetupData.GetPrintData().m_macPrintInfo ) )

                {
                        m_pageSetupData.ConvertFromNative() ;
                        result = wxID_OK ;
                {
                        m_pageSetupData.ConvertFromNative() ;
                        result = wxID_OK ;


@@ -148,9 +239,72 @@ int wxPageSetupDialog::ShowModal()
        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;

+               dialog.ShowModal();

        }
        }

-       ::PrClose() ;
+       ::UMAPrClose() ;
+#else
+  #if PM_USE_SESSION_APIS
+    PMPrintSession macPrintSession = kPMNoReference;
+    Boolean        accepted;
+    
+       err = ::UMAPrOpen(&macPrintSession) ;
+       if ( err == noErr )
+       {
+               m_pageSetupData.ConvertToNative() ;
+
+               //  Set up a valid PageFormat object.
+               if (m_pageSetupData.GetPrintData().m_macPageFormat == kPMNoPageFormat)
+               {
+               err = PMCreatePageFormat(&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(macPrintSession,
+                               m_pageSetupData.GetPrintData().m_macPageFormat);
+               }
+               }
+               else
+               {
+               err = PMSessionValidatePageFormat(macPrintSession,
+                       m_pageSetupData.GetPrintData().m_macPageFormat,
+                       kPMDontWantBoolean);
+               }

 
 

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

        return result ;
 }
 
        return result ;
 }