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

clicking on a panel without children should give it the focus (closes 215436)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-05-31 17:25:07 +00:00
parent e16f8973cd
commit a7407834c4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/containr.cpp
View File

@@ -51,10 +51,16 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
bool wxControlContainer::AcceptsFocus() const bool wxControlContainer::AcceptsFocus() const
{ {
// We can accept focus only when at last one child will accept focus // if we're not shown or disabled, we can't accept focus
if ( m_winParent->IsShown() && m_winParent->IsEnabled() ) if ( m_winParent->IsShown() && m_winParent->IsEnabled() )
{ {
// otherwise we can accept focus either if we have no children at all
// (in this case we're probably not used as a container) or only when
// at least one child will accept focus
wxWindowList::Node *node = m_winParent->GetChildren().GetFirst(); wxWindowList::Node *node = m_winParent->GetChildren().GetFirst();
if ( !node )
return TRUE;
while ( node ) while ( node )
{ {
wxWindow *child = node->GetData(); wxWindow *child = node->GetData();
@@ -398,7 +404,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
_T("SetFocusToChild() => first child (0x%08lx)."), _T("SetFocusToChild() => first child (0x%08lx)."),
(unsigned long)child->GetHandle()); (unsigned long)child->GetHandle());
*childLastFocused = child; // should be redundant, but it is not *childLastFocused = child;
child->SetFocusFromKbd(); child->SetFocusFromKbd();
return TRUE; return TRUE;
} }