[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/os2/print.cpp b/src/os2/print.cpp
index 61fd6e7e993835abbbd6d9bd7d9c27a7c9ca03c5..ae86ae556a72f117261e17480fd13e28b3c9f3af 100644 (file)
--- a/src/os2/print.cpp
+++ b/src/os2/print.cpp
@@ -1,82 +1,104 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        print.cpp
 // Purpose:     Print framework
 /////////////////////////////////////////////////////////////////////////////
 // Name:        print.cpp
 // Purpose:     Print framework

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/14/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "print.h"
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+#include <stdio.h>
+#include "wx/setup.h"
+#include "wx/list.h"
+#include "wx/utils.h"
+#include "wx/app.h"

 #endif
 
 #endif
 

-#include "wx/stubs/print.h"
-#include "wx/stubs/printdlg.h"
+#if wxUSE_PRINTING_ARCHITECTURE

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase)
-IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)
-#endif
+#include "wx/os2/printos2.h"
+#include "wx/generic/prntdlgg.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxOS2Printer, wxPrinterBase)
+IMPLEMENT_CLASS(wxOS2PrintPreview, wxPrintPreviewBase)

 
 /*
  * Printer
  */
 
 /*
  * Printer
  */

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

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

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

 {
 {

+// TODO:
+/*

     wxPrintDialog dialog(parent, & m_printData);
     wxPrintDialog dialog(parent, & m_printData);

-    return (dialog.ShowModal() == wxID_OK);
+    return (dialog.GetPrintDC());
+*/
+    return NULL;

 }
 
 }
 

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

 {
 {

+// TODO:
+/*

     wxPrintDialog dialog(parent, & m_printData);
     dialog.GetPrintData().SetSetupDialog(TRUE);
     return (dialog.ShowModal() == wxID_OK);
     wxPrintDialog dialog(parent, & m_printData);
     dialog.GetPrintData().SetSetupDialog(TRUE);
     return (dialog.ShowModal() == wxID_OK);

+*/
+    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();
 }
 
   wxPrintPreviewBase(printout, printoutForPrinting, data)
 {
     DetermineScaling();
 }
 

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

 {
 {

+    DetermineScaling();

 }
 
 }
 

-bool wxPrintPreview::Print(bool interactive)
+wxOS2PrintPreview::~wxOS2PrintPreview()
+{
+}
+
+bool wxOS2PrintPreview::Print(bool interactive)

 {
     if (!m_printPrintout)
         return FALSE;
 {
     if (!m_printPrintout)
         return FALSE;

-    wxPrinter printer(&m_printData);
-    return printer.Print(m_previewFrame, m_printPrintout, interactive);
+//    wxOS2Printer printer(&m_printData);
+//    return printer.Print(m_previewFrame, m_printPrintout, interactive);
+    return FALSE;

 }
 
 }
 

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

 {
     // TODO
 }
 
 {
     // TODO
 }
 

+#endif  //wxUSE_PRINTING_ARCHITECTURE