X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1832043f93af07af3f4891d9a95c4d4e1f70eec5..e733c4ce1e24cf7e4b0b0d8362fc59aaa7a7641c:/include/wx/wx.h diff --git a/include/wx/wx.h b/include/wx/wx.h index 2ce5db4d08..9f6a42cb13 100644 --- a/include/wx/wx.h +++ b/include/wx/wx.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -18,6 +17,7 @@ #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" @@ -26,19 +26,34 @@ #include "wx/utils.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" +#include "wx/containr.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/image.h" +#include "wx/colour.h" +#include "wx/font.h" #include "wx/dc.h" #include "wx/dcclient.h" #include "wx/dcmemory.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" @@ -46,10 +61,9 @@ #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/dataobj.h" #include "wx/control.h" #include "wx/ctrlsub.h" @@ -73,12 +87,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" @@ -89,4 +110,3 @@ #endif // wxUSE_GUI #endif // _WX_WX_H_ -