wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data )
{
m_err = noErr ;
- wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) data->GetNativeData() ;
+ wxOSXPrintData *native = (wxOSXPrintData*) data->GetNativeData() ;
PMRect rPage;
- m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
+ m_err = PMGetAdjustedPageRect(native->GetPageFormat(), &rPage);
if ( m_err != noErr )
return;
if ( PMPrinterGetOutputResolution != NULL )
{
PMPrinter printer;
- m_err = PMSessionGetCurrentPrinter(native->m_macPrintSession, &printer);
+ m_err = PMSessionGetCurrentPrinter(native->GetPrintSession(), &printer);
if ( m_err == noErr )
{
- m_err = PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ;
+ m_err = PMPrinterGetOutputResolution( printer, native->GetPrintSettings(), &res) ;
if ( m_err == -9589 /* kPMKeyNotFound */ )
{
m_err = noErr ;
#endif
{
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
- m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res);
+ m_err = PMGetResolution((PMPageFormat) (native->GetPageFormat()), &res);
#endif
}
return false ;
wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
- wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->GetPrintData().GetNativeData() ;
+ wxOSXPrintData *native = (wxOSXPrintData*) impl->GetPrintData().GetNativeData() ;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if ( PMPrintSettingsSetJobName != NULL )
- PMPrintSettingsSetJobName(native->m_macPrintSettings, wxCFStringRef(message));
+ PMPrintSettingsSetJobName(native->GetPrintSettings(), wxCFStringRef(message));
#endif
- m_err = PMSessionBeginCGDocumentNoDialog(native->m_macPrintSession,
- native->m_macPrintSettings,
- native->m_macPageFormat);
+ m_err = PMSessionBeginCGDocumentNoDialog(native->GetPrintSession(),
+ native->GetPrintSettings(),
+ native->GetPageFormat());
if ( m_err != noErr )
return false;
PMRect rPage;
- m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
+ m_err = PMGetAdjustedPageRect(native->GetPageFormat(), &rPage);
if ( m_err != noErr )
return false ;
if ( PMPrinterGetOutputResolution != NULL )
{
PMPrinter printer;
- m_err = PMSessionGetCurrentPrinter(native->m_macPrintSession, &printer);
+ m_err = PMSessionGetCurrentPrinter(native->GetPrintSession(), &printer);
if ( m_err == noErr )
{
- m_err = PMPrinterGetOutputResolution( printer, native->m_macPrintSettings, &res) ;
+ m_err = PMPrinterGetOutputResolution( printer, native->GetPrintSettings(), &res) ;
if ( m_err == -9589 /* kPMKeyNotFound */ )
{
m_err = noErr ;
#endif
{
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
- m_err = PMGetResolution((PMPageFormat) (native->m_macPageFormat), &res);
+ m_err = PMGetResolution((PMPageFormat) (native->GetPageFormat()), &res);
#endif
}
return ;
wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
- wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->GetPrintData().GetNativeData() ;
+ wxOSXPrintData *native = (wxOSXPrintData*) impl->GetPrintData().GetNativeData() ;
- m_err = PMSessionEndDocumentNoDialog(native->m_macPrintSession);
+ m_err = PMSessionEndDocumentNoDialog(native->GetPrintSession());
}
void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
return ;
wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
- wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->GetPrintData().GetNativeData() ;
+ wxOSXPrintData *native = (wxOSXPrintData*) impl->GetPrintData().GetNativeData() ;
- m_err = PMSessionBeginPageNoDialog(native->m_macPrintSession,
- native->m_macPageFormat,
+ m_err = PMSessionBeginPageNoDialog(native->GetPrintSession(),
+ native->GetPageFormat(),
nil);
CGContextRef pageContext;
if ( m_err == noErr )
{
- m_err = PMSessionGetCGGraphicsContext(native->m_macPrintSession,
+ m_err = PMSessionGetCGGraphicsContext(native->GetPrintSession(),
&pageContext );
}
if ( m_err != noErr )
{
- PMSessionEndPageNoDialog(native->m_macPrintSession);
- PMSessionEndDocumentNoDialog(native->m_macPrintSession);
+ PMSessionEndPageNoDialog(native->GetPrintSession());
+ PMSessionEndDocumentNoDialog(native->GetPrintSession());
}
else
{
PMRect rPage;
- m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
+ m_err = PMGetAdjustedPageRect(native->GetPageFormat(), &rPage);
if ( !m_err )
{
PMRect paperRect ;
- PMGetAdjustedPaperRect( native->m_macPageFormat , &paperRect ) ;
+ PMGetAdjustedPaperRect( native->GetPageFormat() , &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 , (CGFloat) -paperRect.left , (CGFloat) paperRect.bottom ) ;
return ;
wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
- wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) impl->GetPrintData().GetNativeData() ;
+ wxOSXPrintData *native = (wxOSXPrintData*) impl->GetPrintData().GetNativeData() ;
- m_err = PMSessionEndPageNoDialog(native->m_macPrintSession);
+ m_err = PMSessionEndPageNoDialog(native->GetPrintSession());
if ( m_err != noErr )
{
- PMSessionEndDocumentNoDialog(native->m_macPrintSession);
+ PMSessionEndDocumentNoDialog(native->GetPrintSession());
}
// the cg context we got when starting the page isn't valid anymore, so replace it
impl->SetGraphicsContext( wxGraphicsContext::Create() );
wxCoord w, h;
GetOwner()->GetSize(&w, &h);
wxRect pageRect(0, 0, w, h);
- wxMacCarbonPrintData *native = (wxMacCarbonPrintData*) m_printData.GetNativeData() ;
+ wxOSXPrintData *native = (wxOSXPrintData*) m_printData.GetNativeData() ;
OSStatus err = noErr ;
PMRect rPaper;
- err = PMGetAdjustedPaperRect(native->m_macPageFormat, &rPaper);
+ err = PMGetAdjustedPaperRect(native->GetPageFormat(), &rPaper);
if ( err != noErr )
return pageRect;
return wxRect(wxCoord(rPaper.left), wxCoord(rPaper.top),
#include <stdlib.h>
-IMPLEMENT_DYNAMIC_CLASS(wxMacCarbonPrintData, wxPrintNativeDataBase)
-IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase)
-IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase)
+//
+// move to print_osx.cpp
+//
-bool wxMacCarbonPrintData::IsOk() const
+IMPLEMENT_DYNAMIC_CLASS(wxOSXPrintData, wxPrintNativeDataBase)
+
+bool wxOSXPrintData::IsOk() const
{
return (m_macPageFormat != kPMNoPageFormat) && (m_macPrintSettings != kPMNoPrintSettings) && (m_macPrintSession != kPMNoReference);
}
-wxMacCarbonPrintData::wxMacCarbonPrintData()
+
+wxOSXPrintData::wxOSXPrintData()
{
m_macPageFormat = kPMNoPageFormat;
m_macPrintSettings = kPMNoPrintSettings;
m_macPrintSession = kPMNoReference ;
- ValidateOrCreate() ;
+ m_macPaper = kPMNoData;
}
-wxMacCarbonPrintData::~wxMacCarbonPrintData()
+wxOSXPrintData::~wxOSXPrintData()
{
- if (m_macPageFormat != kPMNoPageFormat)
- {
- (void)PMRelease(m_macPageFormat);
- m_macPageFormat = kPMNoPageFormat;
- }
+}
- if (m_macPrintSettings != kPMNoPrintSettings)
- {
- (void)PMRelease(m_macPrintSettings);
- m_macPrintSettings = kPMNoPrintSettings;
- }
+void wxOSXPrintData::UpdateFromPMState()
+{
+}
- if ( m_macPrintSession != kPMNoReference )
- {
- (void)PMRelease(m_macPrintSession);
- m_macPrintSession = kPMNoReference;
- }
+void wxOSXPrintData::UpdateToPMState()
+{
}
-void wxMacCarbonPrintData::ValidateOrCreate()
+bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
{
- OSStatus err = noErr ;
- if ( m_macPrintSession == kPMNoReference )
- {
- err = PMCreateSession( &m_macPrintSession ) ;
- }
- // Set up a valid PageFormat object.
- if ( m_macPageFormat == kPMNoPageFormat)
- {
- err = PMCreatePageFormat(&m_macPageFormat);
+ PMPrinter printer;
+ PMSessionGetCurrentPrinter(m_macPrintSession, &printer);
- // Note that PMPageFormat is not session-specific, but calling
- // PMSessionDefaultPageFormat assigns values specific to the printer
- // associated with the current printing session.
- if ((err == noErr) &&
- ( m_macPageFormat != kPMNoPageFormat))
+ wxSize papersize = wxDefaultSize;
+ const wxPaperSize paperId = data.GetPaperId();
+ if ( paperId != wxPAPER_NONE && wxThePrintPaperDatabase )
+ {
+ papersize = wxThePrintPaperDatabase->GetSize(paperId);
+ if ( papersize != wxDefaultSize )
{
- err = PMSessionDefaultPageFormat(m_macPrintSession,
- m_macPageFormat);
+ papersize.x /= 10;
+ papersize.y /= 10;
}
}
else
{
- err = PMSessionValidatePageFormat(m_macPrintSession,
- m_macPageFormat,
- kPMDontWantBoolean);
+ papersize = data.GetPaperSize();
}
-
- // Set up a valid PrintSettings object.
- if ( m_macPrintSettings == kPMNoPrintSettings)
+
+ if ( papersize != wxDefaultSize )
{
- err = PMCreatePrintSettings( &m_macPrintSettings);
-
- // Note that PMPrintSettings is not session-specific, but calling
- // PMSessionDefaultPrintSettings assigns values specific to the printer
- // associated with the current printing session.
- if ((err == noErr) &&
- ( m_macPrintSettings != kPMNoPrintSettings))
+ papersize.x = (wxInt32) (papersize.x * mm2pt);
+ papersize.y = (wxInt32) (papersize.y * mm2pt);
+
+ double height, width;
+ PMPaperGetHeight(m_macPaper, &height);
+ PMPaperGetWidth(m_macPaper, &width);
+
+ if ( fabs( width - papersize.x ) >= 5 ||
+ fabs( height - papersize.y ) >= 5 )
{
- err = PMSessionDefaultPrintSettings(m_macPrintSession,
- m_macPrintSettings);
+ // we have to change the current paper
+ CFArrayRef paperlist = 0 ;
+ if ( PMPrinterGetPaperList( printer, &paperlist ) == noErr )
+ {
+ PMPaper bestPaper = kPMNoData ;
+ CFIndex top = CFArrayGetCount(paperlist);
+ for ( CFIndex i = 0 ; i < top ; ++ i )
+ {
+ PMPaper paper = (PMPaper) CFArrayGetValueAtIndex( paperlist, i );
+ PMPaperGetHeight(paper, &height);
+ PMPaperGetWidth(paper, &width);
+ if ( fabs( width - papersize.x ) < 5 &&
+ fabs( height - papersize.y ) < 5 )
+ {
+ // TODO test for duplicate hits and use additional
+ // criteria for best match
+ bestPaper = paper;
+ }
+ }
+ PMPaper paper = kPMNoData;
+ if ( bestPaper == kPMNoData )
+ {
+ const PMPaperMargins margins = { 0.0, 0.0, 0.0, 0.0 };
+ wxString id, name(_T("Custom paper"));
+ id.Printf(_T("wxPaperCustom%dx%d"), papersize.x, papersize.y);
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+ if ( PMPaperCreateCustom != NULL)
+ {
+ PMPaperCreateCustom(printer, wxCFStringRef( id, wxFont::GetDefaultEncoding() ), wxCFStringRef( name, wxFont::GetDefaultEncoding() ),
+ papersize.x, papersize.y, &margins, &paper);
+ }
+#endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+ if ( paper == kPMNoData )
+ {
+ PMPaperCreate(printer, wxCFStringRef( id, wxFont::GetDefaultEncoding() ), wxCFStringRef( name, wxFont::GetDefaultEncoding() ),
+ papersize.x, papersize.y, &margins, &paper);
+ }
+#endif
+ }
+ if ( bestPaper != kPMNoData )
+ {
+ PMPageFormat pageFormat;
+ PMCreatePageFormatWithPMPaper(&pageFormat, bestPaper);
+ PMCopyPageFormat( pageFormat, m_macPageFormat );
+ PMRelease(pageFormat);
+ PMGetPageFormatPaper(m_macPageFormat, &m_macPaper);
+ }
+ PMRelease(paper);
+ }
}
}
- else
- {
- err = PMSessionValidatePrintSettings( m_macPrintSession,
- m_macPrintSettings,
- kPMDontWantBoolean);
- }
-}
-bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
-{
CFArrayRef printerList;
CFIndex index, count;
- PMPrinter printer;
CFStringRef name;
- ValidateOrCreate() ;
-
if (PMServerCreatePrinterList(kPMServerLocal, &printerList) == noErr)
{
count = CFArrayGetCount(printerList);
}
}
if (index < count)
- PMSessionSetCurrentPMPrinter((PMPrintSession)m_macPrintSession, printer);
+ PMSessionSetCurrentPMPrinter(m_macPrintSession, printer);
CFRelease(printerList);
}
PMSetCopies( m_macPrintSettings , data.GetNoCopies() , false ) ;
PMSetCollate(m_macPrintSettings, data.GetCollate());
-
-#if wxOSX_USE_CARBON
- PMColorMode color ;
- PMGetColorMode( (PMPrintSettings) m_macPrintSettings, &color ) ;
- if ( data.GetColour() )
- {
- if ( color == kPMBlackAndWhite )
- PMSetColorMode( (PMPrintSettings) m_macPrintSettings, kPMColor ) ;
- }
+ if ( data.IsOrientationReversed() )
+ PMSetOrientation( m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
+ kPMReverseLandscape : kPMReversePortrait , false ) ;
else
- PMSetColorMode( (PMPrintSettings) m_macPrintSettings, kPMBlackAndWhite ) ;
-#endif
-
+ PMSetOrientation( m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
+ kPMLandscape : kPMPortrait , false ) ;
+
PMDuplexMode mode = 0 ;
switch( data.GetDuplex() )
{
mode = kPMDuplexNone ;
break ;
}
- PMSetDuplex( (PMPrintSettings) m_macPrintSettings, mode ) ;
+ PMSetDuplex( m_macPrintSettings, mode ) ;
// PMQualityMode not yet accessible via API
- PMResolution res;
- PMSessionGetCurrentPrinter(m_macPrintSession, &printer);
-
- bool found = false;
- CFArrayRef formatList;
- PMSessionCreatePageFormatList(m_macPrintSession, printer, &formatList);
- if (formatList)
- {
- count = CFArrayGetCount(formatList);
- for (index = 0; index < count; index++)
- {
- PMPageFormat temp = (PMPageFormat)CFArrayGetValueAtIndex(formatList, index);
- PMRect rPaper;
- PMGetUnadjustedPaperRect(temp, &rPaper);
- wxSize sz((int)(( rPaper.right - rPaper.left ) * pt2mm + 0.5 ) ,
- (int)(( rPaper.bottom - rPaper.top ) * pt2mm + 0.5 ));
- wxPaperSize id = wxThePrintPaperDatabase->GetSize(wxSize(sz.x* 10, sz.y * 10));
- if (((data.GetPaperId() != wxPAPER_NONE) && (id == data.GetPaperId())) ||
- ((data.GetPaperId() == wxPAPER_NONE) && (sz == data.GetPaperSize())))
- {
- PMCopyPageFormat(temp, m_macPageFormat);
- found = true;
- break;
- }
- }
- CFRelease(formatList);
- }
- if (!found)
- {
- PMPaper paper;
- const PMPaperMargins margins = { 0.0, 0.0, 0.0, 0.0 };
- wxString id, name(_T("Custom paper"));
- wxSize sz;
- double width, height;
-
- id.Printf(_T("wxPaperCustom%dx%d"), sz.x, sz.y);
- if (data.GetPaperId() == wxPAPER_NONE)
- sz = data.GetPaperSize();
- else
- sz = wxThePrintPaperDatabase->GetSize(data.GetPaperId());
- width = ((double)sz.x / 10.0) * mm2pt;
- height = ((double)sz.y / 10.0) * mm2pt;
-
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
- PMPaperCreate(printer, wxCFStringRef( id, wxFont::GetDefaultEncoding() ), wxCFStringRef( name, wxFont::GetDefaultEncoding() ), width, height, &margins, &paper);
-#else
- if (PMPaperCreateCustom(printer, wxCFStringRef( id, wxFont::GetDefaultEncoding() ), wxCFStringRef( name, wxFont::GetDefaultEncoding() ), width, height, &margins, &paper) != noErr)
- paper = NULL;
-#endif
- if (paper)
- {
- PMPageFormat temp;
- if (PMCreatePageFormatWithPMPaper(&temp, paper) == noErr) {
- PMCopyPageFormat(temp, m_macPageFormat);
- PMRelease(temp);
- }
- PMRelease(paper);
- }
- }
if ( data.IsOrientationReversed() )
- PMSetOrientation( (PMPageFormat) m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
+ PMSetOrientation( m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
kPMReverseLandscape : kPMReversePortrait , false ) ;
else
- PMSetOrientation( (PMPageFormat) m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
+ PMSetOrientation( m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
kPMLandscape : kPMPortrait , false ) ;
-#if 1 // wxOSX_USE_CARBON
+ // PMQualityMode not accessible via API
+ // TODO: use our quality property to determine optimal resolution
+ PMResolution res;
PMTag tag = kPMMaxSquareResolution;
PMPrinterGetPrinterResolution(printer, tag, &res);
- PMSetResolution((PMPageFormat) m_macPageFormat, &res);
-#else
- PMPrinterGetOutputResolution( printer,
- (PMPrintSettings) m_macPrintSettings, &res) ;
- // TODO transfer ? into page format ?
- // may fail !
-#endif
+ PMSetResolution( m_macPageFormat, &res);
+
// 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) ;
+
+ PMSessionValidatePageFormat(m_macPrintSession,
+ m_macPageFormat, kPMDontWantBoolean);
+ PMSessionValidatePrintSettings(m_macPrintSession,
+ m_macPrintSettings, kPMDontWantBoolean);
+#if wxOSX_USE_COCOA
+ UpdateFromPMState();
+#endif
return true ;
}
-bool wxMacCarbonPrintData::TransferTo( wxPrintData &data )
+bool wxOSXPrintData::TransferTo( wxPrintData &data )
{
OSStatus err = noErr ;
-
+#if wxOSX_USE_COCOA
+ UpdateToPMState();
+#endif
UInt32 copies ;
err = PMGetCopies( m_macPrintSettings , &copies ) ;
if ( err == noErr )
data.SetPrinterName(wxCFStringRef(name).AsString());
}
-#ifndef __LP64__
- PMColorMode color ;
- err = PMGetColorMode( m_macPrintSettings, &color ) ;
- if ( err == noErr )
- data.SetColour( !(color == kPMBlackAndWhite) ) ;
-#endif
PMDuplexMode mode = 0 ;
- PMGetDuplex( (PMPrintSettings) m_macPrintSettings, &mode ) ;
+ PMGetDuplex( m_macPrintSettings, &mode ) ;
switch( mode )
{
case kPMDuplexNoTumble :
}
// PMQualityMode not yet accessible via API
- PMPaper paper ;
- PMGetPageFormatPaper( m_macPageFormat, &paper );
-
- PMRect rPaper;
- err = PMGetUnadjustedPaperRect( m_macPageFormat, &rPaper);
- if ( err == noErr )
+ double height, width;
+ PMPaperGetHeight(m_macPaper, &height);
+ PMPaperGetWidth(m_macPaper, &width);
+
+ wxSize sz((int)(width * pt2mm + 0.5 ) ,
+ (int)(height * pt2mm + 0.5 ));
+ data.SetPaperSize(sz);
+ wxPaperSize id = wxThePrintPaperDatabase->GetSize(wxSize(sz.x* 10, sz.y * 10));
+ if (id != wxPAPER_NONE)
{
- wxSize sz((int)(( rPaper.right - rPaper.left ) * pt2mm + 0.5 ) * 10,
- (int)(( rPaper.bottom - rPaper.top ) * pt2mm + 0.5 ) * 10);
- data.SetPaperSize(sz);
- wxPaperSize id = wxThePrintPaperDatabase->GetSize(sz);
data.SetPaperId(id);
}
return true ;
}
-void wxMacCarbonPrintData::TransferFrom( wxPageSetupData *WXUNUSED(data) )
+void wxOSXPrintData::TransferFrom( wxPageSetupData *WXUNUSED(data) )
{
// should we setup the page rect here ?
// since MacOS sometimes has two same paper rects with different
// page rects we could make it roundtrip safe perhaps
}
-void wxMacCarbonPrintData::TransferTo( wxPageSetupData* data )
+void wxOSXPrintData::TransferTo( wxPageSetupData* data )
{
+#if wxOSX_USE_COCOA
+ UpdateToPMState();
+#endif
PMRect rPaper;
OSStatus err = PMGetUnadjustedPaperRect(m_macPageFormat, &rPaper);
if ( err == noErr )
}
}
-void wxMacCarbonPrintData::TransferTo( wxPrintDialogData* data )
+void wxOSXPrintData::TransferTo( wxPrintDialogData* data )
{
+#if wxOSX_USE_COCOA
+ UpdateToPMState();
+#endif
UInt32 minPage , maxPage ;
PMGetPageRange( m_macPrintSettings , &minPage , &maxPage ) ;
data->SetMinPage( minPage ) ;
data->SetAllPages( true ) ;
// This means all pages, more or less
data->SetFromPage(1);
- data->SetToPage(32000);
+ data->SetToPage(9999);
}
else
{
}
}
-void wxMacCarbonPrintData::TransferFrom( wxPrintDialogData* data )
+void wxOSXPrintData::TransferFrom( wxPrintDialogData* data )
{
// Respect the value of m_printAllPages
if ( data->GetAllPages() )
PMSetLastPage( m_macPrintSettings , (UInt32) kPMPrintAllPages, true ) ;
else
PMSetLastPage( m_macPrintSettings , (UInt32) data->GetToPage() , false ) ;
+#if wxOSX_USE_COCOA
+ UpdateFromPMState();
+#endif
+}
+
+wxPrintNativeDataBase* wxOSXCreatePrintData()
+{
+#if wxOSX_USE_COCOA
+ return new wxOSXCocoaPrintData();
+#endif
+#if wxOSX_USE_CARBON
+ return new wxOSXCarbonPrintData();
+#endif
+ return NULL;
}
/*
* Printer
*/
+IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase)
+
wxMacPrinter::wxMacPrinter(wxPrintDialogData *data):
wxPrinterBase(data)
{
// on the mac we have always pixels as addressing mode with 72 dpi
printout->SetPPIScreen(72, 72);
PMResolution res;
- wxMacCarbonPrintData* nativeData = (wxMacCarbonPrintData*)
+ wxOSXPrintData* nativeData = (wxOSXPrintData*)
(m_printDialogData.GetPrintData().GetNativeData());
-#if 1 // wxOSX_USE_CARBON
- PMGetResolution((PMPageFormat) (nativeData->m_macPageFormat), &res);
-#else
- PMPrinter printer;
- PMSessionGetCurrentPrinter(nativeData->m_macPrintSession, &printer);
- PMPrinterGetOutputResolution( printer, nativeData->m_macPrintSettings, &res) ;
-#endif
+ PMGetResolution( (nativeData->GetPageFormat()), &res);
printout->SetPPIPrinter(int(res.hRes), int(res.vRes));
// Set printout parameters
* Print preview
*/
+IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase)
+
wxMacPrintPreview::wxMacPrintPreview(wxPrintout *printout,
wxPrintout *printoutForPrinting,
wxPrintDialogData *data)
m_previewScaleY = float(ppiScreen.y) / ppiPrinter.y;
}
+//
+// end of print_osx.cpp
+//
+
+#if wxOSX_USE_CARBON
+
+IMPLEMENT_DYNAMIC_CLASS(wxOSXCarbonPrintData, wxOSXPrintData)
+
+wxOSXCarbonPrintData::wxOSXCarbonPrintData()
+{
+ if ( PMCreateSession( &m_macPrintSession ) == noErr )
+ {
+ if ( PMCreatePageFormat(&m_macPageFormat) == noErr )
+ {
+ PMSessionDefaultPageFormat(m_macPrintSession,
+ m_macPageFormat);
+ PMGetPageFormatPaper(m_macPageFormat, &m_macPaper);
+ }
+
+ if ( PMCreatePrintSettings(&m_macPrintSettings) == noErr )
+ {
+ PMSessionDefaultPrintSettings(m_macPrintSession,
+ m_macPrintSettings);
+ }
+ }
+}
+
+wxOSXCarbonPrintData::~wxOSXCarbonPrintData()
+{
+ (void)PMRelease(m_macPageFormat);
+ (void)PMRelease(m_macPrintSettings);
+ (void)PMRelease(m_macPrintSession);
+}
+#endif
+
#endif
projects / wxWidgets.git / commitdiff
