added direct HICommand updating

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

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index 8f59b0d2e3137b15a565fa9437046fbf582fdb15..20bf8dedc71dae5aaa4148ff94a26d7f2a5a26d5 100644 (file)
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -18,6 +18,9 @@
 #include "wx/dcprint.h"
 #include "wx/msgdlg.h"
 #include "wx/mac/uma.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
 
 #if defined(TARGET_CARBON) && !defined(__DARWIN__)
 #  if PM_USE_SESSION_APIS


@@ -50,7 +53,7 @@ wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data)
     wxPrintDialogData data2;
     if ( data )
         data2 = *data;
     wxPrintDialogData data2;
     if ( data )
         data2 = *data;

-
+    

     Create(p, &data2);
 }
 
     Create(p, &data2);
 }
 


@@ -59,51 +62,50 @@ bool wxPrintDialog::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;
 }
 
 wxPrintDialog::~wxPrintDialog()
 {
     return TRUE;
 }
 
 wxPrintDialog::~wxPrintDialog()
 {

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

         delete m_printerDC;
         delete m_printerDC;

+        m_printerDC = NULL;
+    }

 }
 
 int wxPrintDialog::ShowModal()
 {
 }
 
 int wxPrintDialog::ShowModal()
 {

-       int result = wxID_CANCEL ;
-       OSErr err ;
-       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) ;
+    int result = wxID_CANCEL ;
+    OSErr err ;
+    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
 #else

-  #if PM_USE_SESSION_APIS
-    PMPrintSession macPrintSession = kPMNoReference;
+#if PM_USE_SESSION_APIS

     Boolean        accepted;
     
     Boolean        accepted;
     

-    err = ::UMAPrOpen(&macPrintSession) ;
-    if ( err == noErr )

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


@@ -118,17 +120,17 @@ int wxPrintDialog::ShowModal()
             if ((err == noErr) &&
                 (m_printDialogData.GetPrintData().m_macPageFormat != kPMNoPageFormat))
             {
             if ((err == noErr) &&
                 (m_printDialogData.GetPrintData().m_macPageFormat != kPMNoPageFormat))
             {

-                err = PMSessionDefaultPageFormat((PMPrintSession)macPrintSession,
-                                                 (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat);
+                err = PMSessionDefaultPageFormat((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
+                    (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat);

             }
         }
         else
         {
             }
         }
         else
         {

-            err = PMSessionValidatePageFormat((PMPrintSession)macPrintSession,
-                                              (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat,
-                                              kPMDontWantBoolean);
+            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)
         {
         //  Set up a valid PrintSettings object.
         if (m_printDialogData.GetPrintData().m_macPrintSettings == kPMNoPrintSettings)
         {


@@ -140,15 +142,15 @@ int wxPrintDialog::ShowModal()
             if ((err == noErr) &&
                 (m_printDialogData.GetPrintData().m_macPrintSettings != kPMNoPrintSettings))
             {
             if ((err == noErr) &&
                 (m_printDialogData.GetPrintData().m_macPrintSettings != kPMNoPrintSettings))
             {

-                err = PMSessionDefaultPrintSettings((PMPrintSession)macPrintSession,
-                                                    (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings);
+                err = PMSessionDefaultPrintSettings((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
+                    (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings);

             }
         }
         else
         {
             }
         }
         else
         {

-            err = PMSessionValidatePrintSettings((PMPrintSession)macPrintSession,
-                                                 (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings,
-                                                 kPMDontWantBoolean);
+            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)
         }
         //  Set a valid page range before displaying the Print dialog
         if (err == noErr)


@@ -160,10 +162,10 @@ int wxPrintDialog::ShowModal()
         //  Display the Print dialog.
         if (err == noErr)
         {
         //  Display the Print dialog.
         if (err == noErr)
         {

-            err = PMSessionPrintDialog((PMPrintSession)macPrintSession,
-                                       (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings,
-                                       (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat,
-                                       &accepted);
+            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) && !accepted)
             {
                 err = kPMCancel; // user clicked Cancel button


@@ -177,16 +179,15 @@ int wxPrintDialog::ShowModal()
     }
     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();
     }

-    ::UMAPrClose(&macPrintSession) ;
-  #else
-    #pragma warning "TODO: Printing for carbon without session apis"
-  #endif
+#else
+#pragma warning "TODO: Printing for carbon without session apis"
+#endif

 #endif
 #endif

-       return result ;
+    return result ;

 }
 
 wxDC *wxPrintDialog::GetPrintDC()
 }
 
 wxDC *wxPrintDialog::GetPrintDC()


@@ -195,17 +196,17 @@ wxDC *wxPrintDialog::GetPrintDC()
 }
 
 /*
 }
 
 /*

- * wxPageSetupDialog
- */
+* wxPageSetupDialog
+*/

 
 wxPageSetupDialog::wxPageSetupDialog():
 
 wxPageSetupDialog::wxPageSetupDialog():

- wxDialog()
+wxDialog()

 {
 {

-  m_dialogParent = NULL;
+    m_dialogParent = NULL;

 }
 
 wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data):
 }
 
 wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data):

- wxDialog()
+wxDialog()

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


@@ -213,10 +214,10 @@ wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data):
 bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data)
 {
     m_dialogParent = p;
 bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data)
 {
     m_dialogParent = p;

-
+    

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

-
+    

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -226,36 +227,33 @@ wxPageSetupDialog::~wxPageSetupDialog()
 
 int wxPageSetupDialog::ShowModal()
 {
 
 int wxPageSetupDialog::ShowModal()
 {

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

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

-  #if PM_USE_SESSION_APIS
-    PMPrintSession macPrintSession = kPMNoReference;
+#if PM_USE_SESSION_APIS

     Boolean        accepted;
     
     Boolean        accepted;
     

-    err = ::UMAPrOpen(&macPrintSession) ;
-    if ( err == noErr )

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


@@ -270,23 +268,23 @@ int wxPageSetupDialog::ShowModal()
             if ((err == noErr) &&
                 (m_pageSetupData.GetPrintData().m_macPageFormat != kPMNoPageFormat))
             {
             if ((err == noErr) &&
                 (m_pageSetupData.GetPrintData().m_macPageFormat != kPMNoPageFormat))
             {

-                err = PMSessionDefaultPageFormat((PMPrintSession)macPrintSession,
-                                                 (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat);
+                err = PMSessionDefaultPageFormat((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession,
+                    (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat);

             }
         }
         else
         {
             }
         }
         else
         {

-            err = PMSessionValidatePageFormat((PMPrintSession)macPrintSession,
-                                              (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat,
-                                              kPMDontWantBoolean);
+            err = PMSessionValidatePageFormat((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession,
+                (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat,
+                kPMDontWantBoolean);

         }
         
         //  Display the Page Setup dialog.
         if (err == noErr)
         {
         }
         
         //  Display the Page Setup dialog.
         if (err == noErr)
         {

-            err = PMSessionPageSetupDialog((PMPrintSession)macPrintSession,
-                                           (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat,
-                                           &accepted);
+            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 ((err == noErr) && !accepted)
             {
                 err = kPMCancel; // user clicked Cancel button


@@ -303,15 +301,14 @@ int wxPageSetupDialog::ShowModal()
     }
     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();
     }

-    ::UMAPrClose(&macPrintSession) ;
-  #else
-    #pragma warning "TODO: Printing for carbon without session apis"
-  #endif
+#else
+#pragma warning "TODO: Printing for carbon without session apis"
+#endif

 #endif
 #endif

-       return result ;
+    return result ;

 }
 
 }