GCC 4.0 (Apple 4059) is a little bit pickier than 3.3.

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

diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h
index 5934eaf40a8dfbb8dd6a5ed850604998950a65bc..b0446273406db4ebb3d51e537b2c41938789dbfe 100644 (file)
--- a/include/wx/generic/printps.h
+++ b/include/wx/generic/printps.h
@@ -13,13 +13,13 @@
 #ifndef __PRINTPSH__
 #define __PRINTPSH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "printps.h"
 #endif
 
 #include "wx/prntbase.h"
 
-#if wxUSE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT
 
 // ----------------------------------------------------------------------------
 // Represents the printer: manages printing a wxPrintout object
@@ -27,15 +27,16 @@
 
 class WXDLLEXPORT wxPostScriptPrinter : public wxPrinterBase
 {
-    DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter)
-
 public:
     wxPostScriptPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
     virtual ~wxPostScriptPrinter();
 
-    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
+    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)
 };
 
 // ----------------------------------------------------------------------------
@@ -45,8 +46,6 @@ public:
 
 class WXDLLEXPORT wxPostScriptPrintPreview : public wxPrintPreviewBase
 {
-    DECLARE_CLASS(wxPostScriptPrintPreview)
-
 public:
     wxPostScriptPrintPreview(wxPrintout *printout,
                              wxPrintout *printoutForPrinting = (wxPrintout *) NULL,
@@ -62,6 +61,9 @@ public:
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
+
+private:
+    DECLARE_CLASS(wxPostScriptPrintPreview)
 };
 
 #endif