tons of wxFTP fixes and compilation fix for wxBase

[wxWidgets.git] / include / wx / os2 / print.h

diff --git a/include/wx/os2/print.h b/include/wx/os2/print.h
index bac37034962cd72e0986866376fd5d0438cda212..23db48af6d047636d0db930507933da218cc7bd2 100644 (file)
--- a/include/wx/os2/print.h
+++ b/include/wx/os2/print.h
@@ -1,27 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        print.h
 // Purpose:     wxPrinter, wxPrintPreview classes
-// 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
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINT_H_
 #define _WX_PRINT_H_
 
-#ifdef __GNUG__
-#pragma interface "print.h"
-#endif
-
 #include "wx/prntbase.h"
 
 /*
  * Represents the printer: manages printing a wxPrintout object
  */
- 
+
 class WXDLLEXPORT wxPrinter: public wxPrinterBase
 {
   DECLARE_DYNAMIC_CLASS(wxPrinter)
@@ -31,15 +27,16 @@ class WXDLLEXPORT wxPrinter: public wxPrinterBase
   ~wxPrinter();
 
   virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
-  virtual bool PrintDialog(wxWindow *parent);
+  virtual wxDC* PrintDialog(wxWindow *parent);
   virtual bool Setup(wxWindow *parent);
+private:
 };
 
 /*
  * wxPrintPreview
  * Programmer creates an object of this class to preview a wxPrintout.
  */
- 
+
 class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase
 {
   DECLARE_CLASS(wxPrintPreview)