projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor tweek for WXPM
[wxWidgets.git]
/
include
/
wx
/
prntbase.h
diff --git
a/include/wx/prntbase.h
b/include/wx/prntbase.h
index 9e3cd730bcd07c982fb6b7beed21d3eaac78e6ec..f323f25e850c20a175357ef5fb98c6c9210e432c 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"
@@
-186,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;
@@
-239,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 & 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
+344,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
+373,7
@@
private:
DECLARE_EVENT_TABLE()
};
DECLARE_EVENT_TABLE()
};
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
#endif
// _WX_PRNTBASEH__
#endif
// _WX_PRNTBASEH__