fixed wxGTK1 compilation after wxDC changes (still doesn't work)

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 976b9b354b44a32e996b0dd12c6ec3a217ce465f..62ba23fa15aa536c28d674fef0031528d98ff3c8 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$
 // 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_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WX_H_


@@ -18,24 +18,42 @@
 #include "wx/list.h"
 #include "wx/hash.h"
 #include "wx/string.h"
 #include "wx/list.h"
 #include "wx/hash.h"
 #include "wx/string.h"

+#include "wx/hashmap.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/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"
+#include "wx/math.h"
+#include "wx/stopwatch.h"
+#include "wx/module.h"
+#include "wx/wxcrt.h"
+#include "wx/wxcrtvararg.h"

 
 #if wxUSE_GUI
 
 #include "wx/window.h"
 
 #if wxUSE_GUI
 
 #include "wx/window.h"

+#include "wx/containr.h"

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

+#include "wx/toplevel.h"

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

+#include "wx/gdicmn.h"
+#include "wx/gdiobj.h"
+#include "wx/region.h"
+#include "wx/bitmap.h"
+#include "wx/image.h"
+#include "wx/colour.h"
+#include "wx/font.h"

 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"
 #include "wx/dcscreen.h"
 #include "wx/button.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"
 #include "wx/dcscreen.h"
 #include "wx/button.h"

+#include "wx/menuitem.h"

 #include "wx/menu.h"
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/menu.h"
 #include "wx/pen.h"
 #include "wx/brush.h"


@@ -47,6 +65,7 @@
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/cmndata.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/cmndata.h"

+#include "wx/dataobj.h"

 
 #include "wx/control.h"
 #include "wx/ctrlsub.h"
 
 #include "wx/control.h"
 #include "wx/ctrlsub.h"


@@ -70,10 +89,8 @@
 #include "wx/combobox.h"
 #include "wx/layout.h"
 #include "wx/sizer.h"
 #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/mdi.h"
 #include "wx/statusbr.h"

-#include "wx/scrolbar.h"

 #include "wx/choicdlg.h"
 #include "wx/textdlg.h"
 #include "wx/filedlg.h"
 #include "wx/choicdlg.h"
 #include "wx/textdlg.h"
 #include "wx/filedlg.h"


@@ -88,4 +105,3 @@
 #endif // wxUSE_GUI
 
 #endif // _WX_WX_H_
 #endif // wxUSE_GUI
 
 #endif // _WX_WX_H_

-