#include "wx/dc.h"
#include "wx/app.h"
#include "wx/msgdlg.h"
+ #include "wx/dcprint.h"
+ #include "wx/math.h"
#endif
-#include "wx/math.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/mac/printdlg.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);
}
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
// 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,
+ (PMPageFormat) m_macPageFormat,
+ kPMDontWantBoolean) ;
return true ;
}
}
#endif
+#ifndef __LP64__
PMColorMode color ;
err = PMGetColorMode( m_macPrintSettings, &color ) ;
if ( err == noErr )
data.SetColour( !(color == kPMBlackAndWhite) ) ;
-
+#endif
// PMDuplexMode not yet accessible via API
// PMQualityMode not yet accessible via API
// todo paperSize
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);
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())
{
- int x , y ;
- wxCoord 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
{
+ // 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 ;
}
-
- // 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
projects / wxWidgets.git / blobdiff