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

1
Externals/wxWidgets3/include/wx/osx/carbon/chkconf.h vendored
View File

@ -4,7 +4,6 @@
* Author: Julian Smart
* Modified by:
* Created: 01/02/97
* RCS-ID: $Id: chkconf.h 61926 2009-09-14 13:07:23Z SC $
* Copyright: (c) Julian Smart
* Licence: wxWindows licence
*/

1
Externals/wxWidgets3/include/wx/osx/carbon/dataview.h vendored
View File

@ -2,7 +2,6 @@
// Name: wx/osx/carbon/dataview.h
// Purpose: wxDataViewCtrl native implementation header for carbon
// Author:
// Id: $Id: dataview.h 57374 2009-01-27
// Copyright: (c) 2009
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

1
Externals/wxWidgets3/include/wx/osx/carbon/drawer.h vendored
View File

@ -7,7 +7,6 @@
// Author: Jason Bagley
// Modified by:
// Created: 2004-30-01
// RCS-ID: $Id: drawer.h 64943 2010-07-13 13:29:58Z VZ $
// Copyright: (c) Jason Bagley; Art & Logic, Inc.
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

6
Externals/wxWidgets3/include/wx/osx/carbon/evtloop.h vendored
View File

@ -4,7 +4,6 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 2006-01-12
// RCS-ID: $Id: evtloop.h 68302 2011-07-19 17:56:57Z SC $
// Copyright: (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -25,9 +24,8 @@ public:
protected:
virtual int DoDispatchTimeout(unsigned long timeout);
virtual void DoRun();
virtual void DoStop();
virtual void OSXDoRun();
virtual void OSXDoStop();
virtual CFRunLoopRef CFGetCurrentRunLoop() const;
};

1
Externals/wxWidgets3/include/wx/osx/carbon/mimetype.h vendored
View File

@ -4,7 +4,6 @@
// Author: Ryan Norton
// Modified by:
// Created: 04/16/2005
// RCS-ID: $Id: mimetype.h 64943 2010-07-13 13:29:58Z VZ $
// Copyright: (c) 2005 Ryan Norton (<wxprojects@comcast.net>)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

2
Externals/wxWidgets3/include/wx/osx/carbon/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
/////////////////////////////////////////////////////////////////////////////
@ -332,7 +331,6 @@ public :
wxBitmap GetBitmap() const;
void SetBitmap( const wxBitmap& bitmap );
void SetBitmapPosition( wxDirection dir );
void SetupTabs( const wxNotebook &notebook );
void GetBestRect( wxRect *r ) const;
bool IsEnabled() const;

1
Externals/wxWidgets3/include/wx/osx/carbon/private/mactext.h vendored
View File

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

1
Externals/wxWidgets3/include/wx/osx/carbon/private/overlay.h vendored
View File

@ -4,7 +4,6 @@
// Author: Stefan Csomor
// Modified by:
// Created: 2006-10-20
// RCS-ID: $Id: overlay.h 64943 2010-07-13 13:29:58Z VZ $
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

1
Externals/wxWidgets3/include/wx/osx/carbon/private/print.h vendored
View File

@ -4,7 +4,6 @@
// Author: Stefan Csomor
// Modified by:
// Created: 03/02/99
// RCS-ID: $Id: print.h 65680 2010-09-30 11:44:45Z VZ $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

1
Externals/wxWidgets3/include/wx/osx/carbon/private/timer.h vendored
View File

@ -3,7 +3,6 @@
// Purpose: wxTimer class
// Author: Stefan Csomor
// Created: 1998-01-01
// RCS-ID: $Id: timer.h 64943 2010-07-13 13:29:58Z VZ $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

4
Externals/wxWidgets3/include/wx/osx/carbon/region.h vendored
View File

@ -4,7 +4,6 @@
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id: region.h 69459 2011-10-18 21:56:40Z VZ $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -55,6 +54,7 @@ protected:
virtual bool DoOffset(wxCoord x, wxCoord y);
virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
virtual bool DoUnionWithRect(const wxRect& rect);
private:
DECLARE_DYNAMIC_CLASS(wxRegion)
@ -86,7 +86,7 @@ public:
long GetWidth() const { return GetW(); }
long GetH() const;
long GetHeight() const { return GetH(); }
wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
wxRect GetRect() const { return wxRect((int)GetX(), (int)GetY(), (int)GetWidth(), (int)GetHeight()); }
private:
void SetRects(long numRects, wxRect *rects);

1
Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h vendored
View File

@ -4,7 +4,6 @@
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id: statbmp.h 70165 2011-12-29 14:42:13Z SN $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

1
Externals/wxWidgets3/include/wx/osx/carbon/uma.h vendored
View File

@ -4,7 +4,6 @@
// Author: Stefan Csomor
// Modified by:
// Created: 03/02/99
// RCS-ID: $Id: uma.h 64943 2010-07-13 13:29:58Z VZ $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////