Allow using custom labels for wxGenericMessageDialog buttons.

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 9bcc46f7f4347bc3a86473889173d12ce07b9bb7..5abb78f5a3313850bb2acc30af3b17493ba849bc 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"


@@ -27,15 +28,24 @@
 #include "wx/stream.h"
 #include "wx/memory.h"
 #include "wx/math.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/region.h"
 #include "wx/bitmap.h"

+#include "wx/image.h"

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


@@ -52,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"


@@ -79,12 +89,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"