Added dde sample; added docs/index.htm

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 98c80c43ed0e15920df6573407c942f9b7dd2c80..6fab5a9334999d71e821fb35b1796993f355624d 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -15,6 +15,7 @@
 #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,7 +24,6 @@
 #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/bmpbuttn.h"
 #include "wx/checkbox.h"
 #include "wx/button.h"
 #include "wx/bmpbuttn.h"
 #include "wx/checkbox.h"


@@ -65,7 +65,8 @@
 #include "wx/dirdlg.h"
 #include "wx/cmndata.h"
 #include "wx/intl.h"
 #include "wx/dirdlg.h"
 #include "wx/cmndata.h"
 #include "wx/intl.h"

-#ifdef USE_SERIAL
+#include "wx/valtext.h"
+#if wxUSE_SERIAL

 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif
 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif