Fixes to wxMotif scrolling and colours (wxTreeCtrl/wxListCtrl now seem to work

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 4a8529e696c0c1e0099b2931d0e1c5c0013785b4..525fa9114abc6298a17dff7cddad123c9b78a0a9 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,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,6 +65,10 @@
 #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 wxUSE_SERIAL
+#include "wx/objstrm.h"
+#include "wx/serbase.h"
+#endif

 
 #endif
 
 #endif

-    // __WXH__
+    // _WX_WXH__