move code ignoring VK_SPACE and VK_RETURN WM_CHAR messages to MSWDefWindowProc()...

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

diff --git a/src/os2/print.cpp b/src/os2/print.cpp
index 3ff04265e22806fe9d709ab19cb3016f0c0db93f..ae86ae556a72f117261e17480fd13e28b3c9f3af 100644 (file)
--- a/src/os2/print.cpp
+++ b/src/os2/print.cpp
@@ -6,7 +6,7 @@
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -21,32 +21,32 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 
 #if wxUSE_PRINTING_ARCHITECTURE
 

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

 #include "wx/generic/prntdlgg.h"
 
 #include "wx/generic/prntdlgg.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase)
-IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)
+IMPLEMENT_DYNAMIC_CLASS(wxOS2Printer, wxPrinterBase)
+IMPLEMENT_CLASS(wxOS2PrintPreview, wxPrintPreviewBase)

 
 /*
  * Printer
  */
 
 
 /*
  * 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 *parent, wxPrintout *printout, bool prompt)

 {
     // TODO. See wxPostScriptPrinter::Print for hints.
     return FALSE;
 }
 
 {
     // TODO. See wxPostScriptPrinter::Print for hints.
     return FALSE;
 }
 

-wxDC* wxPrinter::PrintDialog(wxWindow *parent)
+wxDC* wxOS2Printer::PrintDialog(wxWindow *parent)

 {
 // TODO:
 /*
 {
 // TODO:
 /*


@@ -56,7 +56,7 @@ wxDC* wxPrinter::PrintDialog(wxWindow *parent)
     return NULL;
 }
 
     return NULL;
 }
 

-bool wxPrinter::Setup(wxWindow *parent)
+bool wxOS2Printer::Setup(wxWindow *parent)

 {
 // TODO:
 /*
 {
 // TODO:
 /*


@@ -71,26 +71,32 @@ bool wxPrinter::Setup(wxWindow *parent)
  * Print preview
  */
 
  * Print preview
  */
 

-wxPrintPreview::wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):
+wxOS2PrintPreview::wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintDialogData *data):

   wxPrintPreviewBase(printout, printoutForPrinting, data)
 {
     DetermineScaling();
 }
 
   wxPrintPreviewBase(printout, printoutForPrinting, data)
 {
     DetermineScaling();
 }
 

-wxPrintPreview::~wxPrintPreview()
+wxOS2PrintPreview::wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):
+  wxPrintPreviewBase(printout, printoutForPrinting, data)
+{
+    DetermineScaling();
+}
+
+wxOS2PrintPreview::~wxOS2PrintPreview()

 {
 }
 
 {
 }
 

-bool wxPrintPreview::Print(bool interactive)
+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;
 }
 

-void wxPrintPreview::DetermineScaling()
+void wxOS2PrintPreview::DetermineScaling()

 {
     // TODO
 }
 {
     // TODO
 }