#include "wx/mac/private/print.h"
#include "wx/printdlg.h"
+#include "wx/paper.h"
#include "wx/mac/printdlg.h"
#include <stdlib.h>
{
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() ) ) ;
+ PMSessionSetCurrentPrinter( (PMPrintSession) m_macPrintSession , wxCFStringRef( m_printerName , wxFont::GetDefaultEncoding() ) ) ;
#endif
#ifndef __LP64__
PMColorMode color ;
PMSetColorMode( (PMPrintSettings) m_macPrintSettings, kPMBlackAndWhite ) ;
#endif
- // PMDuplexMode not yet accessible via API
+ 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 ) ;
+
// PMQualityMode not yet accessible via API
// todo paperSize
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
#if 0
{
- wxMacCFStringHolder name ;
+ wxCFStringRef name ;
PMPrinter printer ;
PMSessionGetCurrentPrinter( m_macPrintSession ,
&printer ) ;
if ( err == noErr )
data.SetColour( !(color == kPMBlackAndWhite) ) ;
#endif
- // PMDuplexMode not yet accessible via API
+ 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 ;
+ }
// 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 )
}
// May have pressed cancel.
- if (!dc || !dc->Ok())
+ if (!dc || !dc->IsOk())
{
if (dc)
delete dc;
}
else
{
-#if TARGET_CARBON
- 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
- }
+ wxSafeYield(win,true);
dc->StartPage();
keepGoing = printout->OnPrintPage(pn);
dc->EndPage();
return dc;
}
-bool wxMacPrinter::Setup(wxWindow *parent)
+bool wxMacPrinter::Setup(wxWindow *WXUNUSED(parent))
{
#if 0
wxPrintDialog dialog(parent, & m_printDialogData);
// Get a device context for the currently selected printer
wxPrinterDC printerDC(m_printDialogData.GetPrintData());
- if (printerDC.Ok())
+ if (printerDC.IsOk())
{
printerDC.GetSizeMM(&ww, &hh);
printerDC.GetSize( &w , &h ) ;