*** empty log message ***

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index f9f587bcc2723400f07d1be11dea7d15cc0c3418..ad7eeeaacaa108d3662d28ccdce161b6762c748e 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -6,16 +6,26 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WXH__
 #define _WX_WXH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WXH__
 #define _WX_WXH__
 

-#include "wx/setup.h"           // Which features to include - user editable

 #include "wx/defs.h"
 #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/string.h"

+#include "wx/intl.h"

 #include "wx/log.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"
 #include "wx/window.h"
 #include "wx/panel.h"
 #include "wx/frame.h"


@@ -26,8 +36,6 @@
 #include "wx/dcscreen.h"
 #include "wx/button.h"
 #include "wx/menu.h"
 #include "wx/dcscreen.h"
 #include "wx/button.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/list.h"
 #include "wx/pen.h"
 #include "wx/brush.h"


@@ -36,7 +44,6 @@
 #include "wx/cursor.h"
 #include "wx/dialog.h"
 #include "wx/timer.h"
 #include "wx/cursor.h"
 #include "wx/dialog.h"
 #include "wx/timer.h"

-#include "wx/utils.h"

 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/cmndata.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/cmndata.h"


@@ -56,6 +63,7 @@
 #include "wx/gauge.h"
 #include "wx/combobox.h"
 #include "wx/layout.h"
 #include "wx/gauge.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/memory.h"
 #include "wx/mdi.h"
 #include "wx/scrolwin.h"


@@ -66,10 +74,6 @@
 #include "wx/filedlg.h"
 #include "wx/dirdlg.h"
 
 #include "wx/filedlg.h"
 #include "wx/dirdlg.h"
 

-#if wxUSE_INTL
-    #include "wx/intl.h"
-#endif // wxUSE_INTL
-

 #if wxUSE_VALIDATORS
     #include "wx/valtext.h"
 #endif // wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS
     #include "wx/valtext.h"
 #endif // wxUSE_VALIDATORS


@@ -79,5 +83,7 @@
     #include "wx/serbase.h"
 #endif // wxUSE_SERIAL
 
     #include "wx/serbase.h"
 #endif // wxUSE_SERIAL
 

+#endif // wxUSE_GUI
+

 #endif
     // _WX_WXH__
 #endif
     // _WX_WXH__