projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include wx/colour.h according to precompiled headers of wx/wx.h (with other minor...
[wxWidgets.git]
/
include
/
wx
/
prntbase.h
diff --git
a/include/wx/prntbase.h
b/include/wx/prntbase.h
index 43b6c7cf9e8a143484483a11895ce63f0ea75a3e..23b60fca7d581bbf81b90136e573d7a24e062cbc 100644
(file)
--- a/
include/wx/prntbase.h
+++ b/
include/wx/prntbase.h
@@
-12,10
+12,6
@@
#ifndef _WX_PRNTBASEH__
#define _WX_PRNTBASEH__
#ifndef _WX_PRNTBASEH__
#define _WX_PRNTBASEH__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "prntbase.h"
-#endif
-
#include "wx/defs.h"
#if wxUSE_PRINTING_ARCHITECTURE
#include "wx/defs.h"
#if wxUSE_PRINTING_ARCHITECTURE
@@
-99,6
+95,7
@@
public:
static void SetPrintFactory( wxPrintFactory *factory );
static wxPrintFactory *GetFactory();
static void SetPrintFactory( wxPrintFactory *factory );
static wxPrintFactory *GetFactory();
+private:
static wxPrintFactory *m_factory;
};
static wxPrintFactory *m_factory;
};
@@
-313,11
+310,14
@@
public:
void OnPaint(wxPaintEvent& event);
void OnChar(wxKeyEvent &event);
void OnPaint(wxPaintEvent& event);
void OnChar(wxKeyEvent &event);
-
// Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event);
private:
// Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event);
private:
+#if wxUSE_MOUSEWHEEL
+ void OnMouseWheel(wxMouseEvent& event);
+#endif // wxUSE_MOUSEWHEEL
+
wxPrintPreviewBase* m_printPreview;
DECLARE_CLASS(wxPreviewCanvas)
wxPrintPreviewBase* m_printPreview;
DECLARE_CLASS(wxPreviewCanvas)