don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h
index 0921b4b85f5b91f86157917598c0c9bdbbbf7b78..aae2d1ed333f74f6784f0651e4d0487fe915eee4 100644 (file)
--- a/include/wx/generic/printps.h
+++ b/include/wx/generic/printps.h
@@ -6,17 +6,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c)
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __PRINTPSH__
 #define __PRINTPSH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "printps.h"
-#endif
-
 #include "wx/prntbase.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT
@@ -25,17 +21,18 @@
 // Represents the printer: manages printing a wxPrintout object
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPostScriptPrinter : public wxPrinterBase
+class WXDLLIMPEXP_CORE wxPostScriptPrinter : public wxPrinterBase
 {
-    DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter)
-
 public:
-    wxPostScriptPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+    wxPostScriptPrinter(wxPrintDialogData *data = 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)
 };
 
 // ----------------------------------------------------------------------------
@@ -43,14 +40,12 @@ public:
 // wxPrintout.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPostScriptPrintPreview : public wxPrintPreviewBase
+class WXDLLIMPEXP_CORE wxPostScriptPrintPreview : public wxPrintPreviewBase
 {
-    DECLARE_CLASS(wxPostScriptPrintPreview)
-
 public:
     wxPostScriptPrintPreview(wxPrintout *printout,
-                             wxPrintout *printoutForPrinting = (wxPrintout *) NULL,
-                             wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+                             wxPrintout *printoutForPrinting = NULL,
+                             wxPrintDialogData *data = NULL);
     wxPostScriptPrintPreview(wxPrintout *printout,
                              wxPrintout *printoutForPrinting,
                              wxPrintData *data);
@@ -62,6 +57,9 @@ public:
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
+
+private:
+    DECLARE_CLASS(wxPostScriptPrintPreview)
 };
 
 #endif