X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/896e4cbf4ddde3dbf20bde4792ce5edb9c35ea13..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/wx.h?ds=sidebyside diff --git a/include/wx/wx.h b/include/wx/wx.h index 719a25e964..ea22b3b1bf 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" @@ -23,6 +23,7 @@ #include "wx/event.h" #include "wx/app.h" #include "wx/utils.h" +#include "wx/stream.h" #if wxUSE_GUI @@ -47,8 +48,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" @@ -60,31 +64,25 @@ #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/toolbar.h" - #include "wx/validate.h" // always include, even if !wxUSE_VALIDATORS #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 // wxUSE_GUI #endif