missing include for memoryDC

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

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index 8b5eab92d532138ab3e14ca783988a8a6e3e2967..49b5ba7b2f0aa701b5f0865116c59f5a9f4b0be3 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -9,13 +9,15 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dcprint.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #pragma implementation "dcprint.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif


@@ -25,7 +27,7 @@
 
 #include "wx/dcprint.h"
 #include "wx/msgdlg.h"
 
 #include "wx/dcprint.h"
 #include "wx/msgdlg.h"

-#include <math.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"
 


@@ -47,7 +49,7 @@ public :
     // 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 ; }

-    
+

     static wxNativePrinterDC* Create(wxPrintData* data) ;
 } ;
 
     static wxNativePrinterDC* Create(wxPrintData* data) ;
 } ;
 


@@ -78,7 +80,7 @@ wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data )
 
     m_err = noErr ;
     wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) data->m_nativePrintData ;
 
     m_err = noErr ;
     wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) data->m_nativePrintData ;

-    
+

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


@@ -99,15 +101,24 @@ wxNativePrinterDC* wxNativePrinterDC::Create(wxPrintData* data)
     return new wxMacCarbonPrinterDC(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 ( 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,
     m_err = PMSessionBeginDocument(native->m_macPrintSession,

-              native->m_macPrintSettings, 
+              native->m_macPrintSettings,

               native->m_macPageFormat);
     if ( m_err != noErr )
         return false;
               native->m_macPageFormat);
     if ( m_err != noErr )
         return false;


@@ -117,12 +128,12 @@ bool wxMacCarbonPrinterDC::StartDoc(  wxPrinterDC* dc , const wxString& WXUNUSED
     if ( m_err != noErr )
         return false;
 
     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 ;
 }
 
     return true ;
 }
 

-void wxMacCarbonPrinterDC::EndDoc( wxPrinterDC* dc ) 
+void wxMacCarbonPrinterDC::EndDoc( wxPrinterDC* dc )

 {
     if ( m_err )
         return ;
 {
     if ( m_err )
         return ;


@@ -132,7 +143,7 @@ void wxMacCarbonPrinterDC::EndDoc( wxPrinterDC* dc )
     m_err = PMSessionEndDocument(native->m_macPrintSession);
 }
 
     m_err = PMSessionEndDocument(native->m_macPrintSession);
 }
 

-void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc ) 
+void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )

 {
     if ( m_err )
         return ;
 {
     if ( m_err )
         return ;


@@ -142,14 +153,24 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
     m_err = PMSessionBeginPage(native->m_macPrintSession,
                  native->m_macPageFormat,
                  nil);
     m_err = PMSessionBeginPage(native->m_macPrintSession,
                  native->m_macPageFormat,
                  nil);

-    
+
+#if wxMAC_USE_CORE_GRAPHICS
+    CGContextRef pageContext;
+#endif

     if ( m_err == noErr )
     {
     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);
     if ( m_err != noErr )
     {
         PMSessionEndPage(native->m_macPrintSession);


@@ -158,19 +179,24 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
     else
     {
         PMRect rPage;
     else
     {
         PMRect rPage;

-        
+

         m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
         if ( !m_err )
         {
         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 ;
     }
 }
 
         }
         // 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 ;
 {
     if ( m_err )
         return ;


@@ -219,7 +245,7 @@ wxMacClassicPrinterDC::wxMacClassicPrinterDC(wxPrintData* data)
     m_err = PrError() ;
     if ( m_err != noErr )
         return;
     m_err = PrError() ;
     if ( m_err != noErr )
         return;

-    
+

     wxMacClassicPrintData *native = (wxMacClassicPrintData*) data->m_nativePrintData ;
 
     if ( ::PrValidate( native->m_macPrintSettings ) )
     wxMacClassicPrintData *native = (wxMacClassicPrintData*) data->m_nativePrintData ;
 
     if ( ::PrValidate( native->m_macPrintSettings ) )


@@ -246,7 +272,7 @@ wxMacClassicPrinterDC::~wxMacClassicPrinterDC()
     ::SetPort( LMGetWMgrPort() ) ;
 }
 
     ::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 ;
 {
     if ( m_err )
         return false ;


@@ -264,7 +290,7 @@ bool wxMacClassicPrinterDC::StartDoc(  wxPrinterDC* dc , const wxString& WXUNUSE
     return true ;
 }
 
     return true ;
 }
 

-void wxMacClassicPrinterDC::EndDoc( wxPrinterDC* dc ) 
+void wxMacClassicPrinterDC::EndDoc( wxPrinterDC* dc )

 {
     if ( m_err )
         return ;
 {
     if ( m_err )
         return ;


@@ -273,7 +299,7 @@ void wxMacClassicPrinterDC::EndDoc( wxPrinterDC* dc )
     m_err = PrError() ;
 }
 
     m_err = PrError() ;
 }
 

-void wxMacClassicPrinterDC::StartPage( wxPrinterDC* dc ) 
+void wxMacClassicPrinterDC::StartPage( wxPrinterDC* dc )

 {
     if ( m_err )
         return ;
 {
     if ( m_err )
         return ;


@@ -291,7 +317,7 @@ void wxMacClassicPrinterDC::StartPage( wxPrinterDC* dc )
         ::PrCloseDoc( m_macPrintingPort ) ;
 }
 
         ::PrCloseDoc( m_macPrintingPort ) ;
 }
 

-void wxMacClassicPrinterDC::EndPage( wxPrinterDC* dc ) 
+void wxMacClassicPrinterDC::EndPage( wxPrinterDC* dc )

 {
     if ( m_err )
         return ;
 {
     if ( m_err )
         return ;


@@ -310,17 +336,20 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
     m_printData = printdata ;
     m_printData.ConvertToNative() ;
     m_nativePrinterDC = wxNativePrinterDC::Create( &m_printData ) ;
     m_printData = printdata ;
     m_printData.ConvertToNative() ;
     m_nativePrinterDC = wxNativePrinterDC::Create( &m_printData ) ;

-    if ( m_nativePrinterDC ) 
+    if ( m_nativePrinterDC )

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

-        

         if ( !m_ok )
         {
             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();
         }
             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 +358,18 @@ wxPrinterDC::~wxPrinterDC(void)
     delete m_nativePrinterDC ;
 }
 
     delete m_nativePrinterDC ;
 }
 

-bool wxPrinterDC::StartDoc( const wxString& message ) 
+#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") ) ;
 {
     wxASSERT_MSG( Ok() , wxT("Called wxPrinterDC::StartDoc from an invalid object") ) ;

-    
+

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


@@ -344,7 +381,7 @@ bool wxPrinterDC::StartDoc( const wxString& message )
     if ( !m_ok )
     {
         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();
     }
         wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
         dialog.ShowModal();
     }


@@ -352,7 +389,7 @@ bool wxPrinterDC::StartDoc( const wxString& message )
     return m_ok ;
 }
 
     return m_ok ;
 }
 

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

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


@@ -363,13 +400,13 @@ void wxPrinterDC::EndDoc(void)
     if ( !m_ok )
     {
         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();
     }
 }
 
         wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
         dialog.ShowModal();
     }
 }
 

-void wxPrinterDC::StartPage(void) 
+void wxPrinterDC::StartPage(void)

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


@@ -384,17 +421,18 @@ 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 ;
     m_macFontInstalled = false ;
     m_macBrushInstalled = false ;
     m_macPenInstalled = false ;

+#endif

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

-        
+

 }
 
 }
 

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

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


@@ -413,4 +451,4 @@ void wxPrinterDC::DoGetSize(int *width, int *height) const
         * height = m_nativePrinterDC->GetMaxY() ;
 }
 
         * height = m_nativePrinterDC->GetMaxY() ;
 }
 

-
+#endif