X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdf1e7142564c55f5299f1f2d0909090534eb97c..3c85ada9dbd66f72f174c049744e8cdaa444d99f:/src/os2/print.cpp

diff --git a/src/os2/print.cpp b/src/os2/print.cpp
index 7c95f90a23..9073078b2b 100644
--- a/src/os2/print.cpp
+++ b/src/os2/print.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        print.cpp
 // Purpose:     Print framework
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/14/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -19,22 +19,20 @@
 #include "wx/app.h"
 #endif
 
+#if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/os2/print.h"
-#include "wx/print.h"
-#include "wx/generic/printdlg.h"
+#include "wx/generic/prntdlgg.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)
-#endif
 
 /*
  * Printer
  */
- 
+
 wxPrinter::wxPrinter(wxPrintData *data):
-  wxPrinterBase(data)
+  wxPrinterBase((wxPrintDialogData*)data)
 {
 }
 
@@ -48,17 +46,25 @@ bool wxPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
     return FALSE;
 }
 
-bool wxPrinter::PrintDialog(wxWindow *parent)
+wxDC* wxPrinter::PrintDialog(wxWindow *parent)
 {
+// TODO:
+/*
     wxPrintDialog dialog(parent, & m_printData);
-    return (dialog.ShowModal() == wxID_OK);
+    return (dialog.GetPrintDC());
+*/
+    return NULL;
 }
 
 bool wxPrinter::Setup(wxWindow *parent)
 {
+// TODO:
+/*
     wxPrintDialog dialog(parent, & m_printData);
     dialog.GetPrintData().SetSetupDialog(TRUE);
     return (dialog.ShowModal() == wxID_OK);
+*/
+    return FALSE;
 }
 
 /*
@@ -79,8 +85,9 @@ bool wxPrintPreview::Print(bool interactive)
 {
     if (!m_printPrintout)
         return FALSE;
-    wxPrinter printer(&m_printData);
-    return printer.Print(m_previewFrame, m_printPrintout, interactive);
+//    wxPrinter printer(&m_printData);
+//    return printer.Print(m_previewFrame, m_printPrintout, interactive);
+    return FALSE;
 }
 
 void wxPrintPreview::DetermineScaling()
@@ -88,3 +95,4 @@ void wxPrintPreview::DetermineScaling()
     // TODO
 }
 
+#endif  //wxUSE_PRINTING_ARCHITECTURE