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 ba97deea537b3c1e039263a9c7e1b24760801dc1..290f8942fa91dd6cc1c9b240956aba14cd688d38 100644 (file)
--- a/include/wx/generic/printps.h
+++ b/include/wx/generic/printps.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxPostScriptPrinter, wxPostScriptPrintPreview
 //              wxGenericPageSetupDialog
 // Author:      Julian Smart
 // Purpose:     wxPostScriptPrinter, wxPostScriptPrintPreview
 //              wxGenericPageSetupDialog
 // Author:      Julian Smart


@@ -21,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);


@@ -40,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);