// returns 0 in case of no Error, otherwise platform specific error codes
virtual wxUint32 GetStatus() const = 0 ;
- bool Ok() { return GetStatus() == 0 ; }
+ bool IsOk() { return GetStatus() == 0 ; }
static wxNativePrinterDC* Create(wxPrintData* data) ;
} ;
{
m_err = noErr ;
wxOSXPrintData *native = (wxOSXPrintData*) data->GetNativeData() ;
-
+
PMRect rPage;
m_err = PMGetAdjustedPageRect(native->GetPageFormat(), &rPage);
if ( m_err != noErr )
return;
-
+
m_maxX = wxCoord(rPage.right - rPage.left) ;
m_maxY = wxCoord(rPage.bottom - rPage.top);
-
+
PMResolution res;
PMPrinter printer;
m_err = PMSessionGetCurrentPrinter(native->GetPrintSession(), &printer);
if ( m_err == noErr )
- {
+ {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
if ( PMPrinterGetOutputResolution != NULL )
{
{
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
m_err = PMPrinterGetPrinterResolution(printer, kPMCurrentValue, &res);
+ if ( m_err != noErr )
+ {
+ m_err = PMGetResolution((PMPageFormat) (native->GetPageFormat()), &res);
+ }
#endif
}
}
-
+ else
+ {
+ res.hRes = res.vRes = 300;
+ }
+
m_maxX = wxCoord((double)m_maxX * res.hRes / 72.0);
m_maxY = wxCoord((double)m_maxY * res.vRes / 72.0);
#endif
{
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
- m_err = PMPrinterGetPrinterResolution(printer, kPMCurrentValue, &res);
+ if ( PMPrinterGetPrinterResolution(printer, kPMCurrentValue, &res) != noErr )
+ {
+ res.hRes = res.vRes = 300;
+ }
#endif
}
}
-
+
m_maxX = wxCoord((double)m_maxX * res.hRes / 72.0);
m_maxY = wxCoord((double)m_maxY * res.vRes / 72.0);
// Core Graphics initially has the lower left of the paper as 0,0
if ( !m_err )
CGContextTranslateCTM( pageContext , (CGFloat) -paperRect.left , (CGFloat) paperRect.bottom ) ;
-
+
// since this is a non-critical error, we set the flag back
m_err = noErr ;
m_nativePrinterDC = wxNativePrinterDC::Create( &m_printData ) ;
if ( m_nativePrinterDC )
{
- m_ok = m_nativePrinterDC->Ok() ;
+ m_ok = m_nativePrinterDC->IsOk() ;
if ( !m_ok )
{
wxString message ;
{
// in case we have to do additional things when successful
}
- m_ok = m_nativePrinterDC->Ok() ;
+ m_ok = m_nativePrinterDC->IsOk() ;
if ( !m_ok )
{
wxString message ;
return ;
m_nativePrinterDC->EndDoc( (wxPrinterDC*) GetOwner() ) ;
- m_ok = m_nativePrinterDC->Ok() ;
+ m_ok = m_nativePrinterDC->IsOk() ;
if ( !m_ok )
{
m_backgroundBrush = *wxWHITE_BRUSH;
m_nativePrinterDC->StartPage( (wxPrinterDC*) GetOwner() ) ;
- m_ok = m_nativePrinterDC->Ok() ;
+ m_ok = m_nativePrinterDC->IsOk() ;
}
return ;
m_nativePrinterDC->EndPage( (wxPrinterDC*) GetOwner() );
- m_ok = m_nativePrinterDC->Ok() ;
+ m_ok = m_nativePrinterDC->IsOk() ;
}
void wxPrinterDCImpl::DoGetSize(int *width, int *height) const