fixing warning and compile error against 10.4

[wxWidgets.git] / include / wx / generic / printps.h

diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h
index 15213b91a030e117ff58f1511c71968bdd09de36..aae2d1ed333f74f6784f0651e4d0487fe915eee4 100644 (file)
--- a/include/wx/generic/printps.h
+++ b/include/wx/generic/printps.h
@@ -6,52 +6,63 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c)
-// Licence:    wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __PRINTPSH__
 #define __PRINTPSH__
 
-#ifdef __GNUG__
-#pragma interface "printps.h"
-#endif
-
 #include "wx/prntbase.h"
 
-/*
- * Represents the printer: manages printing a wxPrintout object
- */
- 
-class WXDLLEXPORT wxPostScriptPrinter: public wxPrinterBase
+#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT
+
+// ----------------------------------------------------------------------------
+// Represents the printer: manages printing a wxPrintout object
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxPostScriptPrinter : public wxPrinterBase
 {
-  DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter)
+public:
+    wxPostScriptPrinter(wxPrintDialogData *data = NULL);
+    virtual ~wxPostScriptPrinter();
 
- public:
-  wxPostScriptPrinter(wxPrintData *data = (wxPrintData *) NULL);
-  ~wxPostScriptPrinter(void);
+    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);
+    virtual wxDC* PrintDialog(wxWindow *parent);
+    virtual bool Setup(wxWindow *parent);
 
-  virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
-  virtual bool PrintDialog(wxWindow *parent);
-  virtual bool Setup(wxWindow *parent);
+private:
+    DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter)
 };
 
-/*
- * wxPrintPreview
- * Programmer creates an object of this class to preview a wxPrintout.
- */
- 
-class WXDLLEXPORT wxPostScriptPrintPreview: public wxPrintPreviewBase
+// ----------------------------------------------------------------------------
+// wxPrintPreview: programmer creates an object of this class to preview a
+// wxPrintout.
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxPostScriptPrintPreview : public wxPrintPreviewBase
 {
-  DECLARE_CLASS(wxPostScriptPrintPreview)
+public:
+    wxPostScriptPrintPreview(wxPrintout *printout,
+                             wxPrintout *printoutForPrinting = NULL,
+                             wxPrintDialogData *data = NULL);
+    wxPostScriptPrintPreview(wxPrintout *printout,
+                             wxPrintout *printoutForPrinting,
+                             wxPrintData *data);
 
- public:
-  wxPostScriptPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = (wxPrintout *) NULL, wxPrintData *data = (wxPrintData *) NULL);
-  ~wxPostScriptPrintPreview(void);
+    virtual ~wxPostScriptPrintPreview();
 
-  virtual bool Print(bool interactive);
-  virtual void DetermineScaling(void);
+    virtual bool Print(bool interactive);
+    virtual void DetermineScaling();
+
+private:
+    void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
+
+private:
+    DECLARE_CLASS(wxPostScriptPrintPreview)
 };
 
 #endif
-    // __PRINTPSH__
+
+#endif
+// __PRINTPSH__