Include wx/containr.h according to precompiled headers of wx/wx.h (with other minor...

[wxWidgets.git] / include / wx / wx.h

diff --git a/include/wx/wx.h b/include/wx/wx.h
index a3bb3bfe06b22af0fcc8c2c2ae56be8c35a8ef2a..44756a08465e33b49445a4d1eef2927c5e9cb45f 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,13 +27,17 @@
 #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"

 
 #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/region.h"

 #include "wx/bitmap.h"
 #include "wx/colour.h"
 #include "wx/font.h"
 #include "wx/bitmap.h"
 #include "wx/colour.h"
 #include "wx/font.h"


@@ -42,6 +47,7 @@
 #include "wx/dcprint.h"
 #include "wx/dcscreen.h"
 #include "wx/button.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"


@@ -92,4 +98,3 @@
 #endif // wxUSE_GUI
 
 #endif // _WX_WX_H_
 #endif // wxUSE_GUI
 
 #endif // _WX_WX_H_

-