X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ca2fe7ee68e817a03a84d88c48d1c55ee80e548..d015713e787da8241e92ff86ee2e911868b8024c:/include/wx/wx.h

diff --git a/include/wx/wx.h b/include/wx/wx.h
index f1199332a0..5cdeec77c4 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
@@ -6,16 +9,23 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_WXH__
-#define _WX_WXH__
-
-#include "wx/setup.h"           // Which features to include - user editable
 #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/intl.h"
 #include "wx/log.h"
+#include "wx/event.h"
+#include "wx/app.h"
+#include "wx/utils.h"
+
+#if wxUSE_GUI
+
 #include "wx/window.h"
 #include "wx/panel.h"
 #include "wx/frame.h"
@@ -25,6 +35,18 @@
 #include "wx/dcprint.h"
 #include "wx/dcscreen.h"
 #include "wx/button.h"
+#include "wx/menu.h"
+#include "wx/pen.h"
+#include "wx/brush.h"
+#include "wx/palette.h"
+#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/bmpbuttn.h"
 #include "wx/checkbox.h"
 #include "wx/choice.h"
@@ -38,38 +60,32 @@
 #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/menu.h"
-#include "wx/app.h"
-#include "wx/event.h"
-#include "wx/list.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/palette.h"
-#include "wx/icon.h"
-#include "wx/cursor.h"
-#include "wx/dialog.h"
-#include "wx/timer.h"
-#include "wx/utils.h"
-#include "wx/settings.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/msgdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/textdlg.h"
 #include "wx/filedlg.h"
-#include "wx/dirdlg.h"
-#include "wx/cmndata.h"
-#include "wx/intl.h"
-#include "wx/valtext.h"
-#ifdef wxUSE_SERIAL
-#include "wx/objstrm.h"
-#include "wx/serbase.h"
-#endif
+
+#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
     // _WX_WXH__