test for wxLog interaction with wxYield better

[wxWidgets.git] / include / wx / prntbase.h

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 9e3cd730bcd07c982fb6b7beed21d3eaac78e6ec..d51919bab1191c61397e1a69fcb8beadf065ef27 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -17,6 +17,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_PRINTING_ARCHITECTURE
+

 #include "wx/event.h"
 #include "wx/cmndata.h"
 #include "wx/panel.h"
 #include "wx/event.h"
 #include "wx/cmndata.h"
 #include "wx/panel.h"


@@ -35,6 +38,15 @@ class WXDLLEXPORT wxPreviewCanvas;
 class WXDLLEXPORT wxPreviewControlBar;
 class WXDLLEXPORT wxPreviewFrame;
 
 class WXDLLEXPORT wxPreviewControlBar;
 class WXDLLEXPORT wxPreviewFrame;
 

+
+enum wxPrinterError
+{
+    wxPRINTER_NO_ERROR = 0,
+    wxPRINTER_CANCELLED,
+    wxPRINTER_ERROR
+};
+
+

 /*
  * Represents the printer: manages printing a wxPrintout object
  */
 /*
  * Represents the printer: manages printing a wxPrintout object
  */


@@ -48,11 +60,13 @@ public:
     virtual ~wxPrinterBase();
 
     virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
     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; }
 
     wxPrintDialogData& GetPrintDialogData() const
         { return (wxPrintDialogData&) m_printDialogData; }
     bool GetAbort() const { return sm_abortIt; }

+    
+    static wxPrinterError GetLastError() { return sm_lastError; }

 
     ///////////////////////////////////////////////////////////////////////////
     // OVERRIDES
 
     ///////////////////////////////////////////////////////////////////////////
     // OVERRIDES


@@ -64,6 +78,9 @@ public:
 protected:
     wxPrintDialogData     m_printDialogData;
     wxPrintout*           m_currentPrintout;
 protected:
     wxPrintDialogData     m_printDialogData;
     wxPrintout*           m_currentPrintout;

+    
+    static wxPrinterError sm_lastError;
+    

 public:
     static wxWindow*      sm_abortWindow;
     static bool           sm_abortIt;
 public:
     static wxWindow*      sm_abortWindow;
     static bool           sm_abortIt;


@@ -186,7 +203,6 @@ public:
     virtual void Initialize();
     virtual void CreateCanvas();
     virtual void CreateControlBar();
     virtual void Initialize();
     virtual void CreateCanvas();
     virtual void CreateControlBar();

-

 protected:
     wxWindow*             m_previewCanvas;
     wxPreviewControlBar*  m_controlBar;
 protected:
     wxWindow*             m_previewCanvas;
     wxPreviewControlBar*  m_controlBar;


@@ -239,8 +255,11 @@ public:
 
     void OnPrint(wxCommandEvent& event);
     void OnWindowClose(wxCommandEvent& event);
 
     void OnPrint(wxCommandEvent& event);
     void OnWindowClose(wxCommandEvent& event);

-    void OnNext(wxCommandEvent& event);
-    void OnPrevious(wxCommandEvent& event);
+    void OnNext();
+    void 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);
 
     void OnZoom(wxCommandEvent& event);
     void OnPaint(wxPaintEvent& event);
 


@@ -339,6 +358,7 @@ protected:
     int               m_maxPage;
 
     bool              m_isOk;
     int               m_maxPage;
 
     bool              m_isOk;

+    bool              m_printingPrepared; // Called OnPreparePrinting?

 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);


@@ -367,5 +387,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+#endif // wxUSE_PRINTING_ARCHITECTURE
+

 #endif
     // _WX_PRNTBASEH__
 #endif
     // _WX_PRNTBASEH__