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

17
Externals/wxWidgets3/include/wx/toplevel.h vendored
View File

@ -5,7 +5,6 @@
// Author: Vadim Zeitlin, Vaclav Slavik
// Modified by:
// Created: 06.08.01
// RCS-ID: $Id: toplevel.h 70353 2012-01-15 14:46:41Z VZ $
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Vaclav Slavik <vaclav@wxwidgets.org>
// Licence: wxWindows licence
@ -20,7 +19,6 @@
#include "wx/nonownedwnd.h"
#include "wx/iconbndl.h"
#include "wx/containr.h"
#include "wx/weakref.h"
// the default names for various classes
@ -157,8 +155,7 @@ enum
// wxTopLevelWindow: a top level (as opposed to child) window
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxTopLevelWindowBase :
public wxNavigationEnabled<wxNonOwnedWindow>
class WXDLLIMPEXP_CORE wxTopLevelWindowBase : public wxNonOwnedWindow
{
public:
// construction
@ -224,7 +221,9 @@ public:
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
// Is this the active frame (highlighted in the taskbar)?
virtual bool IsActive() { return wxGetTopLevelParent(FindFocus()) == this; }
//
// A TLW is active only if it contains the currently focused window.
virtual bool IsActive() { return IsDescendant(FindFocus()); }
// this function may be overridden to return false to allow closing the
// application even when this top level window is still open
@ -270,7 +269,6 @@ public:
wxWindow *SetTmpDefaultItem(wxWindow *win)
{ wxWindow *old = GetDefaultItem(); m_winTmpDefault = win; return old; }
// implementation only from now on
// -------------------------------
@ -303,6 +301,13 @@ public:
virtual void SetRepresentedFilename(const wxString& WXUNUSED(filename)) { }
#if wxUSE_MENUS || wxUSE_TOOLBAR
// show help text for the currently selected menu or toolbar item
// (typically in the status bar) or hide it and restore the status bar text
// originally shown before the menu was opened if show == false
virtual void DoGiveHelp(const wxString& WXUNUSED(text), bool WXUNUSED(show)) {}
#endif
protected:
// the frame client to screen translation should take account of the
// toolbar which may shift the origin of the client area