#include "wx/mac/private/print.h"
#include "wx/printdlg.h"
+#include "wx/paper.h"
#include "wx/mac/printdlg.h"
#include <stdlib.h>
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);
}
{
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
+#ifndef __LP64__
PMColorMode color ;
PMGetColorMode( (PMPrintSettings) m_macPrintSettings, &color ) ;
if ( data.GetColour() )
}
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
+
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,
if ( err == noErr )
{
if ( orientation == kPMPortrait || orientation == kPMReversePortrait )
+ {
data.SetOrientation( wxPORTRAIT );
+ data.SetOrientationReversed( orientation == kPMReversePortrait );
+ }
else
+ {
data.SetOrientation( wxLANDSCAPE );
+ data.SetOrientationReversed( orientation == kPMReverseLandscape );
+ }
}
// collate cannot be set
}
#endif
+#ifndef __LP64__
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
- // todo paperSize
+
+ PMPaper paper ;
+ PMGetPageFormatPaper( m_macPageFormat, &paper );
+
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 ;
}
-void wxMacCarbonPrintData::TransferFrom( wxPageSetupData *data )
+void wxMacCarbonPrintData::TransferFrom( wxPageSetupData *WXUNUSED(data) )
{
// should we setup the page rect here ?
// since MacOS sometimes has two same paper rects with different
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 )
m_printDialogData.SetMaxPage(9999);
// Create a suitable device context
- wxDC *dc = NULL;
+ wxPrinterDC *dc = NULL;
if (prompt)
{
- wxPrintDialog dialog(parent, & m_printDialogData);
+ wxMacPrintDialog dialog(parent, & m_printDialogData);
if (dialog.ShowModal() == wxID_OK)
{
- dc = dialog.GetPrintDC();
+ dc = wxDynamicCast(dialog.GetPrintDC(), wxPrinterDC);
+ wxASSERT(dc);
m_printDialogData = dialog.GetPrintDialogData();
}
}
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
printout->SetDC(dc);
int w, h;
- wxCoord ww, hh;
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();
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);
return dc;
}
-bool wxMacPrinter::Setup(wxWindow *parent)
+bool wxMacPrinter::Setup(wxWindow *WXUNUSED(parent))
{
#if 0
wxPrintDialog dialog(parent, & m_printDialogData);
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 ) ;
- int x , 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())
{
printerDC.GetSizeMM(&ww, &hh);
- printerDC.GetSize( &x , &y ) ;
+ printerDC.GetSize( &w , &h ) ;
ppiPrinter = printerDC.GetPPI() ;
+ paperRect = printerDC.GetPaperRect();
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) ;
+ 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_previewPrintout->SetPageSizeMM((int)ww, (int)hh);
- m_previewPrintout->SetPageSizePixels( x , y) ;
- m_pageWidth = x ;
- m_pageHeight = y ;
+ 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_previewScale = (float)((float)ppiScreen.x/(float)ppiPrinter.y);
+ m_previewScaleX = float(ppiScreen.x) / ppiPrinter.x;
+ m_previewScaleY = float(ppiScreen.y) / ppiPrinter.y;
}
#endif
projects / wxWidgets.git / blobdiff