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

41
Externals/wxWidgets3/include/wx/osx/setup0.h vendored
View File

@ -4,7 +4,6 @@
// Author: Stefan Csomor
// Modified by: Stefan Csomor
// Created: 1998-01-01
// RCS-ID: $Id: setup0.h 70395 2012-01-19 08:55:41Z SC $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -152,7 +151,7 @@
// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
// this causes problems (e.g. link errors), set this to 0. You may need to set
// this to 0 if using templates (at least for VC++). This switch is currently
// ignored for mingw / cygwin / CodeWarrior
// ignored for MinGW/Cygwin.
//
// Default is 0
//
@ -268,6 +267,17 @@
// Recommended setting: 1 if you want to support multiple languages
#define wxUSE_PRINTF_POS_PARAMS 1
// Enable the use of compiler-specific thread local storage keyword, if any.
// This is used for wxTLS_XXX() macros implementation and normally should use
// the compiler-provided support as it's simpler and more efficient, but must
// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
// support that results in crashes when any TLS variables are used. So if you
// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
// this to 0.
//
// Default is 1, but set to 0 if the scenario above is applicable.
#define wxUSE_COMPILER_TLS 1
// ----------------------------------------------------------------------------
// Interoperability with the standard library.
@ -1088,6 +1098,20 @@
// Recommended setting: 1
#define wxUSE_NOTIFICATION_MESSAGE 1
// wxPreferencesEditor provides a common API for different ways of presenting
// the standard "Preferences" or "Properties" dialog under different platforms
// (e.g. some use modal dialogs, some use modeless ones; some apply the changes
// immediately while others require an explicit "Apply" button).
//
// Default is 1.
//
// Recommended setting: 1 (but can be safely disabled if you don't use it)
#ifdef __WXOSX_IPHONE__
#define wxUSE_PREFERENCES_EDITOR 0
#else
#define wxUSE_PREFERENCES_EDITOR 1
#endif
// wxRichToolTip is a customizable tooltip class which has more functionality
// than the stock (but native, unlike this class) wxToolTip.
//
@ -1501,19 +1525,6 @@
// Mac-specific settings
// ----------------------------------------------------------------------------
// override some settings for Metrowerks
//
// VZ: isn't this file only used when building with Metrowerks anyhow?
// CS: no, it is also used by the Xcode projects
#ifdef __MWERKS__
#undef wxUSE_DEBUG_CONTEXT
#define wxUSE_DEBUG_CONTEXT 1
#undef wxUSE_STD_IOSTREAM
// CS: I have to set this to 0 now, as shared builds are having problems
#define wxUSE_STD_IOSTREAM 0
#endif
#undef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 1