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

wxWidgets3: update to svn r70933

Browse Source
This commit is contained in:
Shawn Hoffman
2012-03-17 18:12:27 -07:00
parent 0ed8af2287
commit a648aca65c
906 changed files with 39468 additions and 17244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Externals/wxWidgets3/include/wx/private/fontmgr.h vendored
View File

@ -3,7 +3,7 @@
// Purpose: font management for ports that don't have their own
// Author: Vaclav Slavik
// Created: 2006-11-18
// RCS-ID: $Id: fontmgr.h 62349 2009-10-09 13:04:59Z VZ $
// RCS-ID: $Id: fontmgr.h 70353 2012-01-15 14:46:41Z VZ $
// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
// (c) 2006 REA Elektronik GmbH
// Licence: wxWindows licence
@ -192,9 +192,7 @@ protected:
#if defined(__WXMGL__)
#include "wx/mgl/private/fontmgr.h"
#elif defined(__WXDFB__)
#if defined(__WXDFB__)
#include "wx/dfb/private/fontmgr.h"
#endif

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

@ -3,7 +3,7 @@
// Purpose: File system watcher impl classes
// Author: Bartosz Bekier
// Created: 2009-05-26
// RCS-ID: $Id: fswatcher.h 62475 2009-10-22 11:36:35Z VZ $
// RCS-ID: $Id: fswatcher.h 70796 2012-03-04 00:29:31Z VZ $
// Copyright: (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -23,7 +23,7 @@
#define wxFSWatchEntry wxFSWatchEntryKq
WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxFSWatchEntry>,wxFSWatchEntries);
#include "wx/unix/private/fswatcher_kqueue.h"
#elif defined(__WXMSW__)
#elif defined(__WINDOWS__)
class wxFSWatchEntryMSW;
#define wxFSWatchEntry wxFSWatchEntryMSW
WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxFSWatchEntry>,wxFSWatchEntries);

6
Externals/wxWidgets3/include/wx/private/markupparserattr.h vendored
View File

@ -3,7 +3,7 @@
// Purpose: Classes mapping markup attributes to wxFont/wxColour.
// Author: Vadim Zeitlin
// Created: 2011-02-18
// RCS-ID: $Id: markupparserattr.h 67073 2011-02-27 14:01:36Z VZ $
// RCS-ID: $Id: markupparserattr.h 70447 2012-01-23 11:28:32Z VZ $
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -78,8 +78,8 @@ public:
virtual void OnUnderlinedStart() { DoChangeFont(&wxFont::Underlined); }
virtual void OnUnderlinedEnd() { DoEndAttr(); }
virtual void OnStrikethroughStart() { } // TODO: No support in wxFont yet.
virtual void OnStrikethroughEnd() { }
virtual void OnStrikethroughStart() { DoChangeFont(&wxFont::Strikethrough); }
virtual void OnStrikethroughEnd() { DoEndAttr(); }
virtual void OnBigStart() { DoChangeFont(&wxFont::Larger); }
virtual void OnBigEnd() { DoEndAttr(); }

44
Externals/wxWidgets3/include/wx/private/richtooltip.h vendored Normal file
View File

@ -0,0 +1,44 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/private/richtooltip.h
// Purpose: wxRichToolTipImpl declaration.
// Author: Vadim Zeitlin
// Created: 2011-10-18
// RCS-ID: $Id: richtooltip.h 69463 2011-10-18 21:57:02Z VZ $
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PRIVATE_RICHTOOLTIP_H_
#define _WX_PRIVATE_RICHTOOLTIP_H_
#include "wx/richtooltip.h"
// ----------------------------------------------------------------------------
// wxRichToolTipImpl: defines wxRichToolTip implementation.
// ----------------------------------------------------------------------------
class wxRichToolTipImpl
{
public:
// This is implemented in a platform-specific way.
static wxRichToolTipImpl* Create(const wxString& title,
const wxString& message);
// These methods simply mirror the public wxRichToolTip ones.
virtual void SetBackgroundColour(const wxColour& col,
const wxColour& colEnd) = 0;
virtual void SetCustomIcon(const wxIcon& icon) = 0;
virtual void SetStandardIcon(int icon) = 0;
virtual void SetTimeout(unsigned milliseconds) = 0;
virtual void SetTipKind(wxTipKind tipKind) = 0;
virtual void SetTitleFont(const wxFont& font) = 0;
virtual void ShowFor(wxWindow* win) = 0;
virtual ~wxRichToolTipImpl() { }
protected:
wxRichToolTipImpl() { }
};
#endif // _WX_PRIVATE_RICHTOOLTIP_H_

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

@ -3,7 +3,7 @@
// Purpose: wxSockAddressImpl
// Author: Vadim Zeitlin
// Created: 2008-12-28
// RCS-ID: $Id: sckaddr.h 67254 2011-03-20 00:14:35Z DS $
// RCS-ID: $Id: sckaddr.h 70796 2012-03-04 00:29:31Z VZ $
// Copyright: (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -11,7 +11,7 @@
#ifndef _WX_PRIVATE_SOCKADDR_H_
#define _WX_PRIVATE_SOCKADDR_H_
#ifdef __WXMSW__
#ifdef __WINDOWS__
#include "wx/msw/wrapwin.h"
#if wxUSE_IPV6

8
Externals/wxWidgets3/include/wx/private/socket.h vendored
View File

@ -3,7 +3,7 @@
// Purpose: wxSocketImpl and related declarations
// Authors: Guilhem Lavaux, Vadim Zeitlin
// Created: April 1997
// RCS-ID: $Id: socket.h 61675 2009-08-16 23:13:45Z VZ $
// RCS-ID: $Id: socket.h 70796 2012-03-04 00:29:31Z VZ $
// Copyright: (c) 1997 Guilhem Lavaux
// (c) 2008 Vadim Zeitlin
// Licence: wxWindows licence
@ -61,7 +61,7 @@
// include the header defining timeval: under Windows this struct is used only
// with sockets so we need to include winsock.h which we do via windows.h
#ifdef __WXMSW__
#ifdef __WINDOWS__
#include "wx/msw/wrapwin.h"
#else
#include <sys/time.h> // for timeval
@ -79,7 +79,7 @@
// define some symbols which winsock.h defines but traditional BSD headers
// don't
#ifndef __WXMSW__
#ifndef __WINDOWS__
#define SOCKET int
#endif
@ -367,7 +367,7 @@ private:
wxDECLARE_NO_COPY_CLASS(wxSocketImpl);
};
#if defined(__WXMSW__)
#if defined(__WINDOWS__)
#include "wx/msw/private/sockmsw.h"
#else
#include "wx/unix/private/sockunix.h"

6
Externals/wxWidgets3/include/wx/private/wxprintf.h vendored
View File

@ -4,7 +4,7 @@
// Author: Ove Kaven
// Modified by: Ron Lee, Francesco Montorsi
// Created: 09/04/99
// RCS-ID: $Id: wxprintf.h 65690 2010-09-30 14:30:35Z VZ $
// RCS-ID: $Id: wxprintf.h 70796 2012-03-04 00:29:31Z VZ $
// Copyright: (c) wxWidgets copyright
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -289,7 +289,7 @@ bool wxPrintfConvSpec<CharType>::Parse(const CharType *format)
CHECK_PREC
m_szFlags[flagofs++] = char(ch);
break;
#ifdef __WXMSW__
#ifdef __WINDOWS__
// under Windows we support the special '%I64' notation as longlong
// integer conversion specifier for MSVC compatibility
// (it behaves exactly as '%lli' or '%Li' or '%qi')
@ -308,7 +308,7 @@ bool wxPrintfConvSpec<CharType>::Parse(const CharType *format)
break;
}
// else: fall-through, 'I' is MSVC equivalent of C99 'z'
#endif // __WXMSW__
#endif // __WINDOWS__
case wxT('z'):
case wxT('Z'):