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

make wxFrame a wxControlContainer too, so that it behaves in the same way as wxDialog

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-13 16:29:23 +00:00
parent 6b6bd02c07
commit 049908c573
9 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/containr.cpp
View File

@@ -75,10 +75,8 @@ bool wxControlContainerBase::ShouldAcceptFocus() const
wxWindow *child = node->GetData();
node = node->GetNext();
#ifdef __WXMAC__
if ( m_winParent->MacIsWindowScrollbar( child ) )
if ( !m_winParent->IsClientAreaChild(child) )
continue;
#endif
if ( child->CanAcceptFocus() )
return false;
@@ -658,11 +656,10 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
wxWindow *child = node->GetData();
node = node->GetNext();
#ifdef __WXMAC__
if ( child->GetParent()->MacIsWindowScrollbar( child ) )
// skip special windows:
if ( !win->IsClientAreaChild(child) )
continue;
#endif
if ( child->CanAcceptFocusFromKeyboard() && !child->IsTopLevel() )
{
#ifdef __WXMSW__