Change event names to clarify that they are only fired by button clicks, and note...

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

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index ce17739428f1357165e7c18c6e6eb3d312542faa..58b2eb7a1327e5003afa6e052cea49d37b8669e7 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -27,6 +27,7 @@
 
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"
 
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"

+#include "wx/graphics.h"

 
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 
 
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 


@@ -94,8 +95,8 @@ wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data )
     PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ;
 #else
     m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res);
     PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ;
 #else
     m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res);

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

 #endif
 #endif

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

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


@@ -196,7 +197,6 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
                                             kPMGraphicsContextCoreGraphics,
                                             (void**) &pageContext );
 #endif
                                             kPMGraphicsContextCoreGraphics,
                                             (void**) &pageContext );
 #endif

-        dc->MacSetCGContext(pageContext) ;

 #else
         m_err = PMSessionGetGraphicsContext(native->m_macPrintSession,
                                             kPMGraphicsContextQuickdraw,
 #else
         m_err = PMSessionGetGraphicsContext(native->m_macPrintSession,
                                             kPMGraphicsContextQuickdraw,


@@ -219,9 +219,10 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
 #if wxMAC_USE_CORE_GRAPHICS
             PMRect paperRect ;
             PMGetAdjustedPaperRect( native->m_macPageFormat , &paperRect ) ;
 #if wxMAC_USE_CORE_GRAPHICS
             PMRect paperRect ;
             PMGetAdjustedPaperRect( native->m_macPageFormat , &paperRect ) ;

-            CGContextTranslateCTM( pageContext , -paperRect.left , -paperRect.top + ( rPage.bottom - rPage.top ) ) ;
+            // 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 ) ;

-            CGContextSaveGState( pageContext ) ;

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


@@ -230,6 +231,9 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
         // 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 ;
     }

+#if wxMAC_USE_CORE_GRAPHICS
+    dc->SetGraphicsContext( wxGraphicsContext::CreateFromNative( pageContext ) );
+#endif

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


@@ -244,6 +248,10 @@ void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc )
     {
         PMSessionEndDocument(native->m_macPrintSession);
     }
     {
         PMSessionEndDocument(native->m_macPrintSession);
     }

+#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

 }
 
 void wxMacCarbonPrinterDC::GetSize( int *w , int *h) const
 }
 
 void wxMacCarbonPrinterDC::GetSize( int *w , int *h) const


@@ -286,8 +294,9 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
             m_mm_to_pix_y = mm2inches * sz.y;        
         }
 #if wxMAC_USE_CORE_GRAPHICS
             m_mm_to_pix_y = mm2inches * sz.y;        
         }
 #if wxMAC_USE_CORE_GRAPHICS

-        // the cgContext will only be handed over page by page
-        m_graphicContext = new wxMacCGContext() ;
+        // we need at least a measuring context because people start measuring before a page
+        // gets printed at all
+        SetGraphicsContext( wxGraphicsContext::Create() );

 #endif
     }
 }
 #endif
     }
 }


@@ -299,21 +308,9 @@ wxSize wxPrinterDC::GetPPI() const
 
 wxPrinterDC::~wxPrinterDC(void)
 {
 
 wxPrinterDC::~wxPrinterDC(void)
 {

-#if wxMAC_USE_CORE_GRAPHICS
-    // this context was borrowed
-    ((wxMacCGContext*)(m_graphicContext))->SetNativeContext( NULL ) ;
-#endif

     delete m_nativePrinterDC ;
 }
 
     delete m_nativePrinterDC ;
 }
 

-#if wxMAC_USE_CORE_GRAPHICS
-void wxPrinterDC::MacSetCGContext( void * cg )
-{
-    ((wxMacCGContext*)(m_graphicContext))->SetNativeContext( (CGContextRef) cg ) ;
-    m_graphicContext->SetPen( m_pen ) ;
-    m_graphicContext->SetBrush( m_brush ) ;
-}
-#endif

 bool wxPrinterDC::StartDoc( const wxString& message )
 {
     wxASSERT_MSG( Ok() , wxT("Called wxPrinterDC::StartDoc from an invalid object") ) ;
 bool wxPrinterDC::StartDoc( const wxString& message )
 {
     wxASSERT_MSG( Ok() , wxT("Called wxPrinterDC::StartDoc from an invalid object") ) ;


@@ -354,6 +351,21 @@ void wxPrinterDC::EndDoc(void)
     }
 }
 
     }
 }
 

+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 )
+        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 )
 void wxPrinterDC::StartPage(void)
 {
     if ( !m_ok )