undo the last change as it results in buildbot configuration error

[wxWidgets.git] / interface / wx / print.h

diff --git a/interface/wx/print.h b/interface/wx/print.h
index 072ba8d84277c67bb4e253ec27077ba5e9862a2a..53ce4e2f3eb356d8bb692a5bb62d10aeb2a72878 100644 (file)
--- a/interface/wx/print.h
+++ b/interface/wx/print.h
@@ -140,12 +140,12 @@ public:
         Pass a print preview object plus other normal frame arguments.
         The print preview object will be destroyed by the frame when it closes.
     */
         Pass a print preview object plus other normal frame arguments.
         The print preview object will be destroyed by the frame when it closes.
     */

-    wxPreviewFrame(wxPrintPreview* preview, wxWindow* parent,
-                   const wxString& title,
+    wxPreviewFrame(wxPrintPreviewBase* preview, wxWindow* parent,
+                   const wxString& title = "Print Preview",

                    const wxPoint& pos = wxDefaultPosition,
                    const wxPoint& pos = wxDefaultPosition,

-                   const wxSize& size size = wxDefaultSize,
+                   const wxSize& size = wxDefaultSize,

                    long style = wxDEFAULT_FRAME_STYLE,
                    long style = wxDEFAULT_FRAME_STYLE,

-                   const wxString& name = "frame");
+                   const wxString& name = wxFrameNameStr);

 
     /**
         Destructor.
 
     /**
         Destructor.


@@ -231,8 +231,8 @@ public:
         Use IsOk() to check whether the wxPrintPreview object was created correctly.
     */
     wxPrintPreview(wxPrintout* printout,
         Use IsOk() to check whether the wxPrintPreview object was created correctly.
     */
     wxPrintPreview(wxPrintout* printout,

-                   wxPrintout* printoutForPrinting,
-                   wxPrintData* data = NULL);
+                   wxPrintout* printoutForPrinting = NULL,
+                   wxPrintDialogData* data = NULL);

 
     /**
         Destructor.
 
     /**
         Destructor.


@@ -295,7 +295,7 @@ public:
         The implementation simply blits the preview bitmap onto
         the canvas, creating a new preview bitmap if none exists.
     */
         The implementation simply blits the preview bitmap onto
         the canvas, creating a new preview bitmap if none exists.
     */

-    bool PaintPage(wxPreviewCanvas* canvas, wxDC dc);
+    virtual bool PaintPage(wxPreviewCanvas* canvas, wxDC& dc);

 
     /**
         Invokes the print process using the second wxPrintout object
 
     /**
         Invokes the print process using the second wxPrintout object


@@ -321,7 +321,7 @@ public:
     /**
         Sets the current page to be previewed.
     */
     /**
         Sets the current page to be previewed.
     */

-    void SetCurrentPage(int pageNum);
+    virtual bool SetCurrentPage(int pageNum);

 
     /**
         Sets the frame to be used for displaying the print preview canvas
 
     /**
         Sets the frame to be used for displaying the print preview canvas


@@ -373,7 +373,7 @@ public:
     /**
         Creates the default printing abort window, with a cancel button.
     */
     /**
         Creates the default printing abort window, with a cancel button.
     */

-    void CreateAbortWindow(wxWindow* parent, wxPrintout* printout);
+    virtual wxWindow* CreateAbortWindow(wxWindow* parent, wxPrintout* printout);

 
     /**
         Returns @true if the user has aborted the print job.
 
     /**
         Returns @true if the user has aborted the print job.


@@ -411,8 +411,8 @@ public:
         context (current printer not set, for example) or the user cancelled printing.
         Call GetLastError() to get detailed information about the kind of the error.
     */
         context (current printer not set, for example) or the user cancelled printing.
         Call GetLastError() to get detailed information about the kind of the error.
     */

-    bool Print(wxWindow* parent, wxPrintout* printout,
-               bool prompt = true);
+    virtual bool Print(wxWindow* parent, wxPrintout* printout,
+                       bool prompt = true);

 
     /**
         Invokes the print dialog.
 
     /**
         Invokes the print dialog.


@@ -429,8 +429,8 @@ public:
     /**
         Default error-reporting function.
     */
     /**
         Default error-reporting function.
     */

-    void ReportError(wxWindow* parent, wxPrintout* printout,
-                     const wxString& message);
+    virtual void ReportError(wxWindow* parent, wxPrintout* printout,
+                             const wxString& message);

 
     /**
         Invokes the print setup dialog.
 
     /**
         Invokes the print setup dialog.


@@ -621,8 +621,8 @@ public:
         four integers.
         @endWxPythonOnly
     */
         four integers.
         @endWxPythonOnly
     */

-    void GetPageInfo(int* minPage, int* maxPage, int* pageFrom,
-                     int* pageTo);
+    virtual void GetPageInfo(int* minPage, int* maxPage, int* pageFrom,
+                             int* pageTo);

 
     /**
         Returns the size of the printer page in millimetres.
 
     /**
         Returns the size of the printer page in millimetres.