projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
abstract VC6 workaround inside a WX_CPPUNIT_ALLOW_EQUALS_TO_INT() macro
[wxWidgets.git]
/
include
/
wx
/
wx.h
diff --git
a/include/wx/wx.h
b/include/wx/wx.h
index 2ce5db4d0883dfc4a81539d9028e3b26e8692b4f..fb2696046d7c725d2fa3183f126ccc77dbaf5125 100644
(file)
--- a/
include/wx/wx.h
+++ b/
include/wx/wx.h
@@
-18,6
+18,7
@@
#include "wx/list.h"
#include "wx/hash.h"
#include "wx/string.h"
#include "wx/list.h"
#include "wx/hash.h"
#include "wx/string.h"
+#include "wx/hashmap.h"
#include "wx/arrstr.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/arrstr.h"
#include "wx/intl.h"
#include "wx/log.h"
@@
-26,19
+27,34
@@
#include "wx/utils.h"
#include "wx/stream.h"
#include "wx/memory.h"
#include "wx/utils.h"
#include "wx/stream.h"
#include "wx/memory.h"
+#include "wx/math.h"
+#include "wx/stopwatch.h"
+#include "wx/timer.h"
+#include "wx/module.h"
+#include "wx/wxcrt.h"
+#include "wx/wxcrtvararg.h"
#if wxUSE_GUI
#include "wx/window.h"
#if wxUSE_GUI
#include "wx/window.h"
+#include "wx/containr.h"
#include "wx/panel.h"
#include "wx/toplevel.h"
#include "wx/frame.h"
#include "wx/panel.h"
#include "wx/toplevel.h"
#include "wx/frame.h"
+#include "wx/gdicmn.h"
+#include "wx/gdiobj.h"
+#include "wx/region.h"
+#include "wx/bitmap.h"
+#include "wx/image.h"
+#include "wx/colour.h"
+#include "wx/font.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/dcmemory.h"
#include "wx/dcprint.h"
#include "wx/dcscreen.h"
#include "wx/button.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/dcmemory.h"
#include "wx/dcprint.h"
#include "wx/dcscreen.h"
#include "wx/button.h"
+#include "wx/menuitem.h"
#include "wx/menu.h"
#include "wx/pen.h"
#include "wx/brush.h"
#include "wx/menu.h"
#include "wx/pen.h"
#include "wx/brush.h"
@@
-46,10
+62,10
@@
#include "wx/icon.h"
#include "wx/cursor.h"
#include "wx/dialog.h"
#include "wx/icon.h"
#include "wx/cursor.h"
#include "wx/dialog.h"
-#include "wx/timer.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/cmndata.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/cmndata.h"
+#include "wx/dataobj.h"
#include "wx/control.h"
#include "wx/ctrlsub.h"
#include "wx/control.h"
#include "wx/ctrlsub.h"
@@
-89,4
+105,3
@@
#endif // wxUSE_GUI
#endif // _WX_WX_H_
#endif // wxUSE_GUI
#endif // _WX_WX_H_
-