/////////////////////////////////////////////////////////////////////////////
-// 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_WXH__
-#define _WX_WXH__
+#ifndef _WX_WX_H_
+#define _WX_WX_H_
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/utils.h"
+#include "wx/stream.h"
+#include "wx/memory.h"
#if wxUSE_GUI
#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"
#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
+// 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 // wxUSE_GUI
-#endif
- // _WX_WXH__
+#endif // _WX_WX_H_
+