check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index 58b2eb7a1327e5003afa6e052cea49d37b8669e7..10c79a07eff7e1d71be425c5943e23757b0861f2 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -27,9 +27,10 @@
 
 #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"
 
 #include "wx/graphics.h"
 

-IMPLEMENT_CLASS(wxPrinterDC, wxDC)
+IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxGCDCImpl)

 
 class wxNativePrinterDC
 {
 
 class wxNativePrinterDC
 {


@@ -63,9 +64,6 @@ public :
     virtual void GetSize( int *w , int *h) const ;
     virtual wxSize GetPPI() const ;
 private :
     virtual void GetSize( int *w , int *h) const ;
     virtual wxSize GetPPI() const ;
 private :

-#if !wxMAC_USE_CORE_GRAPHICS
-    GrafPtr m_macPrintFormerPort ;
-#endif

     wxCoord m_maxX ;
     wxCoord m_maxY ;
     wxSize  m_ppi ;
     wxCoord m_maxX ;
     wxCoord m_maxY ;
     wxSize  m_ppi ;


@@ -74,9 +72,6 @@ private :
 
 wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data )
 {
 
 wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data )
 {

-#if !wxMAC_USE_CORE_GRAPHICS
-    ::GetPort( & m_macPrintFormerPort ) ;
-#endif

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


@@ -101,10 +96,6 @@ wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data )
 
 wxMacCarbonPrinterDC::~wxMacCarbonPrinterDC()
 {
 
 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

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


@@ -117,27 +108,12 @@ bool wxMacCarbonPrinterDC::StartDoc(  wxPrinterDC* dc , const wxString& WXUNUSED
     if ( m_err )
         return false ;
 
     if ( m_err )
         return false ;
 

-    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ;
+    wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
+    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->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
-    m_err = PMSessionBeginDocument(native->m_macPrintSession,
+    m_err = PMSessionBeginCGDocumentNoDialog(native->m_macPrintSession,

               native->m_macPrintSettings,
               native->m_macPrintSettings,

-              native->m_macPageFormat);
-
-#endif
-
+              native->m_macPageFormat);    

     if ( m_err != noErr )
         return false;
 
     if ( m_err != noErr )
         return false;
 


@@ -150,13 +126,22 @@ bool wxMacCarbonPrinterDC::StartDoc(  wxPrinterDC* dc , const wxString& WXUNUSED
     m_maxY = wxCoord(rPage.bottom - rPage.top);
 
     PMResolution res;
     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);
+#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) ;
+    }
+    else
+#endif
+    {
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 
+       m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res);

 #endif
 #endif

+    }
+

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


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

-    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ;
+    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 )


@@ -176,38 +162,25 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
     if ( m_err )
         return ;
 
     if ( m_err )
         return ;
 

-    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ;
+    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
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4

         m_err = PMSessionGetCGGraphicsContext(native->m_macPrintSession,
                                             &pageContext );
         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

     }
 
     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
     {


@@ -216,24 +189,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

             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 ) ;
             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
-            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 ;
     }

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

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


@@ -241,17 +207,16 @@ void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc )
     if ( m_err )
         return ;
 
     if ( m_err )
         return ;
 

-    wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) dc->GetPrintData().GetNativeData() ;
+    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);

     }
     }

-#if wxMAC_USE_CORE_GRAPHICS

     // the cg context we got when starting the page isn't valid anymore, so replace it
     // the cg context we got when starting the page isn't valid anymore, so replace it

-    dc->SetGraphicsContext( wxGraphicsContext::Create() );
-#endif
+    impl->SetGraphicsContext( wxGraphicsContext::Create() );

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


@@ -271,7 +236,8 @@ wxSize wxMacCarbonPrinterDC::GetPPI() const
 //
 //
 
 //
 //
 

-wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
+wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printdata )
+   : wxGCDCImpl( owner )

 {
     m_ok = false ;
     m_printData = printdata ;
 {
     m_ok = false ;
     m_printData = printdata ;


@@ -293,32 +259,30 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
             m_mm_to_pix_x = mm2inches * sz.x;
             m_mm_to_pix_y = mm2inches * sz.y;        
         }
             m_mm_to_pix_x = mm2inches * sz.x;
             m_mm_to_pix_y = mm2inches * sz.y;        
         }

-#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() );
         // we need at least a measuring context because people start measuring before a page
         // gets printed at all
         SetGraphicsContext( wxGraphicsContext::Create() );

-#endif

     }
 }
 
     }
 }
 

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

 {
     return m_nativePrinterDC->GetPPI() ;
 }
 
 {
     return m_nativePrinterDC->GetPPI() ;
 }
 

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

 {
     delete m_nativePrinterDC ;
 }
 
 {
     delete m_nativePrinterDC ;
 }
 

-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
     }


@@ -334,12 +298,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 )


@@ -351,10 +315,10 @@ void wxPrinterDC::EndDoc(void)
     }
 }
 
     }
 }
 

-wxRect wxPrinterDC::GetPaperRect()
+wxRect wxPrinterDCImpl::GetPaperRect()

 {
     wxCoord w, h;
 {
     wxCoord w, h;

-    GetSize(&w, &h);
+    GetOwner()->GetSize(&w, &h);

     wxRect pageRect(0, 0, w, h);
     wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) m_printData.GetNativeData() ;
     OSStatus err = noErr ;
     wxRect pageRect(0, 0, w, h);
     wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) m_printData.GetNativeData() ;
     OSStatus err = noErr ;


@@ -366,7 +330,7 @@ wxRect wxPrinterDC::GetPaperRect()
         wxCoord(rPaper.right - rPaper.left), wxCoord(rPaper.bottom - rPaper.top));
 }
 
         wxCoord(rPaper.right - rPaper.left), wxCoord(rPaper.bottom - rPaper.top));
 }
 

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

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


@@ -381,27 +345,22 @@ 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") );
     m_nativePrinterDC->GetSize(width,  height ) ;
 {
     wxCHECK_RET( m_ok , _T("GetSize() doesn't work without a valid wxPrinterDC") );
     m_nativePrinterDC->GetSize(width,  height ) ;