converted to 16 colors

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 4a8529e696c0c1e0099b2931d0e1c5c0013785b4..f9f587bcc2723400f07d1be11dea7d15cc0c3418 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -9,12 +9,13 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __WXH__
-#define __WXH__
+#ifndef _WX_WXH__
+#define _WX_WXH__

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

+#include "wx/log.h"

 #include "wx/window.h"
 #include "wx/panel.h"
 #include "wx/frame.h"
 #include "wx/window.h"
 #include "wx/panel.h"
 #include "wx/frame.h"


@@ -23,8 +24,23 @@
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"
 #include "wx/dcscreen.h"
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"
 #include "wx/dcscreen.h"

-#include "wx/postscrp.h"

 #include "wx/button.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/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/msgdlg.h"
+#include "wx/cmndata.h"
+

 #include "wx/bmpbuttn.h"
 #include "wx/checkbox.h"
 #include "wx/choice.h"
 #include "wx/bmpbuttn.h"
 #include "wx/checkbox.h"
 #include "wx/choice.h"


@@ -39,32 +55,29 @@
 #include "wx/slider.h"
 #include "wx/gauge.h"
 #include "wx/combobox.h"
 #include "wx/slider.h"
 #include "wx/gauge.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/memory.h"
 #include "wx/mdi.h"
 #include "wx/scrolwin.h"
 #include "wx/statusbr.h"
 #include "wx/scrolbar.h"
 #include "wx/layout.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/choicdlg.h"
 #include "wx/textdlg.h"
 #include "wx/filedlg.h"
 #include "wx/dirdlg.h"

-#include "wx/cmndata.h"
-#include "wx/intl.h"
+
+#if wxUSE_INTL
+    #include "wx/intl.h"
+#endif // wxUSE_INTL
+
+#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
 
 #endif

-    // __WXH__
+    // _WX_WXH__