X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/746d7582973593a058ae72d24ac489bc2fc87832..544bdbbee2c81c8ab3a69e100bbd441b6461d609:/src/mac/carbon/dcprint.cpp diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp index 8b5eab92d5..d4f9108987 100644 --- a/src/mac/carbon/dcprint.cpp +++ b/src/mac/carbon/dcprint.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dcprint.h" #endif @@ -25,7 +25,7 @@ #include "wx/dcprint.h" #include "wx/msgdlg.h" -#include +#include "wx/math.h" #include "wx/mac/uma.h" #include "wx/mac/private/print.h" @@ -47,7 +47,7 @@ public : // 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) ; } ; @@ -78,7 +78,7 @@ wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data ) m_err = noErr ; wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) data->m_nativePrintData ; - + PMRect rPage; m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage); if ( m_err != noErr ) @@ -99,15 +99,24 @@ wxNativePrinterDC* wxNativePrinterDC::Create(wxPrintData* data) return new wxMacCarbonPrinterDC(data) ; } -bool wxMacCarbonPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSED(message) ) +bool wxMacCarbonPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSED(message) ) { if ( m_err ) return false ; wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().m_nativePrintData ; +#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, - native->m_macPrintSettings, + native->m_macPrintSettings, native->m_macPageFormat); if ( m_err != noErr ) return false; @@ -117,12 +126,12 @@ bool wxMacCarbonPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSED if ( m_err != noErr ) return false; - m_maxX = rPage.right - rPage.left ; - m_maxY = rPage.bottom - rPage.top ; + m_maxX = (wxCoord)(rPage.right - rPage.left); + m_maxY = (wxCoord)(rPage.bottom - rPage.top); return true ; } -void wxMacCarbonPrinterDC::EndDoc( wxPrinterDC* dc ) +void wxMacCarbonPrinterDC::EndDoc( wxPrinterDC* dc ) { if ( m_err ) return ; @@ -132,7 +141,7 @@ void wxMacCarbonPrinterDC::EndDoc( wxPrinterDC* dc ) m_err = PMSessionEndDocument(native->m_macPrintSession); } -void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc ) +void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc ) { if ( m_err ) return ; @@ -142,14 +151,24 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc ) m_err = PMSessionBeginPage(native->m_macPrintSession, native->m_macPageFormat, nil); - + +#if wxMAC_USE_CORE_GRAPHICS + CGContextRef pageContext; +#endif if ( m_err == noErr ) { - m_err = PMSessionGetGraphicsContext(native->m_macPrintSession, - nil, - (void**) &dc->m_macPort ); +#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 } - + if ( m_err != noErr ) { PMSessionEndPage(native->m_macPrintSession); @@ -158,19 +177,24 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc ) else { PMRect rPage; - + m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage); if ( !m_err ) { - dc->m_macLocalOrigin.x = rPage.left ; - dc->m_macLocalOrigin.y = rPage.top ; +#if wxMAC_USE_CORE_GRAPHICS + CGContextTranslateCTM( pageContext , 0 , rPage.bottom - rPage.top ) ; + 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 ; } } -void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc ) +void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc ) { if ( m_err ) return ; @@ -219,7 +243,7 @@ wxMacClassicPrinterDC::wxMacClassicPrinterDC(wxPrintData* data) m_err = PrError() ; if ( m_err != noErr ) return; - + wxMacClassicPrintData *native = (wxMacClassicPrintData*) data->m_nativePrintData ; if ( ::PrValidate( native->m_macPrintSettings ) ) @@ -246,7 +270,7 @@ wxMacClassicPrinterDC::~wxMacClassicPrinterDC() ::SetPort( LMGetWMgrPort() ) ; } -bool wxMacClassicPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSED(message) ) +bool wxMacClassicPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSED(message) ) { if ( m_err ) return false ; @@ -264,7 +288,7 @@ bool wxMacClassicPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSE return true ; } -void wxMacClassicPrinterDC::EndDoc( wxPrinterDC* dc ) +void wxMacClassicPrinterDC::EndDoc( wxPrinterDC* dc ) { if ( m_err ) return ; @@ -273,7 +297,7 @@ void wxMacClassicPrinterDC::EndDoc( wxPrinterDC* dc ) m_err = PrError() ; } -void wxMacClassicPrinterDC::StartPage( wxPrinterDC* dc ) +void wxMacClassicPrinterDC::StartPage( wxPrinterDC* dc ) { if ( m_err ) return ; @@ -291,7 +315,7 @@ void wxMacClassicPrinterDC::StartPage( wxPrinterDC* dc ) ::PrCloseDoc( m_macPrintingPort ) ; } -void wxMacClassicPrinterDC::EndPage( wxPrinterDC* dc ) +void wxMacClassicPrinterDC::EndPage( wxPrinterDC* dc ) { if ( m_err ) return ; @@ -310,17 +334,20 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata) m_printData = printdata ; m_printData.ConvertToNative() ; m_nativePrinterDC = wxNativePrinterDC::Create( &m_printData ) ; - if ( m_nativePrinterDC ) + if ( m_nativePrinterDC ) { m_ok = m_nativePrinterDC->Ok() ; - if ( !m_ok ) { wxString message ; - message.Printf( wxT("Print Error %ld"), m_nativePrinterDC->GetStatus() ) ; + message.Printf( wxT("Print Error %u"), m_nativePrinterDC->GetStatus() ) ; 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 } } @@ -329,10 +356,18 @@ wxPrinterDC::~wxPrinterDC(void) delete m_nativePrinterDC ; } -bool wxPrinterDC::StartDoc( const wxString& message ) +#if wxMAC_USE_CORE_GRAPHICS +void wxPrinterDC::MacSetCGContext( void * cg ) +{ + dynamic_cast(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") ) ; - + if ( !m_ok ) return false ; @@ -344,7 +379,7 @@ bool wxPrinterDC::StartDoc( const wxString& message ) if ( !m_ok ) { wxString message ; - message.Printf( wxT("Print Error %ld"), m_nativePrinterDC->GetStatus() ) ; + message.Printf( wxT("Print Error %u"), m_nativePrinterDC->GetStatus() ) ; wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ; dialog.ShowModal(); } @@ -352,7 +387,7 @@ bool wxPrinterDC::StartDoc( const wxString& message ) return m_ok ; } -void wxPrinterDC::EndDoc(void) +void wxPrinterDC::EndDoc(void) { if ( !m_ok ) return ; @@ -363,13 +398,13 @@ void wxPrinterDC::EndDoc(void) if ( !m_ok ) { wxString message ; - message.Printf( wxT("Print Error %ld"), m_nativePrinterDC->GetStatus() ) ; + message.Printf( wxT("Print Error %u"), m_nativePrinterDC->GetStatus() ) ; wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ; dialog.ShowModal(); } } -void wxPrinterDC::StartPage(void) +void wxPrinterDC::StartPage(void) { if ( !m_ok ) return ; @@ -384,17 +419,18 @@ void wxPrinterDC::StartPage(void) 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_ok = m_nativePrinterDC->Ok() ; - + } -void wxPrinterDC::EndPage(void) +void wxPrinterDC::EndPage(void) { if ( !m_ok ) return ;