Improvements for building minimal builds and new ports: wxUSE_* usage and minor cleaning.

[wxWidgets.git] / include / wx / wx.h

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 6221ac02bed03544611b2e6cf07703efe3c4b92d..46af2cd1dd4d02a8f26ba89f6461a3bf960e0f18 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -1,17 +1,17 @@
-#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"
@@ -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"
@@ -59,12 +63,10 @@
 #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"
@@ -76,22 +78,14 @@
 #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_
+