on demand creation of native CGContexts , so that pure text measuring contexts don...

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

diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index 9ce3354d4692bc6fc019c87aef19ff4a4321814b..9d695cd4d242d937405edc54d23c8054e636f0fa 100644 (file)
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -24,9 +24,9 @@
     #include "wx/app.h"
     #include "wx/msgdlg.h"
     #include "wx/dcprint.h"
+    #include "wx/math.h"
 #endif
 
-#include "wx/math.h"
 #include "wx/mac/uma.h"
 
 #include "wx/mac/printmac.h"
@@ -41,7 +41,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMacCarbonPrintData, wxPrintNativeDataBase)
 IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase)
 
-bool wxMacCarbonPrintData::Ok() const
+bool wxMacCarbonPrintData::IsOk() const
 {
     return (m_macPageFormat != kPMNoPageFormat) && (m_macPrintSettings != kPMNoPrintSettings) && (m_macPrintSession != kPMNoReference);
 }
@@ -137,6 +137,7 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
     if ( !m_printerName.empty() )
         PMSessionSetCurrentPrinter( (PMPrintSession) m_macPrintSession , wxMacCFStringHolder( m_printerName , wxFont::GetDefaultEncoding() ) ) ;
 #endif
+#ifndef __LP64__
     PMColorMode color ;
     PMGetColorMode(  (PMPrintSettings) m_macPrintSettings, &color ) ;
     if ( data.GetColour() )
@@ -146,16 +147,29 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
     }
     else
         PMSetColorMode( (PMPrintSettings) m_macPrintSettings, kPMBlackAndWhite ) ;
+#endif
 
     // PMDuplexMode not yet accessible via API
     // PMQualityMode not yet accessible via API
     // todo paperSize
+
     PMResolution res;
     PMPrinter printer;
-    PMTag tag = kPMMaxSquareResolution;
     PMSessionGetCurrentPrinter(m_macPrintSession, &printer);
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
+    PMPrinterGetOutputResolution( printer,  
+        (PMPrintSettings) m_macPrintSettings,  &res) ;
+    // TODO transfer ? into page format ?
+#else
+    PMTag tag = kPMMaxSquareResolution;
     PMPrinterGetPrinterResolution(printer, tag, &res);
     PMSetResolution((PMPageFormat) m_macPageFormat, &res);
+#endif
+    // after setting the new resolution the format has to be updated, otherwise the page rect remains 
+    // at the 'old' scaling
+    PMSessionValidatePageFormat((PMPrintSession) m_macPrintSession,
+            (PMPageFormat) m_macPageFormat,
+            kPMDontWantBoolean) ;
 
     return true ;
 }
@@ -190,11 +204,12 @@ bool wxMacCarbonPrintData::TransferTo( wxPrintData &data )
     }
 #endif
 
+#ifndef __LP64__
     PMColorMode color ;
     err = PMGetColorMode( m_macPrintSettings, &color ) ;
     if ( err == noErr )
         data.SetColour( !(color == kPMBlackAndWhite) ) ;
-
+#endif
     // PMDuplexMode not yet accessible via API
     // PMQualityMode not yet accessible via API
     // todo paperSize
@@ -347,7 +362,13 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
     PMResolution res;
     wxMacCarbonPrintData* nativeData = (wxMacCarbonPrintData*)
           (m_printDialogData.GetPrintData().GetNativeData());
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
+    PMPrinter printer;
+    PMSessionGetCurrentPrinter(nativeData->m_macPrintSession, &printer);
+    PMPrinterGetOutputResolution( printer, nativeData->m_macPrintSettings, &res) ;
+#else
     PMGetResolution((PMPageFormat) (nativeData->m_macPageFormat), &res);
+#endif
     printout->SetPPIPrinter(int(res.hRes), int(res.vRes));
 
     // Set printout parameters
@@ -429,10 +450,14 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
                 if ( UMAGetSystemVersion() >= 0x1000 )
 #endif
                 {
+#if !wxMAC_USE_CORE_GRAPHICS
                     GrafPtr thePort ;
                     GetPort( &thePort ) ;
+#endif
                     wxSafeYield(win,true);
+#if !wxMAC_USE_CORE_GRAPHICS
                     SetPort( thePort ) ;
+#endif
                 }
                 dc->StartPage();
                 keepGoing = printout->OnPrintPage(pn);
@@ -527,38 +552,39 @@ void wxMacPrintPreview::DetermineScaling(void)
     int screenWidth , screenHeight ;
     wxDisplaySize( &screenWidth , &screenHeight ) ;
 
-    m_previewPrintout->SetPPIScreen( 72 , 72 ) ;
-    m_previewPrintout->SetPPIPrinter( 72 , 72 ) ;
-    m_previewPrintout->SetPageSizeMM( (int) (8.0 * 25.6), (int) (11.0 * 25.6) );
-    m_previewPrintout->SetPageSizePixels( 8 * 72 , 11 * 72 ) ;
-    m_pageWidth = 8 * 72 ;
-    m_pageHeight = 11 * 72 ;
-    m_previewScale = 1 ;
+    wxSize ppiScreen( 72 , 72 ) ;
+    wxSize ppiPrinter( 72 , 72 ) ;
+    
+    m_previewPrintout->SetPPIScreen( ppiScreen.x , ppiScreen.y ) ;
+    
+    int x , y ;
+    wxCoord ww, hh;
 
     // Get a device context for the currently selected printer
     wxPrinterDC printerDC(m_printDialogData.GetPrintData());
     if (printerDC.Ok())
     {
-        int x , y ;
-        wxCoord ww, hh;
         printerDC.GetSizeMM(&ww, &hh);
         printerDC.GetSize( &x , &y ) ;
-        m_previewPrintout->SetPageSizeMM((int)ww, (int)hh);
-        m_previewPrintout->SetPageSizePixels( x , y) ;
-        m_pageWidth = x ;
-        m_pageHeight =  y ;
+        ppiPrinter = printerDC.GetPPI() ;
         m_isOk = true ;
     }
     else
     {
+        // use some defaults
+        x = 8 * 72 ;
+        y = 11 * 72 ;
+        ww = (int) (x * 25.4 / ppiPrinter.x) ;
+        hh = (int) (y * 25.4 / ppiPrinter.y) ;
         m_isOk = false ;
     }
+    m_previewPrintout->SetPageSizeMM((int)ww, (int)hh);
+    m_previewPrintout->SetPageSizePixels( x , y) ;
+    m_pageWidth = x ;
+    m_pageHeight = y ;
+    m_previewPrintout->SetPPIPrinter( ppiPrinter.x , ppiPrinter.y ) ;
 
-    // At 100%, the page should look about page-size on the screen.
-    // m_previewScale = (float)((float)screenWidth/(float)printerWidth);
-    // m_previewScale = m_previewScale * (float)((float)screenXRes/(float)printerXRes);
-
-    m_previewScale = 1 ;
+    m_previewScale = (float)((float)ppiScreen.x/(float)ppiPrinter.y);
 }
 
 #endif