Performance optimization

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

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index d4f91089879ffad423338f63e73f5d5195a4c365..aacf643f193c514851d62fd7ce12f5e2dea9791d 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -1,37 +1,36 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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 "wx/math.h"

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

+#include "wx/mac/carbon/dcprint.h"
+#include "wx/graphics.h"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxPrinterDC, wxDC)
-#endif
+IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxGCDCImpl)

 
 class wxNativePrinterDC
 {
 
 class wxNativePrinterDC
 {


@@ -42,8 +41,9 @@ public :
     virtual void EndDoc( wxPrinterDC* dc ) = 0;
     virtual void StartPage( wxPrinterDC* dc ) = 0;
     virtual void EndPage( wxPrinterDC* dc ) = 0;
     virtual void EndDoc( wxPrinterDC* dc ) = 0;
     virtual void StartPage( wxPrinterDC* dc ) = 0;
     virtual void EndPage( wxPrinterDC* dc ) = 0;

-    virtual wxCoord GetMaxX() const = 0 ;
-    virtual wxCoord GetMaxY() const = 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 ; }
     // returns 0 in case of no Error, otherwise platform specific error codes
     virtual wxUint32 GetStatus() const = 0 ;
     bool Ok() { return GetStatus() == 0 ; }


@@ -51,33 +51,29 @@ public :
     static wxNativePrinterDC* Create(wxPrintData* data) ;
 } ;
 
     static wxNativePrinterDC* Create(wxPrintData* data) ;
 } ;
 

-#if TARGET_CARBON
-

 class wxMacCarbonPrinterDC : public wxNativePrinterDC
 {
 public :
     wxMacCarbonPrinterDC( wxPrintData* data ) ;
 class wxMacCarbonPrinterDC : public wxNativePrinterDC
 {
 public :
     wxMacCarbonPrinterDC( wxPrintData* data ) ;

-    ~wxMacCarbonPrinterDC() ;
+    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 bool StartDoc(  wxPrinterDC* dc , const wxString& message ) ;
     virtual void EndDoc( wxPrinterDC* dc ) ;
     virtual void StartPage( wxPrinterDC* dc ) ;
     virtual void EndPage( wxPrinterDC* dc ) ;

-    virtual wxCoord GetMaxX() const { return m_maxX ; }
-    virtual wxCoord GetMaxY() const { return m_maxY ; }

     virtual wxUint32 GetStatus() const { return m_err ; }
     virtual wxUint32 GetStatus() const { return m_err ; }

+    virtual void GetSize( int *w , int *h) const ;
+    virtual wxSize GetPPI() const ;

 private :
 private :

-    GrafPtr m_macPrintFormerPort ;

     wxCoord m_maxX ;
     wxCoord m_maxY ;
     wxCoord m_maxX ;
     wxCoord m_maxY ;

+    wxSize  m_ppi ;

     OSStatus m_err ;
 } ;
 
 wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data )
 {
     OSStatus m_err ;
 } ;
 
 wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data )
 {

-    ::GetPort( & m_macPrintFormerPort ) ;
-

     m_err = noErr ;
     m_err = noErr ;

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

 
     PMRect rPage;
     m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
 
     PMRect rPage;
     m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);


@@ -86,12 +82,37 @@ wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data )
 
     m_maxX = wxCoord(rPage.right - rPage.left) ;
     m_maxY = wxCoord(rPage.bottom - rPage.top);
 
     m_maxX = wxCoord(rPage.right - rPage.left) ;
     m_maxY = wxCoord(rPage.bottom - rPage.top);

+
+    PMResolution res;
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 
+    if ( PMPrinterGetOutputResolution != NULL )
+    {
+        PMPrinter printer;
+        m_err = PMSessionGetCurrentPrinter(native->m_macPrintSession, &printer);
+        if ( m_err == noErr )
+        {
+            m_err = PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ;
+            if ( m_err == -9589 /* kPMKeyNotFound */ )
+            {
+                m_err = noErr ;
+                res.hRes = res.vRes = 300;
+            }
+        }
+    }
+    else
+#endif
+    {
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 
+        m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res);
+#endif
+    }
+    
+    m_ppi = wxSize(int(res.hRes), int(res.vRes));

 }
 
 wxMacCarbonPrinterDC::~wxMacCarbonPrinterDC()
 {
 }
 
 wxMacCarbonPrinterDC::~wxMacCarbonPrinterDC()
 {

-    // nothing to release from print data, as wxPrinterDC has all data in its wxPrintData member
-    ::SetPort( m_macPrintFormerPort ) ;

 }
 
 wxNativePrinterDC* wxNativePrinterDC::Create(wxPrintData* data)
 }
 
 wxNativePrinterDC* wxNativePrinterDC::Create(wxPrintData* data)


@@ -104,30 +125,48 @@ bool wxMacCarbonPrinterDC::StartDoc(  wxPrinterDC* dc , const wxString& WXUNUSED
     if ( m_err )
         return false ;
 
     if ( m_err )
         return false ;
 

-    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().m_nativePrintData ;
+    wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
+    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->GetPrintData().GetNativeData() ;

 
 

-#if 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
-
-    m_err = PMSessionBeginDocument(native->m_macPrintSession,
+    m_err = PMSessionBeginCGDocumentNoDialog(native->m_macPrintSession,

               native->m_macPrintSettings,
               native->m_macPrintSettings,

-              native->m_macPageFormat);
+              native->m_macPageFormat);    

     if ( m_err != noErr )
         return false;
 
     PMRect rPage;
     m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
     if ( m_err != noErr )
     if ( m_err != noErr )
         return false;
 
     PMRect rPage;
     m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
     if ( m_err != noErr )

-        return false;
+        return false ;
+
+    m_maxX = wxCoord(rPage.right - rPage.left) ;
+    m_maxY = wxCoord(rPage.bottom - rPage.top);

 
 

-    m_maxX = (wxCoord)(rPage.right - rPage.left);
-    m_maxY = (wxCoord)(rPage.bottom - rPage.top);
+    PMResolution res;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 
+    if ( PMPrinterGetOutputResolution != NULL )
+    {
+        PMPrinter printer;
+        m_err = PMSessionGetCurrentPrinter(native->m_macPrintSession, &printer);
+        if ( m_err == noErr )
+        {
+            m_err = PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ;
+            if ( m_err == -9589 /* kPMKeyNotFound */ )
+            {
+                m_err = noErr ;
+                res.hRes = res.vRes = 300;
+            }
+        }
+    }
+    else
+#endif
+    {
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 
+       m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res);
+#endif
+    }
+
+    m_ppi = wxSize(int(res.hRes), int(res.vRes));

     return true ;
 }
 
     return true ;
 }
 


@@ -136,9 +175,10 @@ void wxMacCarbonPrinterDC::EndDoc( wxPrinterDC* dc )
     if ( m_err )
         return ;
 
     if ( m_err )
         return ;
 

-    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().m_nativePrintData ;
+    wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
+    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->GetPrintData().GetNativeData() ;

 
 

-    m_err = PMSessionEndDocument(native->m_macPrintSession);
+    m_err = PMSessionEndDocumentNoDialog(native->m_macPrintSession);

 }
 
 void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
 }
 
 void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )


@@ -146,33 +186,25 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
     if ( m_err )
         return ;
 
     if ( m_err )
         return ;
 

-    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().m_nativePrintData ;
+    wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
+    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->GetPrintData().GetNativeData() ;

 
 

-    m_err = PMSessionBeginPage(native->m_macPrintSession,
+    m_err = PMSessionBeginPageNoDialog(native->m_macPrintSession,

                  native->m_macPageFormat,
                  nil);
 
                  native->m_macPageFormat,
                  nil);
 

-#if wxMAC_USE_CORE_GRAPHICS

     CGContextRef pageContext;
     CGContextRef pageContext;

-#endif
+

     if ( m_err == noErr )
     {
     if ( m_err == noErr )
     {

-#if wxMAC_USE_CORE_GRAPHICS
-        m_err = PMSessionGetGraphicsContext(native->m_macPrintSession,
-                                            kPMGraphicsContextCoreGraphics,
-                                            (void**) &pageContext );
-        dc->MacSetCGContext(pageContext) ;
-#else
-        m_err = PMSessionGetGraphicsContext(native->m_macPrintSession,
-                                            kPMGraphicsContextQuickdraw,
-                                            (void**) &dc->m_macPort );
-#endif
+        m_err = PMSessionGetCGGraphicsContext(native->m_macPrintSession,
+                                            &pageContext );

     }
 
     if ( m_err != noErr )
     {
     }
 
     if ( m_err != noErr )
     {

-        PMSessionEndPage(native->m_macPrintSession);
-        PMSessionEndDocument(native->m_macPrintSession);
+        PMSessionEndPageNoDialog(native->m_macPrintSession);
+        PMSessionEndDocumentNoDialog(native->m_macPrintSession);

     }
     else
     {
     }
     else
     {


@@ -181,17 +213,17 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
         m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
         if ( !m_err )
         {
         m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
         if ( !m_err )
         {

-#if wxMAC_USE_CORE_GRAPHICS
-            CGContextTranslateCTM( pageContext , 0 , rPage.bottom - rPage.top ) ;
+            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 ) ;
             CGContextScaleCTM( pageContext , 1 , -1 ) ;

-#else
-            dc->m_macLocalOrigin.x = (int) rPage.left;
-            dc->m_macLocalOrigin.y = (int) rPage.top;
-#endif

         }
         // since this is a non-critical error, we set the flag back
         m_err = noErr ;
     }
         }
         // since this is a non-critical error, we set the flag back
         m_err = noErr ;
     }

+    impl->SetGraphicsContext( wxGraphicsContext::CreateFromNative( pageContext ) );

 }
 
 void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc )
 }
 
 void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc )


@@ -199,138 +231,39 @@ void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc )
     if ( m_err )
         return ;
 
     if ( m_err )
         return ;
 

-    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().m_nativePrintData ;
+    wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
+    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->GetPrintData().GetNativeData() ;

 
 

-    m_err = PMSessionEndPage(native->m_macPrintSession);
+    m_err = PMSessionEndPageNoDialog(native->m_macPrintSession);

     if ( m_err != noErr )
     {
     if ( m_err != noErr )
     {

-        PMSessionEndDocument(native->m_macPrintSession);
+        PMSessionEndDocumentNoDialog(native->m_macPrintSession);

     }
     }

+    // the cg context we got when starting the page isn't valid anymore, so replace it
+    impl->SetGraphicsContext( wxGraphicsContext::Create() );

 }
 
 }
 

-#else
-
-class wxMacClassicPrinterDC : public wxNativePrinterDC
+void wxMacCarbonPrinterDC::GetSize( int *w , int *h) const

 {
 {

-public :
-    wxMacClassicPrinterDC( wxPrintData* data ) ;
-    ~wxMacClassicPrinterDC() ;
-    virtual bool StartDoc(  wxPrinterDC* dc , const wxString& message ) ;
-    virtual void EndDoc( wxPrinterDC* dc ) ;
-    virtual void StartPage( wxPrinterDC* dc ) ;
-    virtual void EndPage( wxPrinterDC* dc ) ;
-    virtual wxCoord GetMaxX() const { return m_maxX ; }
-    virtual wxCoord GetMaxY() const { return m_maxY ; }
-    virtual wxUint32 GetStatus() const { return m_err ; }
-private :
-    GrafPtr m_macPrintFormerPort ;
-    TPPrPort m_macPrintingPort ;
-    OSErr m_err ;
-    long m_maxX ;
-    long m_maxY ;
-} ;
-
-wxNativePrinterDC* wxNativePrinterDC::Create(wxPrintData* data)
-{
-    return new wxMacClassicPrinterDC(data) ;
+    if ( w )
+        *w = m_maxX ;
+    if ( h )
+        *h = m_maxY ;

 }
 
 }
 

-wxMacClassicPrinterDC::wxMacClassicPrinterDC(wxPrintData* data)
+wxSize wxMacCarbonPrinterDC::GetPPI() const 

 {
 {

-    ::GetPort( &m_macPrintFormerPort ) ;
-    m_err = noErr ;
-    ::UMAPrOpen() ;
-    m_err = PrError() ;
-    if ( m_err != noErr )
-        return;
+     return m_ppi ;
+};

 
 

-    wxMacClassicPrintData *native = (wxMacClassicPrintData*) data->m_nativePrintData ;
+//
+//
+//

 
 

-    if ( ::PrValidate( native->m_macPrintSettings ) )
-    {
-        // the driver has changed in the mean time, should we pop up a page setup dialog ?
-        if ( !::PrStlDialog( native->m_macPrintSettings ) )
-        {
-            m_err = -1 ;
-            return;
-        }
-    }
-    m_err = PrError() ;
-
-    if ( m_err == noErr )
-    {
-        m_maxX = (**native->m_macPrintSettings).prInfo.rPage.right - (**native->m_macPrintSettings).prInfo.rPage.left ;
-        m_maxY = (**native->m_macPrintSettings).prInfo.rPage.bottom - (**native->m_macPrintSettings).prInfo.rPage.top ;
-    }
-}
-
-wxMacClassicPrinterDC::~wxMacClassicPrinterDC()
-{
-    ::UMAPrClose() ;
-    ::SetPort( LMGetWMgrPort() ) ;
-}
-
-bool wxMacClassicPrinterDC::StartDoc(  wxPrinterDC* dc , const wxString& WXUNUSED(message)  )
-{
-    if ( m_err )
-        return false ;
-
-    wxMacClassicPrintData *native = (wxMacClassicPrintData*) dc->GetPrintData().m_nativePrintData ;
-    m_macPrintingPort = ::PrOpenDoc( native->m_macPrintSettings , NULL , NULL ) ;
-    m_err = PrError() ;
-    if ( m_err )
-        return false ;
-
-    // sets current port
-    dc->m_macPort = (GrafPtr ) m_macPrintingPort ;
-    m_maxX = (**native->m_macPrintSettings).prInfo.rPage.right - (**native->m_macPrintSettings).prInfo.rPage.left ;
-    m_maxY = (**native->m_macPrintSettings).prInfo.rPage.bottom - (**native->m_macPrintSettings).prInfo.rPage.top ;
-    return true ;
-}
-
-void wxMacClassicPrinterDC::EndDoc( wxPrinterDC* dc )
+wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printdata )
+   : wxGCDCImpl( owner )

 {
 {

-    if ( m_err )
-        return ;
-
-    PrCloseDoc( m_macPrintingPort ) ;
-    m_err = PrError() ;
-}
-
-void wxMacClassicPrinterDC::StartPage( wxPrinterDC* dc )
-{
-    if ( m_err )
-        return ;
-
-    wxMacClassicPrintData *native = (wxMacClassicPrintData*) dc->GetPrintData().m_nativePrintData ;
-
-    PrOpenPage( m_macPrintingPort , NULL ) ;
-    dc->m_macLocalOrigin.x =  (**native->m_macPrintSettings).rPaper.left ;
-    dc->m_macLocalOrigin.y =  (**native->m_macPrintSettings).rPaper.top ;
-    // m_macPrintingPort is now the current port
-    Rect clip = { -32000 , -32000 , 32000 , 32000 } ;
-    ::ClipRect( &clip ) ;
-    m_err = PrError() ;
-    if ( m_err != noErr )
-        ::PrCloseDoc( m_macPrintingPort ) ;
-}
-
-void wxMacClassicPrinterDC::EndPage( wxPrinterDC* dc )
-{
-    if ( m_err )
-        return ;
-
-    PrClosePage( m_macPrintingPort ) ;
-    m_err = PrError() ;
-    if ( m_err != noErr )
-        ::PrCloseDoc( m_macPrintingPort  ) ;
-}
-
-#endif
-
-wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
-{
-    m_ok = FALSE ;
+    m_ok = false ;

     m_printData = printdata ;
     m_printData.ConvertToNative() ;
     m_nativePrinterDC = wxNativePrinterDC::Create( &m_printData ) ;
     m_printData = printdata ;
     m_printData.ConvertToNative() ;
     m_nativePrinterDC = wxNativePrinterDC::Create( &m_printData ) ;


@@ -344,34 +277,36 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
             wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
             dialog.ShowModal();
         }
             wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
             dialog.ShowModal();
         }

-#if wxMAC_USE_CORE_GRAPHICS
-        // the cgContext will only be handed over page by page
-        m_graphicContext = new wxMacCGContext() ;
-#endif
+        else
+        {
+            wxSize sz = GetPPI();
+            m_mm_to_pix_x = mm2inches * sz.x;
+            m_mm_to_pix_y = mm2inches * sz.y;        
+        }
+        // we need at least a measuring context because people start measuring before a page
+        // gets printed at all
+        SetGraphicsContext( wxGraphicsContext::Create() );

     }
 }
 
     }
 }
 

-wxPrinterDC::~wxPrinterDC(void)
+wxSize wxPrinterDCImpl::GetPPI() const

 {
 {

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

 }
 
 }
 

-#if wxMAC_USE_CORE_GRAPHICS
-void wxPrinterDC::MacSetCGContext( void * cg ) 
+wxPrinterDCImpl::~wxPrinterDCImpl()

 {
 {

-    dynamic_cast<wxMacCGContext*>(m_graphicContext)->SetNativeContext( (CGContextRef) cg ) ;
-    m_graphicContext->SetPen( m_pen ) ;
-    m_graphicContext->SetBrush( m_brush ) ;
+    delete m_nativePrinterDC ;

 }
 }

-#endif
-bool wxPrinterDC::StartDoc( const wxString& message )
+
+bool wxPrinterDCImpl::StartDoc( const wxString& message )

 {
 {

-    wxASSERT_MSG( Ok() , wxT("Called wxPrinterDC::StartDoc from an invalid object") ) ;
+    wxASSERT_MSG( IsOk() , wxT("Called wxPrinterDC::StartDoc from an invalid object") ) ;

 
     if ( !m_ok )
         return false ;
 
 
     if ( !m_ok )
         return false ;
 

-    if ( m_nativePrinterDC->StartDoc(this, message ) )
+    if ( m_nativePrinterDC->StartDoc( (wxPrinterDC*) GetOwner(), message ) )

     {
         // in case we have to do additional things when successful
     }
     {
         // in case we have to do additional things when successful
     }


@@ -387,12 +322,12 @@ bool wxPrinterDC::StartDoc( const wxString& message )
     return m_ok ;
 }
 
     return m_ok ;
 }
 

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

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

-    m_nativePrinterDC->EndDoc( this ) ;
+    m_nativePrinterDC->EndDoc( (wxPrinterDC*) GetOwner() ) ;

     m_ok = m_nativePrinterDC->Ok() ;
 
     if ( !m_ok )
     m_ok = m_nativePrinterDC->Ok() ;
 
     if ( !m_ok )


@@ -404,7 +339,22 @@ void wxPrinterDC::EndDoc(void)
     }
 }
 
     }
 }
 

-void wxPrinterDC::StartPage(void)
+wxRect wxPrinterDCImpl::GetPaperRect()
+{
+    wxCoord w, h;
+    GetOwner()->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 )
+        return pageRect;
+    return wxRect(wxCoord(rPaper.left), wxCoord(rPaper.top),
+        wxCoord(rPaper.right - rPaper.left), wxCoord(rPaper.bottom - rPaper.top));
+}
+
+void wxPrinterDCImpl::StartPage()

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


@@ -419,34 +369,25 @@ void wxPrinterDC::StartPage(void)
     m_font = *wxNORMAL_FONT;
     m_brush = *wxTRANSPARENT_BRUSH;
     m_backgroundBrush = *wxWHITE_BRUSH;
     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

 
 

-    m_nativePrinterDC->StartPage(this) ;
+    m_nativePrinterDC->StartPage( (wxPrinterDC*) GetOwner() ) ;

     m_ok = m_nativePrinterDC->Ok() ;
 
 }
 
     m_ok = m_nativePrinterDC->Ok() ;
 
 }
 

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

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

-    m_nativePrinterDC->EndPage(this) ;
+    m_nativePrinterDC->EndPage( (wxPrinterDC*) GetOwner() );

     m_ok = m_nativePrinterDC->Ok() ;
 }
 
     m_ok = m_nativePrinterDC->Ok() ;
 }
 

-void wxPrinterDC::DoGetSize(int *width, int *height) const
+void wxPrinterDCImpl::DoGetSize(int *width, int *height) const

 {
     wxCHECK_RET( m_ok , _T("GetSize() doesn't work without a valid wxPrinterDC") );
 {
     wxCHECK_RET( m_ok , _T("GetSize() doesn't work without a valid wxPrinterDC") );

-
-    if ( width )
-        * width = m_nativePrinterDC->GetMaxX() ;
-    if ( height )
-        * height = m_nativePrinterDC->GetMaxY() ;
+    m_nativePrinterDC->GetSize(width,  height ) ;

 }
 
 }
 

-
+#endif