Upgrade WX to r74856, mainly to support @2x.

This commit is contained in:
comex
2013-09-22 18:44:55 -04:00
parent 0bdef3932f
commit 66ed9a1804
1935 changed files with 45373 additions and 22739 deletions

View File

@ -3,7 +3,6 @@
// Purpose: declarations for SEH (structured exceptions handling) support
// Author: Vadim Zeitlin
// Created: 2006-04-26
// RCS-ID: $Id: seh.h 60934 2009-06-06 23:27:37Z VZ $
// Copyright: (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -55,11 +54,11 @@
// as division by 0 or access violation) to C++ pseudo-exceptions
extern void wxSETranslator(unsigned int code, EXCEPTION_POINTERS *ep);
// up to VC 9 this warning ("calling _set_se_translator() requires /EHa")
// up to VC 11 this warning ("calling _set_se_translator() requires /EHa")
// is harmless and it's easier to suppress it than use different makefiles
// for VC5 and 6 (which don't support /EHa at all) and VC7 (which does
// for VC5 and 6 (which don't support /EHa at all) and VC7+ (which does
// accept it but it seems to change nothing for it anyhow)
#if __VISUALC__ < 1600
#if __VISUALC__ < 1800
#pragma warning(disable: 4535)
#endif