exposing control key combinations as before, fixing unicodekey casing

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

diff --git a/src/os2/print.cpp b/src/os2/print.cpp
index ee078d057ef2b1d9bc8b952cdf1db3276b4f7101..ee4fda74fc9be09c023decfa12c94cf9d3deb153 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:
 // Purpose:     Print framework
 // Author:      David Webster
 // Modified by:


@@ -11,41 +11,43 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #ifndef WX_PRECOMP
 #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
 
 #endif
 

-
-#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 *WXUNUSED(parent),
+                         wxPrintout *WXUNUSED(printout),
+                         bool WXUNUSED(prompt))

 {
     // TODO. See wxPostScriptPrinter::Print for hints.
 {
     // TODO. See wxPostScriptPrinter::Print for hints.

-    return FALSE;
+    return false;

 }
 
 }
 

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

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


@@ -55,42 +57,48 @@ wxDC* wxPrinter::PrintDialog(wxWindow *parent)
     return NULL;
 }
 
     return NULL;
 }
 

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

 {
 // TODO:
 /*
     wxPrintDialog dialog(parent, & m_printData);
 {
 // TODO:
 /*
     wxPrintDialog dialog(parent, & m_printData);

-    dialog.GetPrintData().SetSetupDialog(TRUE);

     return (dialog.ShowModal() == wxID_OK);
 */
     return (dialog.ShowModal() == wxID_OK);
 */

-    return FALSE;
+    return false;

 }
 
 /*
  * 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();
+}
+
+wxOS2PrintPreview::wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):

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

-wxPrintPreview::~wxPrintPreview()
+wxOS2PrintPreview::~wxOS2PrintPreview()

 {
 }
 
 {
 }
 

-bool wxPrintPreview::Print(bool interactive)
+bool wxOS2PrintPreview::Print(bool WXUNUSED(interactive))

 {
     if (!m_printPrintout)
 {
     if (!m_printPrintout)

-        return FALSE;
-//    wxPrinter printer(&m_printData);
+        return false;
+//    wxOS2Printer printer(&m_printData);

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

-    return FALSE;
+    return false;

 }
 
 }
 

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

 {
     // TODO
 }
 
 {
     // TODO
 }
 

+#endif  //wxUSE_PRINTING_ARCHITECTURE