mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-31 10:09:36 -06:00
Upgrade WX to r74856, mainly to support @2x.
This commit is contained in:
comex
94
Externals/wxWidgets3/include/wx/containr.h
vendored
94
Externals/wxWidgets3/include/wx/containr.h
vendored
@ -4,7 +4,6 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 06.08.01
|
||||
// RCS-ID: $Id: containr.h 70805 2012-03-04 09:42:51Z SC $
|
||||
// Copyright: (c) 2001, 2011 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -42,9 +41,12 @@ public:
|
||||
{
|
||||
m_winParent = NULL;
|
||||
|
||||
// do accept focus initially, we'll stop doing it if/when any children
|
||||
// are added
|
||||
m_acceptsFocus = true;
|
||||
// By default, we accept focus ourselves.
|
||||
m_acceptsFocusSelf = true;
|
||||
|
||||
// But we don't have any children accepting it yet.
|
||||
m_acceptsFocusChildren = false;
|
||||
|
||||
m_inSetFocus = false;
|
||||
m_winLastFocused = NULL;
|
||||
}
|
||||
@ -57,31 +59,36 @@ public:
|
||||
m_winParent = winParent;
|
||||
}
|
||||
|
||||
// This can be called by the window to indicate that it never wants to have
|
||||
// the focus for itself.
|
||||
void DisableSelfFocus()
|
||||
{ m_acceptsFocusSelf = false; UpdateParentCanFocus(); }
|
||||
|
||||
// This can be called to undo the effect of a previous DisableSelfFocus()
|
||||
// (otherwise calling it is not necessary as the window does accept focus
|
||||
// by default).
|
||||
void EnableSelfFocus()
|
||||
{ m_acceptsFocusSelf = true; UpdateParentCanFocus(); }
|
||||
|
||||
// should be called from SetFocus(), returns false if we did nothing with
|
||||
// the focus and the default processing should take place
|
||||
bool DoSetFocus();
|
||||
|
||||
// should be called when we decide that we should [stop] accepting focus
|
||||
void SetCanFocus(bool acceptsFocus);
|
||||
|
||||
// returns whether we should accept focus ourselves or not
|
||||
bool AcceptsFocus() const { return m_acceptsFocus; }
|
||||
bool AcceptsFocus() const;
|
||||
|
||||
// returns whether we or one of our children accepts focus: we always do
|
||||
// because if we don't have any focusable children it probably means that
|
||||
// we're not being used as a container at all (think of wxGrid or generic
|
||||
// wxListCtrl) and so should get focus for ourselves
|
||||
bool AcceptsFocusRecursively() const { return true; }
|
||||
// Returns whether we or one of our children accepts focus.
|
||||
bool AcceptsFocusRecursively() const
|
||||
{ return AcceptsFocus() ||
|
||||
(m_acceptsFocusChildren && HasAnyChildrenAcceptingFocus()); }
|
||||
|
||||
// this is used to determine whether we can accept focus when Tab or
|
||||
// another navigation key is pressed -- we alsways can, for the same reason
|
||||
// as mentioned above for AcceptsFocusRecursively()
|
||||
bool AcceptsFocusFromKeyboard() const { return true; }
|
||||
// We accept focus from keyboard if we accept it at all.
|
||||
bool AcceptsFocusFromKeyboard() const { return AcceptsFocusRecursively(); }
|
||||
|
||||
// Call this when the number of children of the window changes.
|
||||
// If we have any children, this panel (used just as container for
|
||||
// them) shouldn't get focus for itself.
|
||||
void UpdateCanFocus() { SetCanFocus(!HasAnyFocusableChildren()); }
|
||||
//
|
||||
// Returns true if we have any focusable children, false otherwise.
|
||||
bool UpdateCanFocusChildren();
|
||||
|
||||
protected:
|
||||
// set the focus to the child which had it the last time
|
||||
@ -90,6 +97,10 @@ protected:
|
||||
// return true if we have any children accepting focus
|
||||
bool HasAnyFocusableChildren() const;
|
||||
|
||||
// return true if we have any children that do accept focus right now
|
||||
bool HasAnyChildrenAcceptingFocus() const;
|
||||
|
||||
|
||||
// the parent window we manage the children for
|
||||
wxWindow *m_winParent;
|
||||
|
||||
@ -97,9 +108,19 @@ protected:
|
||||
wxWindow *m_winLastFocused;
|
||||
|
||||
private:
|
||||
// value returned by AcceptsFocus(), should be changed using SetCanFocus()
|
||||
// only
|
||||
bool m_acceptsFocus;
|
||||
// Update the window status to reflect whether it is getting focus or not.
|
||||
void UpdateParentCanFocus();
|
||||
|
||||
// Indicates whether the associated window can ever have focus itself.
|
||||
//
|
||||
// Usually this is the case, e.g. a wxPanel can be used either as a
|
||||
// container for its children or just as a normal window which can be
|
||||
// focused. But sometimes, e.g. for wxStaticBox, we can never have focus
|
||||
// ourselves and can only get it if we have any focusable children.
|
||||
bool m_acceptsFocusSelf;
|
||||
|
||||
// Cached value remembering whether we have any children accepting focus.
|
||||
bool m_acceptsFocusChildren;
|
||||
|
||||
// a guard against infinite recursion
|
||||
bool m_inSetFocus;
|
||||
@ -198,7 +219,13 @@ public:
|
||||
{
|
||||
BaseWindowClass::AddChild(child);
|
||||
|
||||
m_container.UpdateCanFocus();
|
||||
if ( m_container.UpdateCanFocusChildren() )
|
||||
{
|
||||
// Under MSW we must have wxTAB_TRAVERSAL style for TAB navigation
|
||||
// to work.
|
||||
if ( !BaseWindowClass::HasFlag(wxTAB_TRAVERSAL) )
|
||||
BaseWindowClass::ToggleWindowStyle(wxTAB_TRAVERSAL);
|
||||
}
|
||||
}
|
||||
|
||||
WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child)
|
||||
@ -209,7 +236,9 @@ public:
|
||||
|
||||
BaseWindowClass::RemoveChild(child);
|
||||
|
||||
m_container.UpdateCanFocus();
|
||||
// We could reset wxTAB_TRAVERSAL here but it doesn't seem to do any
|
||||
// harm to keep it.
|
||||
m_container.UpdateCanFocusChildren();
|
||||
}
|
||||
|
||||
WXDLLIMPEXP_INLINE_CORE virtual void SetFocus()
|
||||
@ -223,11 +252,6 @@ public:
|
||||
BaseWindowClass::SetFocus();
|
||||
}
|
||||
|
||||
void AcceptFocus(bool acceptFocus)
|
||||
{
|
||||
m_container.SetCanFocus(acceptFocus);
|
||||
}
|
||||
|
||||
protected:
|
||||
#ifndef wxHAS_NATIVE_TAB_TRAVERSAL
|
||||
void OnNavigationKey(wxNavigationKeyEvent& event)
|
||||
@ -271,10 +295,6 @@ public: \
|
||||
virtual void RemoveChild(wxWindowBase *child); \
|
||||
virtual void SetFocus(); \
|
||||
void SetFocusIgnoringChildren(); \
|
||||
void AcceptFocus(bool acceptFocus) \
|
||||
{ \
|
||||
m_container.SetCanFocus(acceptFocus); \
|
||||
} \
|
||||
\
|
||||
protected: \
|
||||
wxControlContainer m_container
|
||||
@ -290,7 +310,7 @@ protected: \
|
||||
{ \
|
||||
basename::AddChild(child); \
|
||||
\
|
||||
m_container.UpdateCanFocus(); \
|
||||
m_container.UpdateCanFocusChildren(); \
|
||||
} \
|
||||
\
|
||||
bool classname::AcceptsFocusRecursively() const \
|
||||
@ -328,7 +348,7 @@ protected: \
|
||||
{ \
|
||||
basename::RemoveChild(child); \
|
||||
\
|
||||
m_container.UpdateCanFocus(); \
|
||||
m_container.UpdateCanFocusChildren(); \
|
||||
} \
|
||||
\
|
||||
void classname::SetFocusIgnoringChildren() \
|
||||
@ -363,7 +383,7 @@ public: \
|
||||
\
|
||||
basename::RemoveChild(child); \
|
||||
\
|
||||
m_container.UpdateCanFocus(); \
|
||||
m_container.UpdateCanFocusChildren(); \
|
||||
} \
|
||||
\
|
||||
void classname::OnNavigationKey( wxNavigationKeyEvent& event ) \
|
||||
|
||||
Reference in New Issue
Block a user