temporary fix for carbon (problems under OS 9)

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

diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index 20ea4968011c5db61d417ca3c776a7b1c3d77f54..b7e23a7ac85c3ca973bf0314adb28db08e8b8577 100644 (file)
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:       wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -144,7 +144,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
     if (!win)
     {
         wxEndBusyCursor();
-        wxMessageBox("Sorry, could not create an abort dialog.", "Print Error", wxOK, parent);
+        wxMessageBox(wxT("Sorry, could not create an abort dialog."), wxT("Print Error"), wxOK, parent);
         delete dc;
         return FALSE;
     }
@@ -162,7 +162,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
         if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
         {
             wxEndBusyCursor();
-            wxMessageBox("Could not start printing.", "Print Error", wxOK, parent);
+            wxMessageBox(wxT("Could not start printing."), wxT("Print Error"), wxOK, parent);
             break;
         }
         if (sm_abortIt)
@@ -179,11 +179,12 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
             }
             else
             {
+#if !TARGET_CARBON
                 GrafPtr thePort ;
                 GetPort( &thePort ) ;
                 wxSafeYield(win,true);
                 SetPort( thePort ) ;
-                
+#endif                
                 dc->StartPage();
                 keepGoing = printout->OnPrintPage(pn);
                 dc->EndPage();