Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix for PCH-less build after r74586.

Browse Source 
Don't use wxWindow methods in wx/container.h, move AcceptsFocus()
implementation to containr.cpp.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-23 13:18:30 +00:00
parent 9c34a21681
commit 1b7c3d909a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/containr.h
View File

@@ -76,8 +76,7 @@ public:
bool DoSetFocus(); bool DoSetFocus();
// returns whether we should accept focus ourselves or not // returns whether we should accept focus ourselves or not
bool AcceptsFocus() const bool AcceptsFocus() const;
{ return m_acceptsFocusSelf && m_winParent->CanBeFocused(); }
// Returns whether we or one of our children accepts focus. // Returns whether we or one of our children accepts focus.
bool AcceptsFocusRecursively() const bool AcceptsFocusRecursively() const

5
src/common/containr.cpp
View File

@@ -153,6 +153,11 @@ bool wxControlContainerBase::DoSetFocus()
return ret; return ret;
} }
bool wxControlContainerBase::AcceptsFocus() const
{
return m_acceptsFocusSelf && m_winParent->CanBeFocused();
}
bool wxControlContainerBase::SetFocusToChild() bool wxControlContainerBase::SetFocusToChild()
{ {
return wxSetFocusToChild(m_winParent, &m_winLastFocused); return wxSetFocusToChild(m_winParent, &m_winLastFocused);