added alternative definitions for wxASSERT_MSG and wxCHECK2_MSG to fix CodeWarrior...

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 976b9b354b44a32e996b0dd12c6ec3a217ce465f..a3bb3bfe06b22af0fcc8c2c2ae56be8c35a8ef2a 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c)
-// Licence:     wxWidgets licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WX_H_
@@ -18,18 +18,24 @@
 #include "wx/list.h"
 #include "wx/hash.h"
 #include "wx/string.h"
+#include "wx/arrstr.h"
 #include "wx/intl.h"
 #include "wx/log.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/window.h"
 #include "wx/panel.h"
+#include "wx/toplevel.h"
 #include "wx/frame.h"
+#include "wx/bitmap.h"
+#include "wx/colour.h"
+#include "wx/font.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
@@ -70,10 +76,8 @@
 #include "wx/combobox.h"
 #include "wx/layout.h"
 #include "wx/sizer.h"
-#include "wx/memory.h"
 #include "wx/mdi.h"
 #include "wx/statusbr.h"
-#include "wx/scrolbar.h"
 #include "wx/choicdlg.h"
 #include "wx/textdlg.h"
 #include "wx/filedlg.h"