piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -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

7
Externals/wxWidgets3/include/wx/statbox.h vendored
View File

@ -5,7 +5,6 @@
// Modified by:
// Created:
// Copyright: (c) Julian Smart
// RCS-ID: $Id: statbox.h 67280 2011-03-22 14:17:38Z DS $
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -17,6 +16,7 @@
#if wxUSE_STATBOX
#include "wx/control.h"
#include "wx/containr.h"
extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];
@ -24,13 +24,12 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];
// wxStaticBox: a grouping box with a label
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxControl
class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxNavigationEnabled<wxControl>
{
public:
wxStaticBoxBase() { }
wxStaticBoxBase();
// overridden base class virtuals
virtual bool AcceptsFocus() const { return false; }
virtual bool HasTransparentBackground() { return true; }
// implementation only: this is used by wxStaticBoxSizer to account for the