From f0e9f0d3ff8552bcbb19b323714471f06711c00e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 5 Oct 2000 13:05:50 +0000 Subject: [PATCH] Removed wxFindFocusDescendant for non-wxMSW platforms. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/framecmn.cpp | 5 ++++- src/common/tbarbase.cpp | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index b69ca51332..3cc2dff527 100644 --- a/src/common/framecmn.cpp +++ b/src/common/framecmn.cpp @@ -427,8 +427,11 @@ void wxFrameBase::DoMenuUpdates() { wxMenuBar* bar = GetMenuBar(); +#ifdef __WXMSW__ wxWindow* focusWin = wxFindFocusDescendant((wxWindow*) this); - +#else + wxWindow* focusWin = (wxWindow*) NULL; +#endif if ( bar != NULL ) { int nCount = bar->GetMenuCount(); diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp index 526c883fcc..3bb374eecb 100644 --- a/src/common/tbarbase.cpp +++ b/src/common/tbarbase.cpp @@ -530,7 +530,11 @@ void wxToolBarBase::DoToolbarUpdates() while (parent->GetParent()) parent = parent->GetParent(); +#ifdef __WXMSW__ wxWindow* focusWin = wxFindFocusDescendant(parent); +#else + wxWindow* focusWin = (wxWindow*) NULL; +#endif wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler() ;