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

8
Externals/wxWidgets3/include/wx/msw/apptbase.h vendored
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_

12
Externals/wxWidgets3/include/wx/msw/apptrait.h vendored
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();

4
Externals/wxWidgets3/include/wx/msw/combo.h vendored
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();

4
Externals/wxWidgets3/include/wx/msw/gauge.h vendored
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);

4
Externals/wxWidgets3/include/wx/msw/registry.h vendored
View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 03.04.1998
// RCS-ID: $Id: registry.h 66851 2011-02-06 01:01:01Z VZ $
// RCS-ID: $Id: registry.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -92,7 +92,7 @@ public:
// get StdKey from root HKEY
static StdKey GetStdKeyFromHkey(WXHKEY hkey);
// extacts the std key prefix from the string (return value) and
// extracts the std key prefix from the string (return value) and
// leaves only the part after it (i.e. modifies the string passed!)
static StdKey ExtractKeyName(wxString& str);

4
Externals/wxWidgets3/include/wx/msw/statline.h vendored
View File

@ -3,7 +3,7 @@
// Purpose: MSW version of wxStaticLine class
// Author: Vadim Zeitlin
// Created: 28.06.99
// Version: $Id: statline.h 67254 2011-03-20 00:14:35Z DS $
// Version: $Id: statline.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 1998 Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -38,7 +38,7 @@ public:
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticLineNameStr );
// overriden base class virtuals
// overridden base class virtuals
virtual bool AcceptsFocus() const { return false; }
// usually overridden base class virtuals