X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f2936dacb1a483e1407426bd5eca2b7b765a576..c17ba76f38f7ef27a8a8f3710727a365e9c23de1:/include/wx/wx.h

diff --git a/include/wx/wx.h b/include/wx/wx.h
index ce3c1c2605..233ebcd16e 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
 
@@ -36,7 +37,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 +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"
@@ -61,29 +64,26 @@
 #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