projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved wxWinHandleHash below wxWindow declaration as otherwise the dtor of forward...
[wxWidgets.git]
/
include
/
wx
/
wx.h
diff --git
a/include/wx/wx.h
b/include/wx/wx.h
index 233ebcd16edf988bfbe4e7a18d61a1cf23078f68..08978f490210f4363f93f49e3a51a31ec58d8603 100644
(file)
--- a/
include/wx/wx.h
+++ b/
include/wx/wx.h
@@
-1,9
+1,6
@@
-#ifndef _WX_WXH__
-#define _WX_WXH__
-
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: wx.h
-// Purpose: wxWindows
main include file
+// Name: wx
/wx
.h
+// Purpose: wxWindows
central header including the most often used ones
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
@@
-12,6
+9,9
@@
// 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"
@@
-78,7
+78,8
@@
#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"
#if wxUSE_VALIDATORS
#include "wx/valtext.h"
@@
-86,5
+87,5
@@
#endif // wxUSE_GUI
#endif // wxUSE_GUI
-#endif
- // _WX_WXH__
+#endif
// _WX_WX_H_
+