Merge in from trunk r68626 - r68683

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index fb2696046d7c725d2fa3183f126ccc77dbaf5125..396d8f595d62163d209beb3ef83f21c1609b0317 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -64,7 +64,6 @@
 #include "wx/dialog.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
-#include "wx/cmndata.h"
 #include "wx/dataobj.h"
 
 #include "wx/control.h"
@@ -89,12 +88,19 @@
 #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"
 
+// 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"