projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eVC3 compatibility workaround.
[wxWidgets.git]
/
include
/
wx
/
wx.h
diff --git
a/include/wx/wx.h
b/include/wx/wx.h
index e53cfcdddb23fd5b7f13ece8b8286c348a2b045c..46af2cd1dd4d02a8f26ba89f6461a3bf960e0f18 100644
(file)
--- a/
include/wx/wx.h
+++ b/
include/wx/wx.h
@@
-1,17
+1,17
@@
-#ifndef _WX_WXH__
-#define _WX_WXH__
-
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: wx.h
-// Purpose: wxWi
ndows main include file
+// Name: wx
/wx
.h
+// Purpose: wxWi
dgets central header including the most often used ones
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c)
+// Copyright: (c)
Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+#ifndef _WX_WX_H_
+#define _WX_WX_H_
+
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/dynarray.h"
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/dynarray.h"
@@
-23,6
+23,7
@@
#include "wx/event.h"
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/utils.h"
+#include "wx/stream.h"
#if wxUSE_GUI
#if wxUSE_GUI
@@
-77,18
+78,14
@@
#include "wx/textdlg.h"
#include "wx/filedlg.h"
#include "wx/textdlg.h"
#include "wx/filedlg.h"
-#include "wx/validate.h" // always include, even if !wxUSE_VALIDATORS
+// always include, even if !wxUSE_VALIDATORS because we need wxDefaultValidator
+#include "wx/validate.h"
#if wxUSE_VALIDATORS
#include "wx/valtext.h"
#endif // wxUSE_VALIDATORS
#if wxUSE_VALIDATORS
#include "wx/valtext.h"
#endif // wxUSE_VALIDATORS
-#if wxUSE_SERIAL
- #include "wx/objstrm.h"
- #include "wx/serbase.h"
-#endif // wxUSE_SERIAL
-
#endif // wxUSE_GUI
#endif // wxUSE_GUI
-#endif
- // _WX_WXH__
+#endif
// _WX_WX_H_
+