mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-28 16:55:31 +01:00
822326eea9
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7. include/wx/defs.h -- __w64 warning disable patch by comex brought forward. include/wx/msw/window.h -- added GetContentScaleFactor() which was not implemented on Windows but is necessary for wxBitmap scaling on Mac OS X so it needs to work to avoid #ifdef-ing the code. src/gtk/window.cpp -- Modified DoSetClientSize() to direct call wxWindowGTK::DoSetSize() instead of using public wxWindowBase::SetSize() which now prevents derived classes (like wxAuiToolbar) intercepting the call and breaking it. This matches Windows which does NOT need to call DoSetSize internally. End result is this fixes Dolphin's debug tools toolbars on Linux. src/osx/window_osx.cpp -- Same fix as for GTK since it has the same issue. src/msw/radiobox.cpp -- Hacked to fix display in HiDPI (was clipping off end of text). Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
70 lines
1.5 KiB
C
70 lines
1.5 KiB
C
/*
|
|
* Name: wx/osx/cocoa/chkconf.h
|
|
* Purpose: Compiler-specific configuration checking
|
|
* Author: Stefan Csomor
|
|
* Modified by:
|
|
* Created: 2008-07-30
|
|
* Copyright: (c) Stefan Csomor
|
|
* Licence: wxWindows licence
|
|
*/
|
|
|
|
#ifndef _WX_OSX_COCOA_CHKCONF_H_
|
|
#define _WX_OSX_COCOA_CHKCONF_H_
|
|
|
|
/* Many wchar functions (and also strnlen(), for some reason) are only
|
|
available since 10.7 so don't use them if we want to build the applications
|
|
that would run under 10.6 and earlier. */
|
|
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
|
|
#define HAVE_STRNLEN 1
|
|
#define HAVE_WCSDUP 1
|
|
#define HAVE_WCSNLEN 1
|
|
#define HAVE_WCSCASECMP 1
|
|
#define HAVE_WCSNCASECMP 1
|
|
#endif
|
|
|
|
/*
|
|
* native (1) or emulated (0) toolbar
|
|
*/
|
|
|
|
#ifndef wxOSX_USE_NATIVE_TOOLBAR
|
|
#define wxOSX_USE_NATIVE_TOOLBAR 1
|
|
#endif
|
|
|
|
/*
|
|
* leave is isFlipped and don't override
|
|
*/
|
|
#ifndef wxOSX_USE_NATIVE_FLIPPED
|
|
#define wxOSX_USE_NATIVE_FLIPPED 1
|
|
#endif
|
|
|
|
/*
|
|
* text rendering system
|
|
*/
|
|
|
|
#define wxOSX_USE_ATSU_TEXT 0
|
|
|
|
/*
|
|
* Audio System
|
|
*/
|
|
|
|
#define wxOSX_USE_QUICKTIME 0
|
|
#define wxOSX_USE_AUDIOTOOLBOX 1
|
|
|
|
/*
|
|
Use the more efficient FSEvents API instead of kqueue
|
|
events for file system watcher, but only on OS X >= 10.7 since
|
|
that version introduced a flag that allows watching files as
|
|
well as sub directories.
|
|
*/
|
|
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
|
|
#define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1
|
|
#endif
|
|
|
|
/*
|
|
* turning off capabilities that don't work under cocoa yet
|
|
*/
|
|
|
|
#endif
|
|
/* _WX_MAC_CHKCONF_H_ */
|
|
|