izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07: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
Externals/wxWidgets3/SConscript
Vendored
+2 -1
View File
@@ -13,7 +13,7 @@ wxenv = env.Clone()
wxenv['CCFLAGS'] += ['-Wno-deprecated-declarations', '-Wno-shadow']
wxenv['CPPDEFINES'] += ['WXBUILDING']
# gtk, msw, osx and shared files as of r67258
# gtk, msw, osx and shared files as of r67291
aui = [
'src/aui/auibar.cpp',
@@ -843,6 +843,7 @@ osx = [
'src/osx/cocoa/gauge.mm',
'src/osx/cocoa/glcanvas.mm',
'src/osx/cocoa/listbox.mm',
#'src/osx/cocoa/mediactrl.mm',
'src/osx/cocoa/menu.mm',
'src/osx/cocoa/menuitem.mm',
'src/osx/cocoa/msgdlg.mm',
Externals/wxWidgets3/include/wx/accel.h
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@
// Author: Julian Smart, Robert Roebling, Vadim Zeitlin
// Modified by:
// Created: 31.05.01 (extracted from other files)
// RCS-ID: $Id: accel.h 65497 2010-09-10 11:44:35Z VZ $
// RCS-ID: $Id: accel.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -116,7 +116,7 @@ public:
// returns a wxString for the this accelerator.
// this function formats it using the <flags>-<keycode> format
// where <flags> maybe a hyphen-separed list of "shift|alt|ctrl"
// where <flags> maybe a hyphen-separated list of "shift|alt|ctrl"
wxString ToString() const;
// returns true if the given string correctly initialized this object
Externals/wxWidgets3/include/wx/caret.h
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 23.05.99
// RCS-ID: $Id: caret.h 58757 2009-02-08 11:45:59Z VZ $
// RCS-ID: $Id: caret.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -147,7 +147,7 @@ public:
virtual void OnKillFocus() { }
protected:
// these functions may be overriden in the derived classes, but they
// these functions may be overridden in the derived classes, but they
// should call the base class version first
virtual bool DoCreate(wxWindowBase *window, int width, int height)
{
Externals/wxWidgets3/include/wx/chkconf.h
Vendored
+3 -3
View File
@@ -4,7 +4,7 @@
* Author: Vadim Zeitlin
* Modified by:
* Created: 09.08.00
* RCS-ID: $Id: chkconf.h 67128 2011-03-05 11:16:55Z VZ $
* RCS-ID: $Id: chkconf.h 67280 2011-03-22 14:17:38Z DS $
* Copyright: (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>
* Licence: wxWindows licence
*/
@@ -21,10 +21,10 @@
If you get an error saying "wxUSE_FOO must be defined", it means that you
are not using the correct up-to-date version of setup.h. This happens most
often when using svn or daily snapshots and a new symbol was added to
setup0.h and you haven't updated your local setup.h to to reflect it. If
setup0.h and you haven't updated your local setup.h to reflect it. If
this is the case, you need to propagate the changes from setup0.h to your
setup.h and, if using makefiles under MSW, also remove setup.h under the
build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that it
build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that
the new setup.h is copied there.
If you get an error of the form "wxFoo requires wxBar", then the settings
Externals/wxWidgets3/include/wx/cocoa/NSApplication.h
Vendored
+2 -2
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.
Externals/wxWidgets3/include/wx/cocoa/objc/objc_uniquifying.h
Vendored
+3 -3
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"
Externals/wxWidgets3/include/wx/cocoa/private/scrollview.h
Vendored
+2 -2
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.
Externals/wxWidgets3/include/wx/cocoa/radiobox.h
Vendored
+2 -2
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);
Externals/wxWidgets3/include/wx/combo.h
Vendored
+3 -3
View File
@@ -4,7 +4,7 @@
// Author: Jaakko Salli
// Modified by:
// Created: Apr-30-2006
// RCS-ID: $Id: combo.h 67256 2011-03-20 11:15:17Z JMS $
// RCS-ID: $Id: combo.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) Jaakko Salli
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ enum
wxCC_IFLAG_CREATED = 0x0100,
// Internal use: really put button outside
wxCC_IFLAG_BUTTON_OUTSIDE = 0x0200,
// Internal use: SetMargins has been succesfully called
// Internal use: SetMargins has been successfully called
wxCC_IFLAG_LEFT_MARGIN_SET = 0x0400,
// Internal use: Set wxTAB_TRAVERSAL to parent when popup is dismissed
wxCC_IFLAG_PARENT_TAB_TRAVERSAL = 0x0800,
@@ -674,7 +674,7 @@ protected:
wxRect m_tcArea;
wxRect m_btnArea;
// Colour of the the text area, in case m_text is NULL
// Colour of the text area, in case m_text is NULL
wxColour m_tcBgCol;
// current button state (uses renderer flags)
Externals/wxWidgets3/include/wx/datetime.h
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 10.02.99
// RCS-ID: $Id: datetime.h 65649 2010-09-26 22:11:21Z VZ $
// RCS-ID: $Id: datetime.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -173,7 +173,7 @@ public:
// the time in the current time zone
Local,
// zones from GMT (= Greenwhich Mean Time): they're guaranteed to be
// zones from GMT (= Greenwich Mean Time): they're guaranteed to be
// consequent numbers, so writing something like `GMT0 + offset' is
// safe if abs(offset) <= 12
Externals/wxWidgets3/include/wx/debug.h
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
// Purpose: Misc debug functions and macros
// Author: Vadim Zeitlin
// Created: 29/01/98
// RCS-ID: $Id: debug.h 64531 2010-06-09 13:23:13Z FM $
// RCS-ID: $Id: debug.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 1998-2009 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -312,7 +312,7 @@ extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
wxCHECK_RET( p != NULL, "pointer can't be NULL" )
*/
// the generic macro: takes the condition to check, the statement to be execute
// the generic macro: takes the condition to check, the statement to be executed
// in case the condition is false and the message to pass to the assert handler
#define wxCHECK2_MSG(cond, op, msg) \
if ( cond ) \
Externals/wxWidgets3/include/wx/docview.h
Vendored
+3 -3
View File
@@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id: docview.h 66852 2011-02-06 01:01:09Z VZ $
// RCS-ID: $Id: docview.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -184,8 +184,8 @@ protected:
bool m_savedYet;
// Called by OnSaveDocument and OnOpenDocument to implement standard
// Save/Load behavior. Re-implement in derived class for custom
// behavior.
// Save/Load behaviour. Re-implement in derived class for custom
// behaviour.
virtual bool DoSaveDocument(const wxString& file);
virtual bool DoOpenDocument(const wxString& file);
Externals/wxWidgets3/include/wx/gauge.h
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 20.02.01
// RCS-ID: $Id: gauge.h 58757 2009-02-08 11:45:59Z VZ $
// RCS-ID: $Id: gauge.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 1996-2001 wxWidgets team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -84,7 +84,7 @@ public:
virtual void SetBezelFace(int w);
virtual int GetBezelFace() const;
// overriden base class virtuals
// overridden base class virtuals
virtual bool AcceptsFocus() const { return false; }
protected:
Externals/wxWidgets3/include/wx/gtk/gnome/gprint.h
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
// Author: Robert Roebling
// Purpose: GNOME printing support
// Created: 09/20/04
// RCS-ID: $Id: gprint.h 61724 2009-08-21 10:41:26Z VZ $
// RCS-ID: $Id: gprint.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: Robert Roebling
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
@@ -290,7 +290,7 @@ protected:
void SetPrintData(const wxPrintData& data);
wxPrintData& GetPrintData() { return m_printData; }
// overriden for wxPrinterDC Impl
// overridden for wxPrinterDC Impl
virtual wxRect GetPaperRect() const;
virtual int GetResolution() const;
Externals/wxWidgets3/include/wx/gtk/print.h
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
// Author: Anthony Bretaudeau
// Purpose: GTK printing support
// Created: 2007-08-25
// RCS-ID: $Id: print.h 67232 2011-03-18 15:10:15Z DS $
// RCS-ID: $Id: print.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) Anthony Bretaudeau
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
@@ -249,7 +249,7 @@ public:
void SetPalette(const wxPalette& WXUNUSED(palette)) { }
void SetResolution(int ppi);
// overriden for wxPrinterDC Impl
// overridden for wxPrinterDC Impl
virtual int GetResolution() const;
virtual wxRect GetPaperRect() const;
Externals/wxWidgets3/include/wx/mediactrl.h
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@
// Author: Ryan Norton <wxprojects@comcast.net>
// Modified by:
// Created: 11/07/04
// RCS-ID: $Id: mediactrl.h 64533 2010-06-09 14:28:08Z FM $
// RCS-ID: $Id: mediactrl.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) Ryan Norton
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -58,7 +58,7 @@ enum wxMediaState
enum wxMediaCtrlPlayerControls
{
wxMEDIACTRLPLAYERCONTROLS_NONE = 0,
//Step controls like fastfoward, step one frame etc.
//Step controls like fastforward, step one frame etc.
wxMEDIACTRLPLAYERCONTROLS_STEP = 1 << 0,
//Volume controls like the speaker icon, volume slider, etc.
wxMEDIACTRLPLAYERCONTROLS_VOLUME = 1 << 1,
Externals/wxWidgets3/include/wx/msw/apptbase.h
Vendored
+6 -2
View File
@@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 22.06.2003
// RCS-ID: $Id: apptbase.h 67185 2011-03-14 11:54:32Z VZ $
// RCS-ID: $Id: apptbase.h 67288 2011-03-22 17:15:56Z VZ $
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -31,6 +31,7 @@ public:
virtual void AfterChildWaitLoop(void *data) = 0;
#if wxUSE_THREADS
// wxThread helpers
// ----------------
@@ -41,6 +42,7 @@ public:
// wait for the handle to be signaled, return WAIT_OBJECT_0 if it is or, in
// the GUI code, WAIT_OBJECT_0 + 1 if a Windows message arrived
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) = 0;
#endif // wxUSE_THREADS
#ifndef __WXWINCE__
@@ -60,9 +62,11 @@ public:
#endif // !__WXWINCE__
protected:
#if wxUSE_THREADS
// implementation of WaitForThread() for the console applications which is
// also used by the GUI code if it doesn't [yet|already} dispatch events
// also used by the GUI code if it doesn't [yet|already] dispatch events
WXDWORD DoSimpleWaitForThread(WXHANDLE hThread);
#endif // wxUSE_THREADS
};
#endif // _WX_MSW_APPTBASE_H_
Externals/wxWidgets3/include/wx/msw/apptrait.h
Vendored
+8 -4
View File
@@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 21.06.2003
// RCS-ID: $Id: apptrait.h 67185 2011-03-14 11:54:32Z VZ $
// RCS-ID: $Id: apptrait.h 67288 2011-03-22 17:15:56Z VZ $
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -24,9 +24,11 @@ public:
virtual void AfterChildWaitLoop(void *data);
#if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
#endif
#endif // wxUSE_TIMER
#if wxUSE_THREADS
virtual bool DoMessageFromThreadWait();
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
#endif // wxUSE_THREADS
#ifndef __WXWINCE__
virtual bool CanUseStderr() { return true; }
virtual bool WriteToStderr(const wxString& text);
@@ -43,10 +45,12 @@ public:
virtual void AfterChildWaitLoop(void *data);
#if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
#endif
#endif // wxUSE_TIMER
#if wxUSE_THREADS
virtual bool DoMessageFromThreadWait();
virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
#endif // wxUSE_THREADS
virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
#ifndef __WXWINCE__
virtual bool CanUseStderr();
Externals/wxWidgets3/include/wx/msw/combo.h
Vendored
+3 -1
View File
@@ -4,7 +4,7 @@
// Author: Jaakko Salli
// Modified by:
// Created: Apr-30-2006
// RCS-ID: $Id: combo.h 66385 2010-12-16 17:21:49Z JMS $
// RCS-ID: $Id: combo.h 67276 2011-03-22 09:56:40Z JMS $
// Copyright: (c) Jaakko Salli
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -94,6 +94,8 @@ protected:
void OnPaintEvent( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
virtual bool HasTransparentBackground() { return IsDoubleBuffered(); }
private:
void Init();
Externals/wxWidgets3/include/wx/msw/gauge.h
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id: gauge.h 64648 2010-06-20 17:43:02Z VZ $
// RCS-ID: $Id: gauge.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -47,7 +47,7 @@ public:
virtual void SetRange(int range);
virtual void SetValue(int pos);
// overriden base class virtuals
// overridden base class virtuals
virtual bool SetForegroundColour(const wxColour& col);
virtual bool SetBackgroundColour(const wxColour& col);

Some files were not shown because too many files have changed in this diff Show More