piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -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

5
Externals/wxWidgets3/include/wx/osx/nonownedwnd.h vendored
View File

@ -4,7 +4,6 @@
// Author: Stefan Csomor
// Modified by:
// Created: 2008-03-24
// RCS-ID: $Id: nonownedwnd.h 70488 2012-01-31 17:39:39Z SC $
// Copyright: (c) 2008 Stefan Csomor
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -65,7 +64,7 @@ public:
virtual void UnsubclassWin();
virtual wxPoint GetClientAreaOrigin() const;
// implement base class pure virtuals
virtual bool SetTransparent(wxByte alpha);
@ -105,7 +104,7 @@ public:
#if wxOSX_USE_COCOA_OR_IPHONE
// override the base class method to return an NSWindow instead of NSView
virtual void *OSXGetViewOrWindow() const { return GetWXWindow(); }
virtual void *OSXGetViewOrWindow() const;
#endif // Cocoa
// osx specific event handling common for all osx-ports