mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-31 01:59:52 -06:00
Upgrade WX to r74856, mainly to support @2x.
This commit is contained in:
@ -4,7 +4,6 @@
|
||||
// Author: Wlodzimierz ABX Skiba
|
||||
// Modified by:
|
||||
// Created: 30.10.2005
|
||||
// RCS-ID: $Id: checklst.h 52834 2008-03-26 15:06:00Z FM $
|
||||
// Copyright: (c) Wlodzimierz Skiba
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -4,7 +4,6 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 2005-03-07
|
||||
// RCS-ID: $Id: chkconf.h 60495 2009-05-03 07:43:00Z VZ $
|
||||
// Copyright: (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -4,7 +4,6 @@
|
||||
// Author: Wlodzimierz ABX Skiba
|
||||
// Modified by:
|
||||
// Created: 29.07.2004
|
||||
// RCS-ID: $Id: choicece.h 64940 2010-07-13 13:29:13Z VZ $
|
||||
// Copyright: (c) Wlodzimierz Skiba
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -4,7 +4,6 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 2003-07-12
|
||||
// RCS-ID: $Id: helpwce.h 52834 2008-03-26 15:06:00Z FM $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -4,7 +4,6 @@
|
||||
// Author: Vaclav Slavik
|
||||
// Modified by:
|
||||
// Created: 2004-04-11
|
||||
// RCS-ID: $Id: libraries.h 52163 2008-02-28 00:22:02Z VZ $
|
||||
// Copyright: (c) 2004 Vaclav Slavik
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -4,7 +4,6 @@
|
||||
// Author: Marco Cavallini
|
||||
// Modified by:
|
||||
// Created: 16/11/2002
|
||||
// RCS-ID: $Id: missing.h 67254 2011-03-20 00:14:35Z DS $
|
||||
// Copyright: (c) KOAN SAS ( www.koansoftware.com )
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -4,7 +4,6 @@
|
||||
// Author: Wlodzimierz ABX Skiba
|
||||
// Modified by:
|
||||
// Created: 01.05.2004
|
||||
// RCS-ID: $Id: resources.h 64940 2010-07-13 13:29:13Z VZ $
|
||||
// Copyright: (c) Wlodzimierz Skiba
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -4,7 +4,6 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id: setup.h 69463 2011-10-18 21:57:02Z VZ $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -151,7 +150,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
|
||||
//
|
||||
@ -267,6 +266,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.
|
||||
@ -1087,6 +1097,16 @@
|
||||
// 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)
|
||||
#define wxUSE_PREFERENCES_EDITOR 1
|
||||
|
||||
// wxRichToolTip is a customizable tooltip class which has more functionality
|
||||
// than the stock (but native, unlike this class) wxToolTip.
|
||||
//
|
||||
|
@ -4,7 +4,6 @@
|
||||
// Author: Wlodzimierz ABX Skiba
|
||||
// Modified by:
|
||||
// Created: 01.05.2004
|
||||
// RCS-ID: $Id: smartphone.rc 67254 2011-03-20 00:14:35Z DS $
|
||||
// Copyright: (c) Wlodzimierz Skiba
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -4,7 +4,6 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 2003-07-12
|
||||
// RCS-ID: $Id: tbarwce.h 58757 2009-02-08 11:45:59Z VZ $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -29,7 +28,7 @@ public:
|
||||
wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxNO_BORDER | wxTB_HORIZONTAL,
|
||||
long style = wxTB_HORIZONTAL,
|
||||
const wxString& name = wxToolBarNameStr)
|
||||
{
|
||||
Create(parent, id, pos, size, style, name);
|
||||
@ -39,7 +38,7 @@ public:
|
||||
wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxNO_BORDER | wxTB_HORIZONTAL,
|
||||
long style = wxTB_HORIZONTAL,
|
||||
const wxString& name = wxToolBarNameStr);
|
||||
|
||||
// override/implement base class virtuals
|
||||
@ -88,7 +87,7 @@ public:
|
||||
wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxNO_BORDER | wxTB_HORIZONTAL,
|
||||
long style = wxTB_HORIZONTAL,
|
||||
const wxString& name = wxToolBarNameStr,
|
||||
wxMenuBar* menuBar = NULL)
|
||||
{
|
||||
@ -101,7 +100,7 @@ public:
|
||||
wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxNO_BORDER | wxTB_HORIZONTAL,
|
||||
long style = wxTB_HORIZONTAL,
|
||||
const wxString& name = wxToolBarNameStr,
|
||||
wxMenuBar* menuBar = NULL);
|
||||
|
||||
|
@ -4,7 +4,6 @@
|
||||
// Author: Wlodzimierz ABX Skiba
|
||||
// Modified by:
|
||||
// Created: 30.08.2004
|
||||
// RCS-ID: $Id: textctrlce.h 64940 2010-07-13 13:29:13Z VZ $
|
||||
// Copyright: (c) Wlodzimierz Skiba
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
Reference in New Issue
Block a user