X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/wx.h?ds=sidebyside diff --git a/include/wx/wx.h b/include/wx/wx.h index ad7eeeaaca..e53cfcdddb 100644 --- a/include/wx/wx.h +++ b/include/wx/wx.h @@ -1,3 +1,6 @@ +#ifndef _WX_WXH__ +#define _WX_WXH__ + ///////////////////////////////////////////////////////////////////////////// // Name: wx.h // Purpose: wxWindows main include file @@ -9,9 +12,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_WXH__ -#define _WX_WXH__ - #include "wx/defs.h" #include "wx/object.h" #include "wx/dynarray.h" @@ -36,7 +36,6 @@ #include "wx/dcscreen.h" #include "wx/button.h" #include "wx/menu.h" -#include "wx/list.h" #include "wx/pen.h" #include "wx/brush.h" #include "wx/palette.h" @@ -48,8 +47,11 @@ #include "wx/msgdlg.h" #include "wx/cmndata.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" @@ -61,18 +63,21 @@ #include "wx/textctrl.h" #include "wx/slider.h" #include "wx/gauge.h" +#include "wx/scrolwin.h" +#include "wx/dirdlg.h" +#include "wx/toolbar.h" #include "wx/combobox.h" #include "wx/layout.h" #include "wx/sizer.h" #include "wx/memory.h" #include "wx/mdi.h" -#include "wx/scrolwin.h" #include "wx/statusbr.h" #include "wx/scrolbar.h" #include "wx/choicdlg.h" #include "wx/textdlg.h" #include "wx/filedlg.h" -#include "wx/dirdlg.h" + +#include "wx/validate.h" // always include, even if !wxUSE_VALIDATORS #if wxUSE_VALIDATORS #include "wx/valtext.h"