compilation fixes for wxGTK1 after wxTextEntry changes (unit test still fails, Replac...

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

diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h
index 8248fc7893d972f02d6161cb9c33470d297bec61..ba97deea537b3c1e039263a9c7e1b24760801dc1 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
-*/
+#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT
 
-class WXDLLEXPORT wxPostScriptPrinter: public wxPrinterBase
+// ----------------------------------------------------------------------------
+// Represents the printer: manages printing a wxPrintout object
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPostScriptPrinter : public wxPrinterBase
 {
-    DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter)
-        
 public:
     wxPostScriptPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
-    ~wxPostScriptPrinter(void);
-    
-    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
+    virtual ~wxPostScriptPrinter();
+
+    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);
     virtual wxDC* 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.
-*/
+// ----------------------------------------------------------------------------
+// wxPrintPreview: programmer creates an object of this class to preview a
+// wxPrintout.
+// ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPostScriptPrintPreview: public wxPrintPreviewBase
+class WXDLLEXPORT wxPostScriptPrintPreview : public wxPrintPreviewBase
 {
-    DECLARE_CLASS(wxPostScriptPrintPreview)
-        
 public:
-    wxPostScriptPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = (wxPrintout *) NULL, wxPrintDialogData *data = (wxPrintDialogData *) NULL);
-    ~wxPostScriptPrintPreview(void);
-    
+    wxPostScriptPrintPreview(wxPrintout *printout,
+                             wxPrintout *printoutForPrinting = (wxPrintout *) NULL,
+                             wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+    wxPostScriptPrintPreview(wxPrintout *printout,
+                             wxPrintout *printoutForPrinting,
+                             wxPrintData *data);
+
+    virtual ~wxPostScriptPrintPreview();
+
     virtual bool Print(bool interactive);
-    virtual void DetermineScaling(void);
+    virtual void DetermineScaling();
+
+private:
+    void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
+
+private:
+    DECLARE_CLASS(wxPostScriptPrintPreview)
 };
 
+#endif
+
 #endif
 // __PRINTPSH__