Use lib64 for 64-bit builds on some kinds of linux and lib/64 on solaris

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

diff --git a/src/os2/print.cpp b/src/os2/print.cpp
index 81afd6afc05e1eab6771a462e9b19dee287bc13d..ae86ae556a72f117261e17480fd13e28b3c9f3af 100644 (file)
--- a/src/os2/print.cpp
+++ b/src/os2/print.cpp
@@ -21,7 +21,7 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 
 #if wxUSE_PRINTING_ARCHITECTURE
 

-#include "wx/os2/print.h"
+#include "wx/os2/printos2.h"

 #include "wx/generic/prntdlgg.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxOS2Printer, wxPrinterBase)
 #include "wx/generic/prntdlgg.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxOS2Printer, wxPrinterBase)


@@ -31,8 +31,8 @@ IMPLEMENT_CLASS(wxOS2PrintPreview, wxPrintPreviewBase)
  * Printer
  */
 
  * Printer
  */
 

-wxOS2Printer::wxOS2Printer(wxPrintData *data):
-  wxPrinterBase((wxPrintDialogData*)data)
+wxOS2Printer::wxOS2Printer(wxPrintDialogData *data):
+  wxPrinterBase(data)

 {
 }
 
 {
 }
 


@@ -71,6 +71,12 @@ bool wxOS2Printer::Setup(wxWindow *parent)
  * Print preview
  */
 
  * 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)
 {
 wxOS2PrintPreview::wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):
   wxPrintPreviewBase(printout, printoutForPrinting, data)
 {


@@ -85,7 +91,7 @@ bool wxOS2PrintPreview::Print(bool interactive)
 {
     if (!m_printPrintout)
         return FALSE;
 {
     if (!m_printPrintout)
         return FALSE;

-//    wxPrinter printer(&m_printData);
+//    wxOS2Printer printer(&m_printData);

 //    return printer.Print(m_previewFrame, m_printPrintout, interactive);
     return FALSE;
 }
 //    return printer.Print(m_previewFrame, m_printPrintout, interactive);
     return FALSE;
 }