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

3
Externals/wxWidgets3/include/wx/osx/iphone/chkconf.h vendored
View File

@ -4,7 +4,6 @@
* Author: Stefan Csomor
* Modified by:
* Created: 2008-07-30
* RCS-ID: $Id: chkconf.h 69818 2011-11-25 14:37:03Z SC $
* Copyright: (c) Stefan Csomor
* Licence: wxWindows licence
*/
@ -20,7 +19,7 @@
* under a certain platform
*/
#define wxOSX_USE_CORE_TEXT 0
#define wxOSX_USE_CORE_TEXT 1
#define wxOSX_USE_ATSU_TEXT 0
#define wxHAS_OPENGL_ES

8
Externals/wxWidgets3/include/wx/osx/iphone/private.h vendored
View File

@ -6,7 +6,6 @@
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id: private.h 67233 2011-03-18 15:45:51Z SC $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -18,6 +17,11 @@
#import <UIKit/UIKit.h>
#endif
#include <CoreText/CTFont.h>
#include <CoreText/CTStringAttributes.h>
#include <CoreText/CTLine.h>
#if wxUSE_GUI
OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
@ -56,7 +60,7 @@ public :
virtual void GetPosition( int &x, int &y ) const;
virtual void GetSize( int &width, int &height ) const;
virtual void SetControlSize( wxWindowVariant variant );
virtual float GetContentScaleFactor() const ;
virtual double GetContentScaleFactor() const ;
virtual void SetNeedsDisplay( const wxRect* where = NULL );
virtual bool GetNeedsDisplay() const;

1
Externals/wxWidgets3/include/wx/osx/iphone/private/textimpl.h vendored
View File

@ -4,7 +4,6 @@
// Author: Stefan Csomor
// Modified by:
// Created: 03/02/99
// RCS-ID: $Id: textimpl.h 67254 2011-03-20 00:14:35Z DS $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////