Menu label consistency changes

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

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index 2e822438347f4484c863e7f5118996373ee34cbe..93102ac2456f3f4c6f2e9be06ad66a298d046890 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -1,336 +1,409 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcprint.cpp
+// Name:        src/mac/carbon/dcprint.cpp

 // Purpose:     wxPrinterDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxPrinterDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:       wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma implementation "dcprint.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#include "wx/dcprint.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/msgdlg.h"
+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/dcprint.h"
-#include "wx/msgdlg.h"
-#include <math.h>

 #include "wx/mac/uma.h"
 #include "wx/mac/uma.h"

-#ifndef __DARWIN__
-#include "Printing.h"
+#include "wx/mac/private/print.h"
+#include "wx/graphics.h"
+
+IMPLEMENT_CLASS(wxPrinterDC, wxDC)
+
+class wxNativePrinterDC
+{
+public :
+    wxNativePrinterDC() {}
+    virtual ~wxNativePrinterDC() {}
+    virtual bool StartDoc(  wxPrinterDC* dc , const wxString& message ) = 0;
+    virtual void EndDoc( wxPrinterDC* dc ) = 0;
+    virtual void StartPage( wxPrinterDC* dc ) = 0;
+    virtual void EndPage( wxPrinterDC* dc ) = 0;
+    virtual void GetSize( int *w , int *h) const = 0 ;
+    virtual wxSize GetPPI() const = 0 ;
+
+    // returns 0 in case of no Error, otherwise platform specific error codes
+    virtual wxUint32 GetStatus() const = 0 ;
+    bool Ok() { return GetStatus() == 0 ; }
+
+    static wxNativePrinterDC* Create(wxPrintData* data) ;
+} ;
+
+class wxMacCarbonPrinterDC : public wxNativePrinterDC
+{
+public :
+    wxMacCarbonPrinterDC( wxPrintData* data ) ;
+    virtual ~wxMacCarbonPrinterDC() ;
+    virtual bool StartDoc(  wxPrinterDC* dc , const wxString& message ) ;
+    virtual void EndDoc( wxPrinterDC* dc ) ;
+    virtual void StartPage( wxPrinterDC* dc ) ;
+    virtual void EndPage( wxPrinterDC* dc ) ;
+    virtual wxUint32 GetStatus() const { return m_err ; }
+    virtual void GetSize( int *w , int *h) const ;
+    virtual wxSize GetPPI() const ;
+private :
+#if !wxMAC_USE_CORE_GRAPHICS
+    GrafPtr m_macPrintFormerPort ;

 #endif
 #endif

+    wxCoord m_maxX ;
+    wxCoord m_maxY ;
+    wxSize  m_ppi ;
+    OSStatus m_err ;
+} ;

 
 

-#if defined(TARGET_CARBON) && !defined(__DARWIN__)
-#  if PM_USE_SESSION_APIS
-#    include <PMCore.h>
-#  endif
-#  include <PMApplication.h>
+wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data )
+{
+#if !wxMAC_USE_CORE_GRAPHICS
+    ::GetPort( & m_macPrintFormerPort ) ;

 #endif
 #endif

+    m_err = noErr ;
+    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) data->GetNativeData() ;

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxPrinterDC, wxDC)
+    PMRect rPage;
+    m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
+    if ( m_err != noErr )
+        return;
+
+    m_maxX = wxCoord(rPage.right - rPage.left) ;
+    m_maxY = wxCoord(rPage.bottom - rPage.top);
+
+    PMResolution res;
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
+    PMPrinter printer;
+    PMSessionGetCurrentPrinter(native->m_macPrintSession, &printer);
+    PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ;
+#else
+    m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res);

 #endif
 #endif

+    m_ppi = wxSize(int(res.hRes), int(res.vRes));
+}

 
 

-GrafPtr macPrintFormerPort = NULL ;
+wxMacCarbonPrinterDC::~wxMacCarbonPrinterDC()
+{
+#if !wxMAC_USE_CORE_GRAPHICS
+    // nothing to release from print data, as wxPrinterDC has all data in its wxPrintData member
+    ::SetPort( m_macPrintFormerPort ) ;
+#endif
+}

 
 

-wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
+wxNativePrinterDC* wxNativePrinterDC::Create(wxPrintData* data)

 {
 {

-    OSStatus err ;
-    wxString message ;
-    
-    m_printData = printdata ;
-    m_printData.ConvertToNative() ;
+    return new wxMacCarbonPrinterDC(data) ;
+}
+
+bool wxMacCarbonPrinterDC::StartDoc(  wxPrinterDC* dc , const wxString& WXUNUSED(message)  )
+{
+    if ( m_err )
+        return false ;

 
 

-#if TARGET_CARBON && PM_USE_SESSION_APIS
-    err = UMAPrOpen(&m_macPrintSessionPort) ;
-    if ( err != noErr || m_macPrintSessionPort == kPMNoData )
+    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ;
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4 && wxMAC_USE_CORE_GRAPHICS
+    {
+        CFStringRef s[1] = { kPMGraphicsContextCoreGraphics };
+        CFArrayRef  graphicsContextsArray = CFArrayCreate(NULL, (const void**)s, 1, &kCFTypeArrayCallBacks);
+        PMSessionSetDocumentFormatGeneration(native->m_macPrintSession, kPMDocumentFormatPDF, graphicsContextsArray, NULL);
+        CFRelease(graphicsContextsArray);
+    }
+#endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4 && wxMAC_USE_CORE_GRAPHICS
+    m_err = PMSessionBeginCGDocument(native->m_macPrintSession,
+              native->m_macPrintSettings,
+              native->m_macPageFormat);

 #else
 #else

-    err = UMAPrOpen(NULL) ;
-    if ( err != noErr )
+    m_err = PMSessionBeginDocument(native->m_macPrintSession,
+              native->m_macPrintSettings,
+              native->m_macPageFormat);
+

 #endif
 #endif

-    {
-        message.Printf( "Print Error %ld", err ) ;
-        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
-#if TARGET_CARBON && PM_USE_SESSION_APIS
-        UMAPrClose(&m_macPrintSessionPort) ;
+
+    if ( m_err != noErr )
+        return false;
+
+    PMRect rPage;
+    m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
+    if ( m_err != noErr )
+        return false ;
+
+    m_maxX = wxCoord(rPage.right - rPage.left) ;
+    m_maxY = wxCoord(rPage.bottom - rPage.top);
+
+    PMResolution res;
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
+    PMPrinter printer;
+    PMSessionGetCurrentPrinter(native->m_macPrintSession, &printer);
+    PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ;

 #else
 #else

-        UMAPrClose(NULL) ;
+    m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res);

 #endif
 #endif

-        m_ok = FALSE;
-        return;
-    }
-    
-#if !TARGET_CARBON
-    if ( ::PrValidate( (THPrint) m_printData.m_macPrintSettings ) )
+    m_ppi = wxSize(int(res.hRes), int(res.vRes));
+    return true ;
+}
+
+void wxMacCarbonPrinterDC::EndDoc( wxPrinterDC* dc )
+{
+    if ( m_err )
+        return ;
+
+    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ;
+
+    m_err = PMSessionEndDocument(native->m_macPrintSession);
+}
+
+void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
+{
+    if ( m_err )
+        return ;
+
+    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ;
+
+    m_err = PMSessionBeginPage(native->m_macPrintSession,
+                 native->m_macPageFormat,
+                 nil);
+
+#if wxMAC_USE_CORE_GRAPHICS
+    CGContextRef pageContext;
+#endif
+    if ( m_err == noErr )

     {
     {

-        ::PrStlDialog( (THPrint) m_printData.m_macPrintSettings ) ;
-        // the driver has changed in the mean time, should we pop up a page setup dialog ?
+#if wxMAC_USE_CORE_GRAPHICS
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
+        m_err = PMSessionGetCGGraphicsContext(native->m_macPrintSession,
+                                            &pageContext );
+
+#else
+        m_err = PMSessionGetGraphicsContext(native->m_macPrintSession,
+                                            kPMGraphicsContextCoreGraphics,
+                                            (void**) &pageContext );
+#endif
+#else
+        m_err = PMSessionGetGraphicsContext(native->m_macPrintSession,
+                                            kPMGraphicsContextQuickdraw,
+                                            (void**) &dc->m_macPort );
+#endif

     }
     }

-    err = PrError() ;
-    if ( err != noErr )
+
+    if ( m_err != noErr )

     {
     {

-        message.Printf( "Print Error %ld", err ) ;
-        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
-        UMAPrClose(NULL) ;
-        m_ok = FALSE;
-        return;
+        PMSessionEndPage(native->m_macPrintSession);
+        PMSessionEndDocument(native->m_macPrintSession);

     }
     }

-    ::GetPort( &macPrintFormerPort ) ;
-    m_macPrintSessionPort = ::PrOpenDoc( (THPrint) m_printData.m_macPrintSettings , NULL , NULL ) ;
-    err = PrError() ;
-    if ( err )
+    else

     {
     {

-        message.Printf( "Print Error %ld", err ) ;
-        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
-        UMAPrClose(NULL) ;
-        m_ok = FALSE;
-        return;
-    }
-    // sets current port
-    m_macPort = (GrafPtr ) m_macPrintSessionPort ;
+        PMRect rPage;
+
+        m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
+        if ( !m_err )
+        {
+#if wxMAC_USE_CORE_GRAPHICS
+            PMRect paperRect ;
+            PMGetAdjustedPaperRect( native->m_macPageFormat , &paperRect ) ;
+            // make sure (0,0) is at the upper left of the printable area (wx conventions)
+            // Core Graphics initially has the lower left of the paper as 0,0
+            CGContextTranslateCTM( pageContext , -paperRect.left , paperRect.bottom ) ;
+            CGContextScaleCTM( pageContext , 1 , -1 ) ;

 #else
 #else

-  #if PM_USE_SESSION_APIS
-    err = PMSessionBeginDocument((PMPrintSession)m_macPrintSessionPort,
-              (PMPrintSettings)m_printData.m_macPrintSettings, 
-              (PMPageFormat)m_printData.m_macPageFormat);
-    if ( err != noErr )
-  #else
-    m_macPrintSessionPort = kPMNoReference ;
-    err = PMBeginDocument(
-              m_printData.m_macPrintSettings, 
-              m_printData.m_macPageFormat, 
-              &m_macPrintSessionPort);
-    if ( err != noErr || m_macPrintSessionPort == kPMNoReference )
-  #endif
-    {
-        message.Printf( "Print Error %ld", err ) ;
-        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
-  #if TARGET_CARBON && PM_USE_SESSION_APIS
-        UMAPrClose(&m_macPrintSessionPort) ;
-  #else
-        UMAPrClose(NULL) ;
-  #endif
-        m_ok = FALSE;
-        return;
+            dc->SetDeviceLocalOrigin( (wxCoord) rPage.left, (wxCoord) rPage.top );
+#endif
+        }
+        // since this is a non-critical error, we set the flag back
+        m_err = noErr ;

     }
     }

-    // sets current port
-    ::GetPort( (GrafPtr *)&m_macPort ) ;
+#if wxMAC_USE_CORE_GRAPHICS
+    dc->SetGraphicsContext( wxGraphicsContext::CreateFromNative( pageContext ) );

 #endif
 #endif

-    m_ok = TRUE ;
-    m_minY = m_minX = 0 ;
-#if TARGET_CARBON
-    PMRect rPaper;
-    
-    err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper);
-    if ( err != noErr )
+}
+
+void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc )
+{
+    if ( m_err )
+        return ;
+
+    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ;
+
+    m_err = PMSessionEndPage(native->m_macPrintSession);
+    if ( m_err != noErr )

     {
     {

-        message.Printf( "Print Error %ld", err ) ;
-        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
-  #if TARGET_CARBON && PM_USE_SESSION_APIS
-        UMAPrClose(&m_macPrintSessionPort) ;
-  #else
-        UMAPrClose(NULL) ;
-  #endif
-        m_ok = FALSE;
-        return;
+        PMSessionEndDocument(native->m_macPrintSession);

     }
     }

-    m_maxX = wxCoord(rPaper.right - rPaper.left) ;
-    m_maxY = wxCoord(rPaper.bottom - rPaper.top);
-#else
-    m_maxX = (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ;
-    m_maxY = (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ;
+#if wxMAC_USE_CORE_GRAPHICS
+    // the cg context we got when starting the page isn't valid anymore, so replace it
+    dc->SetGraphicsContext( wxGraphicsContext::Create() );

 #endif
 }
 
 #endif
 }
 

-wxPrinterDC::~wxPrinterDC(void)
+void wxMacCarbonPrinterDC::GetSize( int *w , int *h) const
+{
+    if ( w )
+        *w = m_maxX ;
+    if ( h )
+        *h = m_maxY ;
+}
+
+wxSize wxMacCarbonPrinterDC::GetPPI() const 

 {
 {

-    OSStatus err ;
-    wxString message ;
-#if !TARGET_CARBON
-    if ( m_ok )
+     return m_ppi ;
+};
+
+//
+//
+//
+
+wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
+{
+    m_ok = false ;
+    m_printData = printdata ;
+    m_printData.ConvertToNative() ;
+    m_nativePrinterDC = wxNativePrinterDC::Create( &m_printData ) ;
+    if ( m_nativePrinterDC )

     {
     {

-        ::PrCloseDoc( (TPPrPort) m_macPrintSessionPort  ) ;
-        err = PrError() ;
-        
-        if ( err == noErr )
+        m_ok = m_nativePrinterDC->Ok() ;
+        if ( !m_ok )

         {
         {

-            if ( (**(THPrint)m_printData.m_macPrintSettings).prJob.bJDocLoop == bSpoolLoop )
-            {
-                TPrStatus status ;
-                ::PrPicFile( (THPrint) m_printData.m_macPrintSettings , NULL , NULL , NULL , &status ) ;
-            }
+            wxString message ;
+            message.Printf( wxT("Print Error %u"), m_nativePrinterDC->GetStatus() ) ;
+            wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
+            dialog.ShowModal();

         }
         else
         {
         }
         else
         {

-            message.Printf( "Print Error %ld", err ) ;
-            wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-            dialog.ShowModal();
+            wxSize sz = GetPPI();
+            m_mm_to_pix_x = mm2inches * sz.x;
+            m_mm_to_pix_y = mm2inches * sz.y;        

         }
         }

-        ::UMAPrClose(NULL) ;
-//      ::SetPort( macPrintFormerPort ) ;
-        ::SetPort( LMGetWMgrPort() ) ;
-    }
-#else
-    if ( m_ok ) 
-    {
-  #if PM_USE_SESSION_APIS
-        err = PMSessionEndDocument((PMPrintSession)m_macPrintSessionPort);
-  #else
-        err = PMEndDocument(m_macPrintSessionPort);
-  #endif
-         if ( err != noErr )
-         {
-            message.Printf( "Print Error %ld", err ) ;
-            wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-            dialog.ShowModal();
-         }
-  #if TARGET_CARBON && PM_USE_SESSION_APIS
-        UMAPrClose(&m_macPrintSessionPort) ;
-  #else
-        UMAPrClose(NULL) ;
-  #endif
-    }
+#if wxMAC_USE_CORE_GRAPHICS
+        // we need at least a measuring context because people start measuring before a page
+        // gets printed at all
+        SetGraphicsContext( wxGraphicsContext::Create() );

 #endif
 #endif

+    }

 }
 
 }
 

-bool wxPrinterDC::StartDoc( const wxString& WXUNUSED(message) ) 
+wxSize wxPrinterDC::GetPPI() const

 {
 {

-    return m_ok ;
+    return m_nativePrinterDC->GetPPI() ;

 }
 
 }
 

-void wxPrinterDC::EndDoc(void) 
+wxPrinterDC::~wxPrinterDC(void)

 {
 {

+    delete m_nativePrinterDC ;

 }
 
 }
 

-void wxPrinterDC::StartPage(void) 
+bool wxPrinterDC::StartDoc( const wxString& message )

 {
 {

-    if ( !m_ok )
-        return ;
+    wxASSERT_MSG( Ok() , wxT("Called wxPrinterDC::StartDoc from an invalid object") ) ;

 
 

-      m_logicalFunction = wxCOPY;
-//  m_textAlignment = wxALIGN_TOP_LEFT;
-      m_backgroundMode = wxTRANSPARENT;
-  
-      m_textForegroundColour = *wxBLACK;
-      m_textBackgroundColour = *wxWHITE;
-      m_pen = *wxBLACK_PEN;
-      m_font = *wxNORMAL_FONT;
-      m_brush = *wxTRANSPARENT_BRUSH;
-      m_backgroundBrush = *wxWHITE_BRUSH;
-    
-    m_macFontInstalled = false ;
-    m_macBrushInstalled = false ;
-    m_macPenInstalled = false ;
+    if ( !m_ok )
+        return false ;

 
 

-        
-    OSStatus err ;
-    wxString message ;
-
-#if !TARGET_CARBON
-      PrOpenPage( (TPPrPort) m_macPrintSessionPort , NULL ) ;
-      m_macLocalOrigin.x =  (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ;
-      m_macLocalOrigin.y =  (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ;
-      
-    Rect clip = { -32000 , -32000 , 32000 , 32000 } ;
-    ::ClipRect( &clip ) ;
-    err = PrError() ;
-    if ( err != noErr )
+    if ( m_nativePrinterDC->StartDoc(this, message ) )

     {
     {

-        message.Printf( "Print Error %ld", err ) ;
-        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
-           ::PrClosePage( (TPPrPort) m_macPrintSessionPort ) ;
-        ::PrCloseDoc( (TPPrPort) m_macPrintSessionPort ) ;
-        ::UMAPrClose(NULL) ;
-           ::SetPort( macPrintFormerPort ) ;
-           m_ok = FALSE ;
+        // in case we have to do additional things when successful

     }
     }

-#else
-  #if PM_USE_SESSION_APIS
-    err = PMSessionBeginPage((PMPrintSession)m_macPrintSessionPort,
-                 (PMPageFormat)m_printData.m_macPageFormat,
-                 nil);
-  #else
-    err = PMBeginPage(m_macPrintSessionPort, nil);
-  #endif
-    if ( err != noErr )
+    m_ok = m_nativePrinterDC->Ok() ;
+    if ( !m_ok )

     {
     {

-        message.Printf( "Print Error %ld", err ) ;
-        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+        wxString message ;
+        message.Printf( wxT("Print Error %u"), m_nativePrinterDC->GetStatus() ) ;
+        wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;

         dialog.ShowModal();
         dialog.ShowModal();

-  #if PM_USE_SESSION_APIS
-           PMSessionEndPage((PMPrintSession)m_macPrintSessionPort);
-        PMSessionEndDocument((PMPrintSession)m_macPrintSessionPort);
-        UMAPrClose(&m_macPrintSessionPort) ;
-  #else
-           PMEndPage(m_macPrintSessionPort);
-        PMEndDocument(m_macPrintSessionPort);
-        UMAPrClose(NULL) ;
-  #endif
-           ::SetPort( macPrintFormerPort ) ;
-           m_ok = FALSE ;

     }
     }

-#endif
+
+    return m_ok ;

 }
 
 }
 

-void wxPrinterDC::EndPage(void) 
+void wxPrinterDC::EndDoc(void)

 {
     if ( !m_ok )
         return ;
 
 {
     if ( !m_ok )
         return ;
 

-    OSStatus err ;
-    wxString message ;
+    m_nativePrinterDC->EndDoc( this ) ;
+    m_ok = m_nativePrinterDC->Ok() ;

 
 

-#if !TARGET_CARBON
-       PrClosePage(  (TPPrPort) m_macPort ) ;
-    err = PrError() ;
-    if ( err != noErr )
+    if ( !m_ok )

     {
     {

-        message.Printf( "Print Error %ld", err ) ;
-        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+        wxString message ;
+        message.Printf( wxT("Print Error %u"), m_nativePrinterDC->GetStatus() ) ;
+        wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;

         dialog.ShowModal();
         dialog.ShowModal();

-        ::PrCloseDoc( (TPPrPort) m_macPrintSessionPort  ) ;
-        ::UMAPrClose(NULL) ;
-           ::SetPort( macPrintFormerPort ) ;
-           m_ok = FALSE ;

     }
     }

-#else
-  #if PM_USE_SESSION_APIS
-    err = PMSessionEndPage((PMPrintSession)m_macPrintSessionPort);
-  #else
-    err = PMEndPage(m_macPrintSessionPort);
-  #endif
+}
+
+wxRect wxPrinterDC::GetPaperRect()
+{
+    wxCoord w, h;
+    GetSize(&w, &h);
+    wxRect pageRect(0, 0, w, h);
+    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) m_printData.GetNativeData() ;
+    OSStatus err = noErr ;
+    PMRect rPaper;
+    err = PMGetAdjustedPaperRect(native->m_macPageFormat, &rPaper);

     if ( err != noErr )
     if ( err != noErr )

-    {
-        message.Printf( "Print Error %ld", err ) ;
-        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-        dialog.ShowModal();
-  #if PM_USE_SESSION_APIS
-        PMSessionEndDocument((PMPrintSession)m_macPrintSessionPort);
-        UMAPrClose(&m_macPrintSessionPort) ;
-  #else
-        PMEndDocument(m_macPrintSessionPort);
-        UMAPrClose(NULL) ;
-  #endif
-           ::SetPort( macPrintFormerPort ) ;
-           m_ok = FALSE ;
-    }
+        return pageRect;
+    return wxRect(wxCoord(rPaper.left), wxCoord(rPaper.top),
+        wxCoord(rPaper.right - rPaper.left), wxCoord(rPaper.bottom - rPaper.top));
+}
+
+void wxPrinterDC::StartPage(void)
+{
+    if ( !m_ok )
+        return ;
+
+    m_logicalFunction = wxCOPY;
+    //  m_textAlignment = wxALIGN_TOP_LEFT;
+    m_backgroundMode = wxTRANSPARENT;
+
+    m_textForegroundColour = *wxBLACK;
+    m_textBackgroundColour = *wxWHITE;
+    m_pen = *wxBLACK_PEN;
+    m_font = *wxNORMAL_FONT;
+    m_brush = *wxTRANSPARENT_BRUSH;
+    m_backgroundBrush = *wxWHITE_BRUSH;
+#if !wxMAC_USE_CORE_GRAPHICS
+    m_macFontInstalled = false ;
+    m_macBrushInstalled = false ;
+    m_macPenInstalled = false ;

 #endif
 
 #endif
 

+    m_nativePrinterDC->StartPage(this) ;
+    m_ok = m_nativePrinterDC->Ok() ;
+

 }
 }

+
+void wxPrinterDC::EndPage(void)
+{
+    if ( !m_ok )
+        return ;
+
+    m_nativePrinterDC->EndPage(this) ;
+    m_ok = m_nativePrinterDC->Ok() ;
+}
+
+void wxPrinterDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_ok , _T("GetSize() doesn't work without a valid wxPrinterDC") );
+    m_nativePrinterDC->GetSize(width,  height ) ;
+}
+
+#endif