projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't inherit the controls colours from the parent - at least for the background...
[wxWidgets.git]
/
contrib
/
samples
/
ogl
/
ogledit
/
doc.h
diff --git
a/contrib/samples/ogl/ogledit/doc.h
b/contrib/samples/ogl/ogledit/doc.h
index 09a841d494a085f9783cfd5b27475038f2f96911..71521baac7b0e89d67bd9f11a2db951861326cd8 100644
(file)
--- a/
contrib/samples/ogl/ogledit/doc.h
+++ b/
contrib/samples/ogl/ogledit/doc.h
@@
-17,14
+17,14
@@
#endif
#include <wx/docview.h>
#endif
#include <wx/docview.h>
+#include <wx/cmdproc.h>
#include <wx/string.h>
#include <wx/wxexpr.h>
#include <wx/ogl/ogl.h>
#if wxUSE_STD_IOSTREAM
#include <wx/string.h>
#include <wx/wxexpr.h>
#include <wx/ogl/ogl.h>
#if wxUSE_STD_IOSTREAM
-class ostream;
-class istream;
+ #include <iosfwd>
#endif
/*
#endif
/*
@@
-98,8
+98,8
@@
class DiagramDocument: public wxDocument
~DiagramDocument(void);
#if wxUSE_STD_IOSTREAM
~DiagramDocument(void);
#if wxUSE_STD_IOSTREAM
- virtual
ostream& SaveObject(
ostream& stream);
- virtual
istream& LoadObject(
istream& stream);
+ virtual
wxSTD ostream& SaveObject(wxSTD
ostream& stream);
+ virtual
wxSTD istream& LoadObject(wxSTD
istream& stream);
#else
virtual wxOutputStream& SaveObject(wxOutputStream& stream);
virtual wxInputStream& LoadObject(wxInputStream& stream);
#else
virtual wxOutputStream& SaveObject(wxOutputStream& stream);
virtual wxInputStream& LoadObject(wxInputStream& stream);