X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4720388fc5fa81fbec8e80ea95dfe59cf45db7a5..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/wx.h?ds=sidebyside diff --git a/include/wx/wx.h b/include/wx/wx.h index 6221ac02be..62ba23fa15 100644 --- a/include/wx/wx.h +++ b/include/wx/wx.h @@ -1,40 +1,59 @@ -#ifndef _WX_WXH__ -#define _WX_WXH__ - ///////////////////////////////////////////////////////////////////////////// -// Name: wx.h -// Purpose: wxWindows main include file +// Name: wx/wx.h +// Purpose: wxWidgets central header including the most often used ones // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifndef _WX_WX_H_ +#define _WX_WX_H_ + #include "wx/defs.h" #include "wx/object.h" #include "wx/dynarray.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/event.h" #include "wx/app.h" #include "wx/utils.h" +#include "wx/stream.h" +#include "wx/memory.h" +#include "wx/math.h" +#include "wx/stopwatch.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,9 +65,13 @@ #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/bmpbuttn.h" #include "wx/checkbox.h" +#include "wx/checklst.h" #include "wx/choice.h" #include "wx/scrolbar.h" #include "wx/stattext.h" @@ -59,39 +82,26 @@ #include "wx/radiobut.h" #include "wx/textctrl.h" #include "wx/slider.h" -#if !defined(__VISAGECPP__) // cyclic dependency #include "wx/gauge.h" #include "wx/scrolwin.h" #include "wx/dirdlg.h" #include "wx/toolbar.h" -#endif #include "wx/combobox.h" #include "wx/layout.h" #include "wx/sizer.h" -#include "wx/memory.h" #include "wx/mdi.h" #include "wx/statusbr.h" -#include "wx/scrolbar.h" #include "wx/choicdlg.h" #include "wx/textdlg.h" #include "wx/filedlg.h" -#include "wx/validate.h" // always include, even if !wxUSE_VALIDATORS - -#if !defined(__VISAGECPP__) // cyclic dependency +// always include, even if !wxUSE_VALIDATORS because we need wxDefaultValidator +#include "wx/validate.h" #if wxUSE_VALIDATORS #include "wx/valtext.h" #endif // wxUSE_VALIDATORS -#if wxUSE_SERIAL - #include "wx/objstrm.h" - #include "wx/serbase.h" -#endif // wxUSE_SERIAL - -#endif // __VISAGECPP__ - #endif // wxUSE_GUI -#endif - // _WX_WXH__ +#endif // _WX_WX_H_