X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1044a386f0521b9b805b142547783acb96d1a406..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/prntbase.h?ds=sidebyside diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h index ebc51df027..d51919bab1 100644 --- a/include/wx/prntbase.h +++ b/include/wx/prntbase.h @@ -38,6 +38,15 @@ class WXDLLEXPORT wxPreviewCanvas; class WXDLLEXPORT wxPreviewControlBar; class WXDLLEXPORT wxPreviewFrame; + +enum wxPrinterError +{ + wxPRINTER_NO_ERROR = 0, + wxPRINTER_CANCELLED, + wxPRINTER_ERROR +}; + + /* * Represents the printer: manages printing a wxPrintout object */ @@ -51,11 +60,13 @@ public: virtual ~wxPrinterBase(); virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout); - virtual void ReportError(wxWindow *parent, wxPrintout *printout, char *message); + virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message); wxPrintDialogData& GetPrintDialogData() const { return (wxPrintDialogData&) m_printDialogData; } bool GetAbort() const { return sm_abortIt; } + + static wxPrinterError GetLastError() { return sm_lastError; } /////////////////////////////////////////////////////////////////////////// // OVERRIDES @@ -67,6 +78,9 @@ public: protected: wxPrintDialogData m_printDialogData; wxPrintout* m_currentPrintout; + + static wxPrinterError sm_lastError; + public: static wxWindow* sm_abortWindow; static bool sm_abortIt; @@ -243,8 +257,8 @@ public: void OnWindowClose(wxCommandEvent& event); void OnNext(); void OnPrevious(); - void OnNextButton(wxCommandEvent &event) { OnNext(); } - void OnPreviousButton(wxCommandEvent &event) { OnPrevious(); } + void OnNextButton(wxCommandEvent & WXUNUSED(event)) { OnNext(); } + void OnPreviousButton(wxCommandEvent & WXUNUSED(event)) { OnPrevious(); } void OnChar(wxKeyEvent &event); void OnZoom(wxCommandEvent& event); void OnPaint(wxPaintEvent& event);