From 1b7c3d909a21c6d63e3e0ab8dfa4712901f34f52 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 23 Jul 2013 13:18:30 +0000 Subject: [PATCH] Compilation fix for PCH-less build after r74586. 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 --- include/wx/containr.h | 3 +-- src/common/containr.cpp | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/wx/containr.h b/include/wx/containr.h index b465e33c30..d1a63bdfca 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -76,8 +76,7 @@ public: bool DoSetFocus(); // returns whether we should accept focus ourselves or not - bool AcceptsFocus() const - { return m_acceptsFocusSelf && m_winParent->CanBeFocused(); } + bool AcceptsFocus() const; // Returns whether we or one of our children accepts focus. bool AcceptsFocusRecursively() const diff --git a/src/common/containr.cpp b/src/common/containr.cpp index ba1ffd220e..935607efdd 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -153,6 +153,11 @@ bool wxControlContainerBase::DoSetFocus() return ret; } +bool wxControlContainerBase::AcceptsFocus() const +{ + return m_acceptsFocusSelf && m_winParent->CanBeFocused(); +} + bool wxControlContainerBase::SetFocusToChild() { return wxSetFocusToChild(m_winParent, &m_winLastFocused);