X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f90ec936573acad29a7050eb607e3b372953c7a..2e907fab47d506f5c8096b4a7675d9bd4216320e:/include/wx/prntbase.h

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 158019f4ee..1533a3d526 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
  */
@@ -56,6 +65,8 @@ public:
     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);
@@ -344,6 +358,7 @@ protected:
     int               m_maxPage;
 
     bool              m_isOk;
+    bool              m_printingPrepared; // Called OnPreparePrinting?
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);