Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h
index b0446273406db4ebb3d51e537b2c41938789dbfe..290f8942fa91dd6cc1c9b240956aba14cd688d38 100644 (file)
--- a/include/wx/generic/printps.h
+++ b/include/wx/generic/printps.h
@@ -1,22 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        printps.h
+// Name:        wx/generic/printps.h

 // Purpose:     wxPostScriptPrinter, wxPostScriptPrintPreview
 //              wxGenericPageSetupDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxPostScriptPrinter, wxPostScriptPrintPreview
 //              wxGenericPageSetupDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __PRINTPSH__
 #define __PRINTPSH__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __PRINTPSH__
 #define __PRINTPSH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "printps.h"
-#endif
-

 #include "wx/prntbase.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT
 #include "wx/prntbase.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT


@@ -25,10 +21,10 @@
 // Represents the printer: manages printing a wxPrintout object
 // ----------------------------------------------------------------------------
 
 // Represents the printer: manages printing a wxPrintout object
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPostScriptPrinter : public wxPrinterBase
+class WXDLLIMPEXP_CORE wxPostScriptPrinter : public wxPrinterBase

 {
 public:
 {
 public:

-    wxPostScriptPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+    wxPostScriptPrinter(wxPrintDialogData *data = NULL);

     virtual ~wxPostScriptPrinter();
 
     virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);
     virtual ~wxPostScriptPrinter();
 
     virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);


@@ -44,12 +40,12 @@ private:
 // wxPrintout.
 // ----------------------------------------------------------------------------
 
 // wxPrintout.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPostScriptPrintPreview : public wxPrintPreviewBase
+class WXDLLIMPEXP_CORE wxPostScriptPrintPreview : public wxPrintPreviewBase

 {
 public:
     wxPostScriptPrintPreview(wxPrintout *printout,
 {
 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);
     wxPostScriptPrintPreview(wxPrintout *printout,
                              wxPrintout *printoutForPrinting,
                              wxPrintData *data);