removed broken and global GetLine() function from wx/protocol/protocol.h; there's...

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

diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index 11df02ce13cd19313e11449cc23ce9db0b0a5ec3..fbcae56a5583590ebbc8fc34540b3b0758846a8c 100644 (file)
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -23,16 +23,17 @@
     #include "wx/dc.h"
     #include "wx/app.h"
     #include "wx/msgdlg.h"
     #include "wx/dc.h"
     #include "wx/app.h"
     #include "wx/msgdlg.h"

+    #include "wx/dcprint.h"
+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/math.h"

 #include "wx/mac/uma.h"
 
 #include "wx/mac/printmac.h"
 #include "wx/mac/private/print.h"
 
 #include "wx/mac/uma.h"
 
 #include "wx/mac/printmac.h"
 #include "wx/mac/private/print.h"
 

-#include "wx/dcprint.h"

 #include "wx/printdlg.h"
 #include "wx/printdlg.h"

+#include "wx/paper.h"

 #include "wx/mac/printdlg.h"
 
 #include <stdlib.h>
 #include "wx/mac/printdlg.h"
 
 #include <stdlib.h>


@@ -41,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMacCarbonPrintData, wxPrintNativeDataBase)
 IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase)
 
 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);
 }
 {
     return (m_macPageFormat != kPMNoPageFormat) && (m_macPrintSettings != kPMNoPrintSettings) && (m_macPrintSession != kPMNoReference);
 }


@@ -130,13 +131,18 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
 {
     ValidateOrCreate() ;
     PMSetCopies( (PMPrintSettings) m_macPrintSettings , data.GetNoCopies() , false ) ;
 {
     ValidateOrCreate() ;
     PMSetCopies( (PMPrintSettings) m_macPrintSettings , data.GetNoCopies() , false ) ;

-    PMSetOrientation( (PMPageFormat) m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
-        kPMLandscape : kPMPortrait , false ) ;
+    if ( data.IsOrientationReversed() )
+        PMSetOrientation( (PMPageFormat) m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
+            kPMReverseLandscape : kPMReversePortrait , false ) ;
+    else
+        PMSetOrientation( (PMPageFormat) m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
+            kPMLandscape : kPMPortrait , false ) ;

     // collate cannot be set
 #if 0 // not yet tested
     if ( !m_printerName.empty() )
         PMSessionSetCurrentPrinter( (PMPrintSession) m_macPrintSession , wxMacCFStringHolder( m_printerName , wxFont::GetDefaultEncoding() ) ) ;
 #endif
     // collate cannot be set
 #if 0 // not yet tested
     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() )
     PMColorMode color ;
     PMGetColorMode(  (PMPrintSettings) m_macPrintSettings, &color ) ;
     if ( data.GetColour() )


@@ -146,16 +152,48 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
     }
     else
         PMSetColorMode( (PMPrintSettings) m_macPrintSettings, kPMBlackAndWhite ) ;
     }
     else
         PMSetColorMode( (PMPrintSettings) m_macPrintSettings, kPMBlackAndWhite ) ;

+#endif

 
 

-    // PMDuplexMode not yet accessible via API
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+    if ( PMSetDuplex!=NULL )
+    {
+        PMDuplexMode mode = 0 ;
+        switch( data.GetDuplex() )
+        {
+            case wxDUPLEX_HORIZONTAL :
+                mode = kPMDuplexNoTumble ;
+                break ;
+            case wxDUPLEX_VERTICAL :
+                mode = kPMDuplexTumble ;
+                break ;
+            case wxDUPLEX_SIMPLEX :
+            default :
+                mode = kPMDuplexNone ;
+                break ;
+        }
+        PMSetDuplex( (PMPrintSettings) m_macPrintSettings, mode ) ;
+    }
+#endif

     // PMQualityMode not yet accessible via API
     // todo paperSize
     // PMQualityMode not yet accessible via API
     // todo paperSize

+

     PMResolution res;
     PMPrinter printer;
     PMResolution res;
     PMPrinter printer;

-    PMTag tag = kPMMaxSquareResolution;

     PMSessionGetCurrentPrinter(m_macPrintSession, &printer);
     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);
     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 ;
 }
 
     return true ;
 }


@@ -174,9 +212,15 @@ bool wxMacCarbonPrintData::TransferTo( wxPrintData &data )
     if ( err == noErr )
     {
         if ( orientation == kPMPortrait || orientation == kPMReversePortrait )
     if ( err == noErr )
     {
         if ( orientation == kPMPortrait || orientation == kPMReversePortrait )

+        {

             data.SetOrientation( wxPORTRAIT  );
             data.SetOrientation( wxPORTRAIT  );

+            data.SetOrientationReversed( orientation == kPMReversePortrait );
+        }

         else
         else

+        {

             data.SetOrientation( wxLANDSCAPE );
             data.SetOrientation( wxLANDSCAPE );

+            data.SetOrientationReversed( orientation == kPMReverseLandscape );
+        }

     }
 
     // collate cannot be set
     }
 
     // collate cannot be set


@@ -190,21 +234,49 @@ bool wxMacCarbonPrintData::TransferTo( wxPrintData &data )
     }
 #endif
 
     }
 #endif
 

+#ifndef __LP64__

     PMColorMode color ;
     err = PMGetColorMode( m_macPrintSettings, &color ) ;
     if ( err == noErr )
         data.SetColour( !(color == kPMBlackAndWhite) ) ;
     PMColorMode color ;
     err = PMGetColorMode( m_macPrintSettings, &color ) ;
     if ( err == noErr )
         data.SetColour( !(color == kPMBlackAndWhite) ) ;

-
-    // PMDuplexMode not yet accessible via API
+#endif
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+    if ( PMGetDuplex!=NULL )
+    {
+        PMDuplexMode mode = 0 ;
+        PMGetDuplex( (PMPrintSettings) m_macPrintSettings, &mode ) ;
+        switch( mode )
+        {
+            case kPMDuplexNoTumble :
+                data.SetDuplex(wxDUPLEX_HORIZONTAL);
+                break ;
+            case kPMDuplexTumble :
+                data.SetDuplex(wxDUPLEX_VERTICAL);
+                break ;
+            case kPMDuplexNone :
+            default :
+                data.SetDuplex(wxDUPLEX_SIMPLEX);
+                break ;
+        }
+    }
+#endif

     // PMQualityMode not yet accessible via API
     // PMQualityMode not yet accessible via API

-    // todo paperSize
+    
+    PMPaper paper ;
+    PMGetPageFormatPaper( m_macPageFormat, &paper );
+    

     PMRect rPaper;
     err = PMGetUnadjustedPaperRect( m_macPageFormat, &rPaper);
     if ( err == noErr )
     {
     PMRect rPaper;
     err = PMGetUnadjustedPaperRect( m_macPageFormat, &rPaper);
     if ( err == noErr )
     {

-        data.SetPaperSize( wxSize (
-            (int)(( rPaper.right - rPaper.left ) * pt2mm + 0.5 ) ,
-             (int)(( rPaper.bottom - rPaper.top ) * pt2mm + 0.5 ) ) );
+        wxSize sz((int)(( rPaper.right - rPaper.left ) * pt2mm + 0.5 ) ,
+             (int)(( rPaper.bottom - rPaper.top ) * pt2mm + 0.5 ));
+        data.SetPaperSize(sz);
+        wxPaperSize id = wxThePrintPaperDatabase->GetSize(wxSize(sz.x* 10, sz.y * 10));
+        if (id != wxPAPER_NONE)
+        {
+            data.SetPaperId(id);
+        }

     }
     return true ;
 }
     }
     return true ;
 }


@@ -222,6 +294,10 @@ void wxMacCarbonPrintData::TransferTo( wxPageSetupData* data )
     OSStatus err = PMGetUnadjustedPaperRect(m_macPageFormat, &rPaper);
     if ( err == noErr )
     {
     OSStatus err = PMGetUnadjustedPaperRect(m_macPageFormat, &rPaper);
     if ( err == noErr )
     {

+        wxSize sz((int)(( rPaper.right - rPaper.left ) * pt2mm + 0.5 ) ,
+             (int)(( rPaper.bottom - rPaper.top ) * pt2mm + 0.5 ));
+        data->SetPaperSize(sz);
+

         PMRect rPage ;
         err = PMGetUnadjustedPageRect(m_macPageFormat , &rPage ) ;
         if ( err == noErr )
         PMRect rPage ;
         err = PMGetUnadjustedPageRect(m_macPageFormat , &rPage ) ;
         if ( err == noErr )


@@ -319,13 +395,14 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
         m_printDialogData.SetMaxPage(9999);
 
     // Create a suitable device context
         m_printDialogData.SetMaxPage(9999);
 
     // Create a suitable device context

-    wxDC *dc = NULL;
+    wxPrinterDC *dc = NULL;

     if (prompt)
     {
     if (prompt)
     {

-        wxPrintDialog dialog(parent, & m_printDialogData);
+        wxMacPrintDialog dialog(parent, & m_printDialogData);

         if (dialog.ShowModal() == wxID_OK)
         {
         if (dialog.ShowModal() == wxID_OK)
         {

-            dc = dialog.GetPrintDC();
+            dc = wxDynamicCast(dialog.GetPrintDC(), wxPrinterDC);
+            wxASSERT(dc);

             m_printDialogData = dialog.GetPrintDialogData();
         }
     }
             m_printDialogData = dialog.GetPrintDialogData();
         }
     }


@@ -347,18 +424,25 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
     PMResolution res;
     wxMacCarbonPrintData* nativeData = (wxMacCarbonPrintData*)
           (m_printDialogData.GetPrintData().GetNativeData());
     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);
     PMGetResolution((PMPageFormat) (nativeData->m_macPageFormat), &res);

+#endif

     printout->SetPPIPrinter(int(res.hRes), int(res.vRes));
 
     // Set printout parameters
     printout->SetDC(dc);
 
     int w, h;
     printout->SetPPIPrinter(int(res.hRes), int(res.vRes));
 
     // Set printout parameters
     printout->SetDC(dc);
 
     int w, h;

-    wxCoord ww, hh;

     dc->GetSize(&w, &h);
     printout->SetPageSizePixels((int)w, (int)h);
     dc->GetSize(&w, &h);
     printout->SetPageSizePixels((int)w, (int)h);

-    dc->GetSizeMM(&ww, &hh);
-    printout->SetPageSizeMM((int)ww, (int)hh);
+    printout->SetPaperRectPixels(dc->GetPaperRect());
+    wxCoord mw, mh;
+    dc->GetSizeMM(&mw, &mh);
+    printout->SetPageSizeMM((int)mw, (int)mh);

 
     // Create an abort window
     wxBeginBusyCursor();
 
     // Create an abort window
     wxBeginBusyCursor();


@@ -429,10 +513,14 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
                 if ( UMAGetSystemVersion() >= 0x1000 )
 #endif
                 {
                 if ( UMAGetSystemVersion() >= 0x1000 )
 #endif
                 {

+#if !wxMAC_USE_CORE_GRAPHICS

                     GrafPtr thePort ;
                     GetPort( &thePort ) ;
                     GrafPtr thePort ;
                     GetPort( &thePort ) ;

+#endif

                     wxSafeYield(win,true);
                     wxSafeYield(win,true);

+#if !wxMAC_USE_CORE_GRAPHICS

                     SetPort( thePort ) ;
                     SetPort( thePort ) ;

+#endif

                 }
                 dc->StartPage();
                 keepGoing = printout->OnPrintPage(pn);
                 }
                 dc->StartPage();
                 keepGoing = printout->OnPrintPage(pn);


@@ -527,38 +615,46 @@ void wxMacPrintPreview::DetermineScaling(void)
     int screenWidth , screenHeight ;
     wxDisplaySize( &screenWidth , &screenHeight ) ;
 
     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 ) ;
+    
+    // Note that with Leopard, screen dpi=72 is no longer a given
+    m_previewPrintout->SetPPIScreen( ppiScreen.x , ppiScreen.y ) ;
+    
+    wxCoord w , h ;
+    wxCoord ww, hh;
+    wxRect paperRect;

 
     // Get a device context for the currently selected printer
     wxPrinterDC printerDC(m_printDialogData.GetPrintData());
     if (printerDC.Ok())
     {
 
     // 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.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 ;
+        printerDC.GetSize( &w , &h ) ;
+        ppiPrinter = printerDC.GetPPI() ;
+        paperRect = printerDC.GetPaperRect();

         m_isOk = true ;
     }
     else
     {
         m_isOk = true ;
     }
     else
     {

+        // use some defaults
+        w = 8 * 72 ;
+        h = 11 * 72 ;
+        ww = (wxCoord) (w * 25.4 / ppiPrinter.x) ;
+        hh = (wxCoord) (h * 25.4 / ppiPrinter.y) ;
+        paperRect = wxRect(0, 0, w, h);

         m_isOk = false ;
     }
         m_isOk = false ;
     }

-
-    // 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_pageWidth = w;
+    m_pageHeight = h;
+    
+    m_previewPrintout->SetPageSizePixels(w , h) ;
+    m_previewPrintout->SetPageSizeMM(ww, hh);
+    m_previewPrintout->SetPaperRectPixels(paperRect);
+    m_previewPrintout->SetPPIPrinter( ppiPrinter.x , ppiPrinter.y ) ;
+
+    m_previewScaleX = float(ppiScreen.x) / ppiPrinter.x;
+    m_previewScaleY = float(ppiScreen.y) / ppiPrinter.y;

 }
 
 #endif
 }
 
 #endif