Added stubs for OS/2 to new printing system.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/printos2.h b/include/wx/os2/printos2.h
new file mode 100644 (file)
index 0000000..e5a7fee
--- /dev/null
+++ b/include/wx/os2/printos2.h
@@ -0,0 +1,54 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        print.h
+// Purpose:     wxOS2Printer, wxOS2PrintPreview classes
+// Author:      David Webster
+// Modified by:
+// Created:     10/14/99
+// RCS-ID:      $Id$
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PRINT_H_
+#define _WX_PRINT_H_
+
+#include "wx/prntbase.h"
+
+/*
+ * Represents the printer: manages printing a wxPrintout object
+ */
+
+class WXDLLEXPORT wxOS2Printer: public wxPrinterBase
+{
+  DECLARE_DYNAMIC_CLASS(wxOS2Printer)
+
+ public:
+  wxOS2Printer(wxPrintDialogData *data = NULL);
+  ~wxOS2Printer();
+
+  virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
+  virtual wxDC* PrintDialog(wxWindow *parent);
+  virtual bool Setup(wxWindow *parent);
+private:
+};
+
+/*
+ * wxOS2PrintPreview
+ * Programmer creates an object of this class to preview a wxPrintout.
+ */
+
+class WXDLLEXPORT wxOS2PrintPreview: public wxPrintPreviewBase
+{
+  DECLARE_CLASS(wxOS2PrintPreview)
+
+ public:
+  wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintDialogData *data = NULL);
+  wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data);
+  ~wxOS2PrintPreview();
+
+  virtual bool Print(bool interactive);
+  virtual void DetermineScaling();
+};
+
+#endif
+    // _WX_PRINT_H_

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index d6dc62a0a45cb985316c4be44ed3203b8093b9c0..590624296f16c6711f52b4c51209ec1cd07da048 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -93,6 +93,8 @@ wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data )
     return new wxWindowsPrinter( data );
 #elif defined(__WXMAC__)
     return new wxMacPrinter( data );
     return new wxWindowsPrinter( data );
 #elif defined(__WXMAC__)
     return new wxMacPrinter( data );

+#elif defined(__WXPM__)
+    return new wxOS2Printer( data );

 #else
     return new wxPostScriptPrinter( data );
 #endif
 #else
     return new wxPostScriptPrinter( data );
 #endif


@@ -105,6 +107,8 @@ wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *previe
     return new wxWindowsPrintPreview( preview, printout, data );
 #elif defined(__WXMAC__)
     return new wxMacPrintPreview( preview, printout, data );
     return new wxWindowsPrintPreview( preview, printout, data );
 #elif defined(__WXMAC__)
     return new wxMacPrintPreview( preview, printout, data );

+#elif defined(__WXPM__)
+    return new wxOS2PrintPreview( preview, printout, data );

 #else
     return new wxPostScriptPrintPreview( preview, printout, data );
 #endif
 #else
     return new wxPostScriptPrintPreview( preview, printout, data );
 #endif


@@ -117,6 +121,8 @@ wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *previe
     return new wxWindowsPrintPreview( preview, printout, data );
 #elif defined(__WXMAC__)
     return new wxMacPrintPreview( preview, printout, data );
     return new wxWindowsPrintPreview( preview, printout, data );
 #elif defined(__WXMAC__)
     return new wxMacPrintPreview( preview, printout, data );

+#elif defined(__WXPM__)
+    return new wxOS2PrintPreview( preview, printout, data );

 #else
     return new wxPostScriptPrintPreview( preview, printout, data );
 #endif
 #else
     return new wxPostScriptPrintPreview( preview, printout, data );
 #endif

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;
 }