X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25a3fca2e516180ee80bdd9ef5321fe8b80673ea..d38315df30415b030d93172123920d69c5c5e3b6:/src/common/prntbase.cpp?ds=sidebyside diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index 12c4cee992..cb7452bd38 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -212,7 +212,7 @@ wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxDCImpl* wxNativePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) { -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXUNIVERSAL__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || ( defined(__WXUNIVERSAL__) && !defined(__WXMAC__) ) return new wxPostScriptDCImpl( owner, data ); #else return new wxPrinterDCImpl( owner, data ); @@ -261,7 +261,7 @@ wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData() #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) return new wxWindowsPrintNativeData; #elif defined(__WXMAC__) - return new wxMacCarbonPrintData; + return wxOSXCreatePrintData(); #else return new wxPostScriptPrintNativeData; #endif @@ -303,15 +303,15 @@ IMPLEMENT_CLASS(wxPrinterBase, wxObject) wxPrinterBase::wxPrinterBase(wxPrintDialogData *data) { - m_currentPrintout = (wxPrintout *) NULL; - sm_abortWindow = (wxWindow *) NULL; + m_currentPrintout = NULL; + sm_abortWindow = NULL; sm_abortIt = false; if (data) m_printDialogData = (*data); sm_lastError = wxPRINTER_NO_ERROR; } -wxWindow *wxPrinterBase::sm_abortWindow = (wxWindow *) NULL; +wxWindow *wxPrinterBase::sm_abortWindow = NULL; bool wxPrinterBase::sm_abortIt = false; wxPrinterError wxPrinterBase::sm_lastError = wxPRINTER_NO_ERROR; @@ -512,7 +512,8 @@ void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) wxPrinterBase::sm_abortIt = true; wxPrinterBase::sm_abortWindow->Show(false); wxPrinterBase::sm_abortWindow->Close(true); - wxPrinterBase::sm_abortWindow = (wxWindow *) NULL; + wxPrinterBase::sm_abortWindow->Destroy(); + wxPrinterBase::sm_abortWindow = NULL; } //---------------------------------------------------------------------------- @@ -524,7 +525,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject) wxPrintout::wxPrintout(const wxString& title) { m_printoutTitle = title ; - m_printoutDC = (wxDC *) NULL; + m_printoutDC = NULL; m_pageWidthMM = 0; m_pageHeightMM = 0; m_pageWidthPixels = 0; @@ -533,7 +534,7 @@ wxPrintout::wxPrintout(const wxString& title) m_PPIScreenY = 0; m_PPIPrinterX = 0; m_PPIPrinterY = 0; - m_isPreview = false; + m_preview = NULL; } wxPrintout::~wxPrintout() @@ -586,7 +587,7 @@ void wxPrintout::FitThisSizeToPaper(const wxSize& imageSize) float scaleX = ((float(paperRect.width) * w) / (float(pw) * imageSize.x)); float scaleY = ((float(paperRect.height) * h) / (float(ph) * imageSize.y)); float actualScale = wxMin(scaleX, scaleY); - m_printoutDC->SetUserScale(actualScale, actualScale); + m_printoutDC->SetUserScale(actualScale, actualScale); m_printoutDC->SetDeviceOrigin(0, 0); wxRect logicalPaperRect = GetLogicalPaperRect(); SetLogicalOrigin(logicalPaperRect.x, logicalPaperRect.y); @@ -603,7 +604,7 @@ void wxPrintout::FitThisSizeToPage(const wxSize& imageSize) float scaleX = float(w) / imageSize.x; float scaleY = float(h) / imageSize.y; float actualScale = wxMin(scaleX, scaleY); - m_printoutDC->SetUserScale(actualScale, actualScale); + m_printoutDC->SetUserScale(actualScale, actualScale); m_printoutDC->SetDeviceOrigin(0, 0); } @@ -631,7 +632,7 @@ void wxPrintout::FitThisSizeToPageMargins(const wxSize& imageSize, const wxPageS float scaleX = (float(pageMarginsRect.width) * w) / (float(pw) * imageSize.x); float scaleY = (float(pageMarginsRect.height) * h) / (float(ph) * imageSize.y); float actualScale = wxMin(scaleX, scaleY); - m_printoutDC->SetUserScale(actualScale, actualScale); + m_printoutDC->SetUserScale(actualScale, actualScale); m_printoutDC->SetDeviceOrigin(0, 0); wxRect logicalPageMarginsRect = GetLogicalPageMarginsRect(pageSetupData); SetLogicalOrigin(logicalPageMarginsRect.x, logicalPageMarginsRect.y); @@ -654,16 +655,16 @@ void wxPrintout::MapScreenSizeToPage() // Set the DC scale and origin so that an image on the screen is the same // size on the paper and the origin is at the top left of the printable area. if (!m_printoutDC) return; - int ppiScreenX, ppiScreenY; - GetPPIScreen(&ppiScreenX, &ppiScreenY); - int ppiPrinterX, ppiPrinterY; - GetPPIPrinter(&ppiPrinterX, &ppiPrinterY); - int w, h; - m_printoutDC->GetSize(&w, &h); - int pageSizePixelsX, pageSizePixelsY; - GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY); - float userScaleX = (float(ppiPrinterX) * w) / (float(ppiScreenX) * pageSizePixelsX); - float userScaleY = (float(ppiPrinterY) * h) / (float(ppiScreenY) * pageSizePixelsY); + int ppiScreenX, ppiScreenY; + GetPPIScreen(&ppiScreenX, &ppiScreenY); + int ppiPrinterX, ppiPrinterY; + GetPPIPrinter(&ppiPrinterX, &ppiPrinterY); + int w, h; + m_printoutDC->GetSize(&w, &h); + int pageSizePixelsX, pageSizePixelsY; + GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY); + float userScaleX = (float(ppiPrinterX) * w) / (float(ppiScreenX) * pageSizePixelsX); + float userScaleY = (float(ppiPrinterY) * h) / (float(ppiScreenY) * pageSizePixelsY); m_printoutDC->SetUserScale(userScaleX, userScaleY); m_printoutDC->SetDeviceOrigin(0, 0); } @@ -684,12 +685,12 @@ void wxPrintout::MapScreenSizeToDevice() // Set the DC scale so that a screen pixel is the same size as a device // pixel and the origin is at the top left of the printable area. if (!m_printoutDC) return; - int w, h; - m_printoutDC->GetSize(&w, &h); - int pageSizePixelsX, pageSizePixelsY; - GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY); - float userScaleX = float(w) / pageSizePixelsX; - float userScaleY = float(h) / pageSizePixelsY; + int w, h; + m_printoutDC->GetSize(&w, &h); + int pageSizePixelsX, pageSizePixelsY; + GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY); + float userScaleX = float(w) / pageSizePixelsX; + float userScaleY = float(h) / pageSizePixelsY; m_printoutDC->SetUserScale(userScaleX, userScaleY); m_printoutDC->SetDeviceOrigin(0, 0); } @@ -705,17 +706,17 @@ wxRect wxPrintout::GetLogicalPaperRect() const m_printoutDC->GetSize(&w, &h); if (w == pw && h == ph) { // this DC matches the printed page, so no scaling - return wxRect(m_printoutDC->DeviceToLogicalX(paperRect.x), - m_printoutDC->DeviceToLogicalY(paperRect.y), - m_printoutDC->DeviceToLogicalXRel(paperRect.width), + return wxRect(m_printoutDC->DeviceToLogicalX(paperRect.x), + m_printoutDC->DeviceToLogicalY(paperRect.y), + m_printoutDC->DeviceToLogicalXRel(paperRect.width), m_printoutDC->DeviceToLogicalYRel(paperRect.height)); } // This DC doesn't match the printed page, so we have to scale. float scaleX = float(w) / pw; float scaleY = float(h) / ph; - return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(paperRect.x * scaleX)), - m_printoutDC->DeviceToLogicalY(wxRound(paperRect.y * scaleY)), - m_printoutDC->DeviceToLogicalXRel(wxRound(paperRect.width * scaleX)), + return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(paperRect.x * scaleX)), + m_printoutDC->DeviceToLogicalY(wxRound(paperRect.y * scaleY)), + m_printoutDC->DeviceToLogicalXRel(wxRound(paperRect.width * scaleX)), m_printoutDC->DeviceToLogicalYRel(wxRound(paperRect.height * scaleY))); } @@ -725,9 +726,9 @@ wxRect wxPrintout::GetLogicalPageRect() const // area. int w, h; m_printoutDC->GetSize(&w, &h); - return wxRect(m_printoutDC->DeviceToLogicalX(0), - m_printoutDC->DeviceToLogicalY(0), - m_printoutDC->DeviceToLogicalXRel(w), + return wxRect(m_printoutDC->DeviceToLogicalX(0), + m_printoutDC->DeviceToLogicalY(0), + m_printoutDC->DeviceToLogicalXRel(w), m_printoutDC->DeviceToLogicalYRel(h)); } @@ -736,7 +737,7 @@ wxRect wxPrintout::GetLogicalPageMarginsRect(const wxPageSetupDialogData& pageSe // Return the rectangle in logical units that corresponds to the region // within the page margins as specified by the given wxPageSetupDialogData // object. - + // We get the paper size in device units and the margins in mm, // so we need to calculate the conversion with this trick wxCoord pw, ph; @@ -746,38 +747,38 @@ wxRect wxPrintout::GetLogicalPageMarginsRect(const wxPageSetupDialogData& pageSe float mmToDeviceX = float(pw) / mw; float mmToDeviceY = float(ph) / mh; - // paper size in device units + // paper size in device units wxRect paperRect = GetPaperRectPixels(); - + // margins in mm wxPoint topLeft = pageSetupData.GetMarginTopLeft(); wxPoint bottomRight = pageSetupData.GetMarginBottomRight(); - + // calculate margins in device units wxRect pageMarginsRect( paperRect.x + wxRound(mmToDeviceX * topLeft.x), paperRect.y + wxRound(mmToDeviceY * topLeft.y), paperRect.width - wxRound(mmToDeviceX * (topLeft.x + bottomRight.x)), paperRect.height - wxRound(mmToDeviceY * (topLeft.y + bottomRight.y))); - + wxCoord w, h; m_printoutDC->GetSize(&w, &h); - if (w == pw && h == ph) + if (w == pw && h == ph) { // this DC matches the printed page, so no scaling return wxRect( - m_printoutDC->DeviceToLogicalX(pageMarginsRect.x), - m_printoutDC->DeviceToLogicalY(pageMarginsRect.y), - m_printoutDC->DeviceToLogicalXRel(pageMarginsRect.width), + m_printoutDC->DeviceToLogicalX(pageMarginsRect.x), + m_printoutDC->DeviceToLogicalY(pageMarginsRect.y), + m_printoutDC->DeviceToLogicalXRel(pageMarginsRect.width), m_printoutDC->DeviceToLogicalYRel(pageMarginsRect.height)); } - + // This DC doesn't match the printed page, so we have to scale. float scaleX = float(w) / pw; float scaleY = float(h) / ph; - return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(pageMarginsRect.x * scaleX)), - m_printoutDC->DeviceToLogicalY(wxRound(pageMarginsRect.y * scaleY)), - m_printoutDC->DeviceToLogicalXRel(wxRound(pageMarginsRect.width * scaleX)), + return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(pageMarginsRect.x * scaleX)), + m_printoutDC->DeviceToLogicalY(wxRound(pageMarginsRect.y * scaleY)), + m_printoutDC->DeviceToLogicalXRel(wxRound(pageMarginsRect.width * scaleX)), m_printoutDC->DeviceToLogicalYRel(wxRound(pageMarginsRect.height * scaleY))); } @@ -785,19 +786,19 @@ void wxPrintout::SetLogicalOrigin(wxCoord x, wxCoord y) { // Set the device origin by specifying a point in logical coordinates. m_printoutDC->SetDeviceOrigin( - m_printoutDC->LogicalToDeviceX(x), + m_printoutDC->LogicalToDeviceX(x), m_printoutDC->LogicalToDeviceY(y) ); } - + void wxPrintout::OffsetLogicalOrigin(wxCoord xoff, wxCoord yoff) { // Offset the device origin by a specified distance in device coordinates. wxPoint dev_org = m_printoutDC->GetDeviceOrigin(); m_printoutDC->SetDeviceOrigin( - dev_org.x + m_printoutDC->LogicalToDeviceXRel(xoff), + dev_org.x + m_printoutDC->LogicalToDeviceXRel(xoff), dev_org.y + m_printoutDC->LogicalToDeviceYRel(yoff) ); } - + //---------------------------------------------------------------------------- // wxPreviewCanvas @@ -1000,11 +1001,11 @@ wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long butto wxPanel(parent, wxID_ANY, pos, size, style, name) { m_printPreview = preview; - m_closeButton = (wxButton *) NULL; - m_nextPageButton = (wxButton *) NULL; - m_previousPageButton = (wxButton *) NULL; - m_printButton = (wxButton *) NULL; - m_zoomControl = (wxChoice *) NULL; + m_closeButton = NULL; + m_nextPageButton = NULL; + m_previousPageButton = NULL; + m_printButton = NULL; + m_zoomControl = NULL; m_buttonFlags = buttons; } @@ -1270,7 +1271,7 @@ wxFrame(parent, wxID_ANY, title, pos, size, style, name) #ifdef __WXMSW__ wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame); if (topFrame) - SetIcon(topFrame->GetIcon()); + SetIcons(topFrame->GetIcons()); #endif } @@ -1374,7 +1375,7 @@ void wxPrintPreviewBase::Init(wxPrintout *printout, m_isOk = true; m_previewPrintout = printout; if (m_previewPrintout) - m_previewPrintout->SetIsPreview(true); + m_previewPrintout->SetPreview(static_cast(this)); m_printPrintout = printoutForPrinting; @@ -1511,7 +1512,7 @@ bool wxPrintPreviewBase::PaintPage(wxPreviewCanvas *canvas, wxDC& dc) wxMemoryDC temp_dc; temp_dc.SelectObject(*m_previewBitmap); - dc.Blit(pageRect.x, pageRect.y, + dc.Blit(pageRect.x, pageRect.y, m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0); temp_dc.SelectObject(wxNullBitmap); @@ -1582,7 +1583,7 @@ bool wxPrintPreviewBase::RenderPage(int pageNum) if (!m_previewCanvas) { - wxFAIL_MSG(_T("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!")); + wxFAIL_MSG(wxT("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!")); return false; } @@ -1642,7 +1643,7 @@ bool wxPrintPreviewBase::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc) // Draw blank page allowing for 1-pixel border AROUND the actual paper dc.SetPen(*wxBLACK_PEN); dc.SetBrush(*wxWHITE_BRUSH); - dc.DrawRectangle(paperRect.x - 2, paperRect.y - 1, + dc.DrawRectangle(paperRect.x - 2, paperRect.y - 1, paperRect.width + 3, paperRect.height + 2); return true;