fixed encoding handling in ANSI mode

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

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index 51a22db84f81fba3bec0e78d3c125fff67779282..1b18c1d49b4131880ebc962c05fc73cda4eb3ed9 100644 (file)
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -18,6 +18,16 @@
 #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
 
 // Use generic page setup dialog: use your own native one if one exists.
 
@@ -61,8 +71,10 @@ bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
 
 wxPrintDialog::~wxPrintDialog()
 {
-    if (m_destroyDC && m_printerDC)
+    if (m_destroyDC && m_printerDC) {
         delete m_printerDC;
+        m_printerDC = NULL;
+    }
 }
 
 int wxPrintDialog::ShowModal()
@@ -72,7 +84,7 @@ int wxPrintDialog::ShowModal()
        wxString message ;
 
 #if !TARGET_CARBON     
-       err = ::UMAPrOpen() ;
+       err = ::UMAPrOpen(NULL) ;
        if ( err == noErr )
        {
                m_printDialogData.ConvertToNative() ;
@@ -89,14 +101,11 @@ int wxPrintDialog::ShowModal()
                wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
        }
-       ::UMAPrClose() ;
+       ::UMAPrClose(NULL) ;
 #else
   #if PM_USE_SESSION_APIS
-    PMPrintSession macPrintSession = kPMNoReference;
     Boolean        accepted;
     
-    err = ::UMAPrOpen(&macPrintSession) ;
-    if ( err == noErr )
     {
         m_printDialogData.ConvertToNative() ;
         
@@ -111,13 +120,13 @@ int wxPrintDialog::ShowModal()
             if ((err == noErr) &&
                 (m_printDialogData.GetPrintData().m_macPageFormat != kPMNoPageFormat))
             {
-                err = PMSessionDefaultPageFormat((PMPrintSession)macPrintSession,
+                err = PMSessionDefaultPageFormat((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
                                                  (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat);
             }
         }
         else
         {
-            err = PMSessionValidatePageFormat((PMPrintSession)macPrintSession,
+            err = PMSessionValidatePageFormat((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
                                               (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat,
                                               kPMDontWantBoolean);
         }
@@ -133,13 +142,13 @@ int wxPrintDialog::ShowModal()
             if ((err == noErr) &&
                 (m_printDialogData.GetPrintData().m_macPrintSettings != kPMNoPrintSettings))
             {
-                err = PMSessionDefaultPrintSettings((PMPrintSession)macPrintSession,
+                err = PMSessionDefaultPrintSettings((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
                                                     (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings);
             }
         }
         else
         {
-            err = PMSessionValidatePrintSettings((PMPrintSession)macPrintSession,
+            err = PMSessionValidatePrintSettings((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
                                                  (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings,
                                                  kPMDontWantBoolean);
         }
@@ -153,7 +162,7 @@ int wxPrintDialog::ShowModal()
         //  Display the Print dialog.
         if (err == noErr)
         {
-            err = PMSessionPrintDialog((PMPrintSession)macPrintSession,
+            err = PMSessionPrintDialog((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
                                        (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings,
                                        (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat,
                                        &accepted);
@@ -174,7 +183,6 @@ int wxPrintDialog::ShowModal()
         wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
         dialog.ShowModal();
     }
-    ::UMAPrClose(&macPrintSession) ;
   #else
     #pragma warning "TODO: Printing for carbon without session apis"
   #endif
@@ -224,7 +232,7 @@ int wxPageSetupDialog::ShowModal()
        wxString message ;
 
 #if !TARGET_CARBON
-       err = ::UMAPrOpen() ;
+       err = ::UMAPrOpen(NULL) ;
        if ( err == noErr )
        {
                m_pageSetupData.ConvertToNative() ;
@@ -241,14 +249,11 @@ int wxPageSetupDialog::ShowModal()
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
        }
-       ::UMAPrClose() ;
+       ::UMAPrClose(NULL) ;
 #else
   #if PM_USE_SESSION_APIS
-    PMPrintSession macPrintSession = kPMNoReference;
     Boolean        accepted;
     
-    err = ::UMAPrOpen(&macPrintSession) ;
-    if ( err == noErr )
     {
         m_pageSetupData.ConvertToNative() ;
         
@@ -263,13 +268,13 @@ int wxPageSetupDialog::ShowModal()
             if ((err == noErr) &&
                 (m_pageSetupData.GetPrintData().m_macPageFormat != kPMNoPageFormat))
             {
-                err = PMSessionDefaultPageFormat((PMPrintSession)macPrintSession,
+                err = PMSessionDefaultPageFormat((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession,
                                                  (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat);
             }
         }
         else
         {
-            err = PMSessionValidatePageFormat((PMPrintSession)macPrintSession,
+            err = PMSessionValidatePageFormat((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession,
                                               (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat,
                                               kPMDontWantBoolean);
         }
@@ -277,7 +282,7 @@ int wxPageSetupDialog::ShowModal()
         //  Display the Page Setup dialog.
         if (err == noErr)
         {
-            err = PMSessionPageSetupDialog((PMPrintSession)macPrintSession,
+            err = PMSessionPageSetupDialog((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession,
                                            (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat,
                                            &accepted);
             if ((err == noErr) && !accepted)
@@ -300,7 +305,6 @@ int wxPageSetupDialog::ShowModal()
         wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
         dialog.ShowModal();
     }
-    ::UMAPrClose(&macPrintSession) ;
   #else
     #pragma warning "TODO: Printing for carbon without session apis"
   #endif