X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7804d121cbeedd20720b626a8e87e11e8bebe975..c765e6fb9df639bb4e65a8824ed13a42f457027b:/src/os2/print.cpp

diff --git a/src/os2/print.cpp b/src/os2/print.cpp
index 81afd6afc0..ee4fda74fc 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:
@@ -11,17 +11,16 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
 #endif
 
-#if wxUSE_PRINTING_ARCHITECTURE
-
-#include "wx/os2/print.h"
+#include "wx/os2/printos2.h"
 #include "wx/generic/prntdlgg.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxOS2Printer, wxPrinterBase)
@@ -31,8 +30,8 @@ IMPLEMENT_CLASS(wxOS2PrintPreview, wxPrintPreviewBase)
  * Printer
  */
 
-wxOS2Printer::wxOS2Printer(wxPrintData *data):
-  wxPrinterBase((wxPrintDialogData*)data)
+wxOS2Printer::wxOS2Printer(wxPrintDialogData *data):
+  wxPrinterBase(data)
 {
 }
 
@@ -40,13 +39,15 @@ wxOS2Printer::~wxOS2Printer()
 {
 }
 
-bool wxOS2Printer::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* wxOS2Printer::PrintDialog(wxWindow *parent)
+wxDC* wxOS2Printer::PrintDialog(wxWindow *WXUNUSED(parent))
 {
 // TODO:
 /*
@@ -56,21 +57,26 @@ wxDC* wxOS2Printer::PrintDialog(wxWindow *parent)
     return NULL;
 }
 
-bool wxOS2Printer::Setup(wxWindow *parent)
+bool wxOS2Printer::Setup(wxWindow *WXUNUSED(parent))
 {
 // TODO:
 /*
     wxPrintDialog dialog(parent, & m_printData);
-    dialog.GetPrintData().SetSetupDialog(TRUE);
     return (dialog.ShowModal() == wxID_OK);
 */
-    return FALSE;
+    return false;
 }
 
 /*
  * Print preview
  */
 
+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)
 {
@@ -81,13 +87,13 @@ wxOS2PrintPreview::~wxOS2PrintPreview()
 {
 }
 
-bool wxOS2PrintPreview::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 wxOS2PrintPreview::DetermineScaling()