Revert HasModifiers() change in behaviour, add HasAnyModifiers().

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 233ebcd16edf988bfbe4e7a18d61a1cf23078f68..396d8f595d62163d209beb3ef83f21c1609b0317 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -1,41 +1,60 @@
-#ifndef _WX_WXH__
-#define _WX_WXH__
-

 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx.h
-// Purpose:     wxWindows main include file
+// Name:        wx/wx.h
+// Purpose:     wxWidgets central header including the most often used ones

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_WX_H_
+#define _WX_WX_H_
+

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/dynarray.h"
 #include "wx/list.h"
 #include "wx/hash.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/dynarray.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/timer.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"


@@ -43,10 +62,9 @@
 #include "wx/icon.h"
 #include "wx/cursor.h"
 #include "wx/dialog.h"
 #include "wx/icon.h"
 #include "wx/cursor.h"
 #include "wx/dialog.h"

-#include "wx/timer.h"

 #include "wx/settings.h"
 #include "wx/msgdlg.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,15 +88,21 @@
 #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/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"
 

-#include "wx/validate.h"        // always include, even if !wxUSE_VALIDATORS
+// this one is included by exactly one file (mdi.cpp) during wx build so even
+// although we keep it here for the library users, don't include it to avoid
+// bloating the PCH and (worse) rebuilding the entire library when it changes
+// when building the library itself
+#ifndef WXBUILDING
+    #include "wx/mdi.h"
+#endif
+
+// always include, even if !wxUSE_VALIDATORS because we need wxDefaultValidator
+#include "wx/validate.h"

 
 #if wxUSE_VALIDATORS
     #include "wx/valtext.h"
 
 #if wxUSE_VALIDATORS
     #include "wx/valtext.h"


@@ -86,5 +110,4 @@
 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 

-#endif
-    // _WX_WXH__
+#endif // _WX_WX_H_