piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 10:09:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
Externals/wxWidgets3/include/wx/object.h vendored
View File

@ -4,7 +4,6 @@
// Author: Julian Smart
// Modified by: Ron Lee
// Created: 01/02/97
// RCS-ID: $Id: object.h 66650 2011-01-08 08:03:42Z SC $
// Copyright: (c) 1997 Julian Smart
// (c) 2001 Ron Lee <ron@debian.org>
// Licence: wxWindows licence
@ -195,9 +194,8 @@ inline T *wxCheckCast(const void *ptr, T * = NULL)
#define _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
#endif
// Only VC++ 6 and CodeWarrior get overloaded delete that matches new
#if (defined(__VISUALC__) && (__VISUALC__ >= 1200)) || \
(defined(__MWERKS__) && (__MWERKS__ >= 0x2400))
// Only VC++ 6 gets overloaded delete that matches new
#if (defined(__VISUALC__) && (__VISUALC__ >= 1200))
#define _WX_WANT_DELETE_VOID_WXCHAR_INT
#endif
@ -213,12 +211,6 @@ inline T *wxCheckCast(const void *ptr, T * = NULL)
#if !defined(__VISUALC__)
#define _WX_WANT_ARRAY_DELETE_VOID
#endif
// Only CodeWarrior 6 or higher
#if defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
#define _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
#endif
#endif // wxUSE_ARRAY_MEMORY_OPERATORS
#endif // wxUSE_MEMORY_TRACING