made wxCommandEvent::GetInt() return int, not long (patch 1473771)

[wxWidgets.git] / src / os2 / print.cpp

diff --git a/src/os2/print.cpp b/src/os2/print.cpp
index ae86ae556a72f117261e17480fd13e28b3c9f3af..8bee414a332583c165af3a998a910ce6cd04ee8e 100644 (file)
--- 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,16 +11,15 @@
 
 #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/printos2.h"
 #include "wx/generic/prntdlgg.h"
 
@@ -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,15 +57,17 @@ 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);
+#if WXWIN_COMPATIBILITY_2_4
+    dialog.GetPrintData().SetSetupDialog(true);
+#endif
     return (dialog.ShowModal() == wxID_OK);
 */
-    return FALSE;
+    return false;
 }
 
 /*
@@ -87,13 +90,13 @@ wxOS2PrintPreview::~wxOS2PrintPreview()
 {
 }
 
-bool wxOS2PrintPreview::Print(bool interactive)
+bool wxOS2PrintPreview::Print(bool WXUNUSED(interactive))
 {
     if (!m_printPrintout)
-        return FALSE;
+        return false;
 //    wxOS2Printer printer(&m_printData);
 //    return printer.Print(m_previewFrame, m_printPrintout, interactive);
-    return FALSE;
+    return false;
 }
 
 void wxOS2PrintPreview::DetermineScaling()