projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxDynamicLibrary::GetSymbolAorW()
[wxWidgets.git]
/
include
/
wx
/
afterstd.h
diff --git
a/include/wx/afterstd.h
b/include/wx/afterstd.h
index a85cf0eca91b098129be5f9c958c62de96f1084f..5d3858cae8dd5b0018672852bdab6191d08844c8 100644
(file)
--- a/
include/wx/afterstd.h
+++ b/
include/wx/afterstd.h
@@
-6,20
+6,28
@@
// Created: 07/07/03
// RCS-ID: $Id$
// Copyright: (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Created: 07/07/03
// RCS-ID: $Id$
// Copyright: (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
///////////////////////////////////////////////////////////////////////////////
/**
See the comments in beforestd.h.
*/
///////////////////////////////////////////////////////////////////////////////
/**
See the comments in beforestd.h.
*/
-#if defined(__WXMSW__)
&& defined(__MINGW32__)
+#if defined(__WXMSW__)
#include "wx/msw/winundef.h"
#endif
#include "wx/msw/winundef.h"
#endif
-// VC 7.x isn't as bad as VC6 and doesn't give these warnings
-#if defined(__VISUALC__) && __VISUALC__ <= 1200
+
+// undo what we did in wx/beforestd.h
+#if defined(__VISUALC__) && __VISUALC__ <= 1201
// MSVC 5 does not have this
#if _MSC_VER > 1100
// MSVC 5 does not have this
#if _MSC_VER > 1100
+ // don't restore this one for VC6, it gives it in each try/catch which is a
+ // bit annoying to say the least
+ #if _MSC_VER >= 0x1300
+ // unreachable code
+ #pragma warning(default:4702)
+ #endif // VC++ >= 7
+
#pragma warning(pop)
#else
// 'expression' : signed/unsigned mismatch
#pragma warning(pop)
#else
// 'expression' : signed/unsigned mismatch