projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added status bar fields styles support (patch 988292)
[wxWidgets.git]
/
include
/
wx
/
wx.h
diff --git
a/include/wx/wx.h
b/include/wx/wx.h
index 2d40e924ecf213b0813cc5b031f2bcaa9bb6303f..062cc30a09b10b2aef8ddcec3feba818bffd8795 100644
(file)
--- a/
include/wx/wx.h
+++ b/
include/wx/wx.h
@@
-1,6
+1,6
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// 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
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
@@
-9,8
+9,8
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_WX
H_
_
-#define _WX_WX
H_
_
+#ifndef _WX_WX
_H
_
+#define _WX_WX
_H
_
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/defs.h"
#include "wx/object.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
@@
-36,7
+37,6
@@
#include "wx/dcscreen.h"
#include "wx/button.h"
#include "wx/menu.h"
#include "wx/dcscreen.h"
#include "wx/button.h"
#include "wx/menu.h"
-#include "wx/list.h"
#include "wx/pen.h"
#include "wx/brush.h"
#include "wx/palette.h"
#include "wx/pen.h"
#include "wx/brush.h"
#include "wx/palette.h"
@@
-48,8
+48,11
@@
#include "wx/msgdlg.h"
#include "wx/cmndata.h"
#include "wx/msgdlg.h"
#include "wx/cmndata.h"
+#include "wx/control.h"
+#include "wx/ctrlsub.h"
#include "wx/bmpbuttn.h"
#include "wx/checkbox.h"
#include "wx/bmpbuttn.h"
#include "wx/checkbox.h"
+#include "wx/checklst.h"
#include "wx/choice.h"
#include "wx/scrolbar.h"
#include "wx/stattext.h"
#include "wx/choice.h"
#include "wx/scrolbar.h"
#include "wx/stattext.h"
@@
-61,32
+64,28
@@
#include "wx/textctrl.h"
#include "wx/slider.h"
#include "wx/gauge.h"
#include "wx/textctrl.h"
#include "wx/slider.h"
#include "wx/gauge.h"
+#include "wx/scrolwin.h"
+#include "wx/dirdlg.h"
+#include "wx/toolbar.h"
#include "wx/combobox.h"
#include "wx/layout.h"
#include "wx/sizer.h"
#include "wx/memory.h"
#include "wx/mdi.h"
#include "wx/combobox.h"
#include "wx/layout.h"
#include "wx/sizer.h"
#include "wx/memory.h"
#include "wx/mdi.h"
-#include "wx/scrolwin.h"
#include "wx/statusbr.h"
#include "wx/scrolbar.h"
#include "wx/choicdlg.h"
#include "wx/textdlg.h"
#include "wx/filedlg.h"
#include "wx/statusbr.h"
#include "wx/scrolbar.h"
#include "wx/choicdlg.h"
#include "wx/textdlg.h"
#include "wx/filedlg.h"
-#include "wx/dirdlg.h"
-#include "wx/toolbar.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_
+