X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11e59d47c05f2303ccfc07625b726ac7cb821881..63ec432bd7b9c93961e85e871bcb31758364a634:/src/os2/print.cpp?ds=inline diff --git a/src/os2/print.cpp b/src/os2/print.cpp index 7125a6a8f1..99050676ed 100644 --- a/src/os2/print.cpp +++ b/src/os2/print.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: print.cpp +// Name: src/os2/print.cpp // Purpose: Print framework // Author: David Webster // Modified by: @@ -19,35 +19,36 @@ #include "wx/app.h" #endif +#if wxUSE_PRINTING_ARCHITECTURE -#include "wx/os2/print.h" +#include "wx/os2/printos2.h" #include "wx/generic/prntdlgg.h" -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase) -IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxOS2Printer, wxPrinterBase) +IMPLEMENT_CLASS(wxOS2PrintPreview, wxPrintPreviewBase) /* * Printer */ -wxPrinter::wxPrinter(wxPrintData *data): - wxPrinterBase((wxPrintDialogData*)data) +wxOS2Printer::wxOS2Printer(wxPrintDialogData *data): + wxPrinterBase(data) { } -wxPrinter::~wxPrinter() +wxOS2Printer::~wxOS2Printer() { } -bool wxPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt) +bool wxOS2Printer::Print(wxWindow *WXUNUSED(parent), + wxPrintout *WXUNUSED(printout), + bool WXUNUSED(prompt)) { // TODO. See wxPostScriptPrinter::Print for hints. - return FALSE; + return false; } -wxDC* wxPrinter::PrintDialog(wxWindow *parent) +wxDC* wxOS2Printer::PrintDialog(wxWindow *WXUNUSED(parent)) { // TODO: /* @@ -57,42 +58,51 @@ wxDC* wxPrinter::PrintDialog(wxWindow *parent) return NULL; } -bool wxPrinter::Setup(wxWindow *parent) +bool wxOS2Printer::Setup(wxWindow *WXUNUSED(parent)) { // TODO: /* wxPrintDialog dialog(parent, & m_printData); - dialog.GetPrintData().SetSetupDialog(TRUE); +#if WXWIN_COMPATIBILITY_2_4 + dialog.GetPrintData().SetSetupDialog(true); +#endif return (dialog.ShowModal() == wxID_OK); */ - return FALSE; + return false; } /* * Print preview */ -wxPrintPreview::wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data): +wxOS2PrintPreview::wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintDialogData *data): + wxPrintPreviewBase(printout, printoutForPrinting, data) +{ + DetermineScaling(); +} + +wxOS2PrintPreview::wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data): wxPrintPreviewBase(printout, printoutForPrinting, data) { DetermineScaling(); } -wxPrintPreview::~wxPrintPreview() +wxOS2PrintPreview::~wxOS2PrintPreview() { } -bool wxPrintPreview::Print(bool interactive) +bool wxOS2PrintPreview::Print(bool WXUNUSED(interactive)) { if (!m_printPrintout) - return FALSE; -// wxPrinter printer(&m_printData); + return false; +// wxOS2Printer printer(&m_printData); // return printer.Print(m_previewFrame, m_printPrintout, interactive); - return FALSE; + return false; } -void wxPrintPreview::DetermineScaling() +void wxOS2PrintPreview::DetermineScaling() { // TODO } +#endif //wxUSE_PRINTING_ARCHITECTURE