Some wxComboCtrlBase member functions were enclosed within incorrect compatibility...

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 1aa2bb695fa83f2c19efb5493a1d87879836f9b8..5abb78f5a3313850bb2acc30af3b17493ba849bc 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -29,7 +29,10 @@
 #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
 
@@ -59,7 +62,6 @@
 #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"
@@ -87,12 +89,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"