piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update to wxWidgets r67291.

Browse Source 
Fixes a wxFileSelector regression on OS X.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7404 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-03-23 09:13:01 +00:00
parent c990f12932
commit 35508d7a99
115 changed files with 1263 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Externals/wxWidgets3/include/wx/cocoa/NSApplication.h vendored
View File

@ -4,7 +4,7 @@
// Author: David Elliott
// Modified by:
// Created: 2004/01/26
// RCS-ID: $Id: NSApplication.h 46227 2007-05-27 04:52:04Z DE $
// RCS-ID: $Id: NSApplication.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2003,2004 David Elliott
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -19,7 +19,7 @@
// ========================================================================
/*!
@class wxNSApplicationDelegate
@discussion Implements an NSApplication delegate which can respond to messages sent by Cocoa to change Cocoa's behavior.
@discussion Implements an NSApplication delegate which can respond to messages sent by Cocoa to change Cocoa's behaviour.
wxCocoa will set a singleton instance of this class as the NSApplication delegate upon startup unless wxWidgets is running
in a "plugin" manner in which case it would not be appropriate to do this.

6
Externals/wxWidgets3/include/wx/cocoa/objc/objc_uniquifying.h vendored
View File

@ -7,7 +7,7 @@
// Author: David Elliott <dfe@cox.net>
// Modified by:
// Created: 2007/05/15
// RCS-ID: $Id: objc_uniquifying.h 51891 2008-02-18 20:36:16Z DE $
// RCS-ID: $Id: objc_uniquifying.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2007 Software 2000 Ltd.
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -205,7 +205,7 @@ struct objc_class* wx_GetObjcClass_ ## ObjcClass();
// _s_objc_class_ptr_ObjcClass:
// .long L_OBJC_CLASS_ObjcClass
// Once that static symbol is defined, the function implementation is easy for GCC to generate.
// Do note that return &s_objc_class_data_ObjcClass won't work. The code is wrong in the case.
// Do note that return &s_objc_class_data_ObjcClass won't work. The code is wrong in this case.
#define WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \
extern "C" objc_class s_objc_class_data_ ## ObjcClass asm("L_OBJC_CLASS_" #ObjcClass); \
static objc_class * s_objc_class_ptr_ ## ObjcClass = &s_objc_class_data_ ## ObjcClass; \
@ -278,7 +278,7 @@ inline objc_class * wxObjcCompilerInformation<ObjcClass>::GetCompiledClass() \
}
// TODO: __x86_64__, __ppc64__
#else // Can't wrie inline asm to bust into __OBJC segment
#else // Can't write inline asm to bust into __OBJC segment
// This won't be used since the generic implementation takes precedence.
#warning "Don't know how to implement wxObjcCompilerInformation<ObjcClass>::GetCompiledClass on this platform"

4
Externals/wxWidgets3/include/wx/cocoa/private/scrollview.h vendored
View File

@ -4,7 +4,7 @@
// Author: David Elliott
// Modified by:
// Created: 2008/02/14
// RCS-ID: $Id: scrollview.h 67254 2011-03-20 00:14:35Z DS $
// RCS-ID: $Id: scrollview.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2003- David Elliott
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -48,7 +48,7 @@ protected:
virtual void Cocoa_synthesizeMouseMoved(void) {}
/*!
Flag as to whether we're scrolling for a native view or a custom
wxWindow. This controls the scrolling behavior. When providing
wxWindow. This controls the scrolling behaviour. When providing
scrolling for a native view we don't catch scroller action messages
and thus don't send scroll events and we don't actually scroll the
window when the application calls ScrollWindow.

4
Externals/wxWidgets3/include/wx/cocoa/radiobox.h vendored
View File

@ -4,7 +4,7 @@
// Author: David Elliott
// Modified by:
// Created: 2003/03/18
// RCS-ID: $Id: radiobox.h 52834 2008-03-26 15:06:00Z FM $
// RCS-ID: $Id: radiobox.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -110,7 +110,7 @@ public:
virtual void SetString(unsigned int n, const wxString& label);
// change the individual radio button state
protected:
// We don't want the typical wxCocoaNSBox behavior because our real
// We don't want the typical wxCocoaNSBox behaviour because our real
// implementation is by using an NSMatrix as the NSBox's contentView.
WX_NSMatrix GetNSMatrix() const;
void AssociateNSBox(WX_NSBox theBox);