Add wxToolBarToolBase, missing flags, etc.

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index df72b056b255e35ee1d2b1d6fa00981cbf299a6d..396d8f595d62163d209beb3ef83f21c1609b0317 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -29,8 +29,10 @@
 #include "wx/memory.h"
 #include "wx/math.h"
 #include "wx/stopwatch.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/module.h"
 #include "wx/wxcrt.h"

+#include "wx/wxcrtvararg.h"

 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 


@@ -60,10 +62,8 @@
 #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/settings.h"
 #include "wx/msgdlg.h"

-#include "wx/cmndata.h"

 #include "wx/dataobj.h"
 
 #include "wx/control.h"
 #include "wx/dataobj.h"
 
 #include "wx/control.h"


@@ -88,12 +88,19 @@
 #include "wx/combobox.h"
 #include "wx/layout.h"
 #include "wx/sizer.h"
 #include "wx/combobox.h"
 #include "wx/layout.h"
 #include "wx/sizer.h"

-#include "wx/mdi.h"

 #include "wx/statusbr.h"
 #include "wx/choicdlg.h"
 #include "wx/textdlg.h"
 #include "wx/filedlg.h"
 
 #include "wx/statusbr.h"
 #include "wx/choicdlg.h"
 #include "wx/textdlg.h"
 #include "wx/filedlg.h"
 

+// this one is included by exactly one file (mdi.cpp) during wx build so even
+// although we keep it here for the library users, don't include it to avoid
+// bloating the PCH and (worse) rebuilding the entire library when it changes
+// when building the library itself
+#ifndef WXBUILDING
+    #include "wx/mdi.h"
+#endif
+

 // always include, even if !wxUSE_VALIDATORS because we need wxDefaultValidator
 #include "wx/validate.h"
 
 // always include, even if !wxUSE_VALIDATORS because we need wxDefaultValidator
 #include "wx/validate.h"