added wxImage::CanRead

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

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 04ad68da24122c0e358ed4d3e21d3a482ed6c6e5..158019f4ee2f72b7b2ed56543c7cddb2e960917a 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"


@@ -64,7 +67,6 @@ public:
 protected:
     wxPrintDialogData     m_printDialogData;
     wxPrintout*           m_currentPrintout;
 protected:
     wxPrintDialogData     m_printDialogData;
     wxPrintout*           m_currentPrintout;

-

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


@@ -187,7 +189,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;


@@ -240,8 +241,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 &event) { OnNext(); }
+    void OnPreviousButton(wxCommandEvent &event) { OnPrevious(); }
+    void OnChar(wxKeyEvent &event);

     void OnZoom(wxCommandEvent& event);
     void OnPaint(wxPaintEvent& event);
 
     void OnZoom(wxCommandEvent& event);
     void OnPaint(wxPaintEvent& event);
 


@@ -368,5 +372,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+#endif // wxUSE_PRINTING_ARCHITECTURE
+

 #endif
     // _WX_PRNTBASEH__
 #endif
     // _WX_PRNTBASEH__