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

Removed wxFindFocusDescendant for non-wxMSW platforms.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-10-05 13:05:50 +00:00
parent fb20fa43a0
commit f0e9f0d3ff
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/framecmn.cpp
View File

@@ -427,8 +427,11 @@ void wxFrameBase::DoMenuUpdates()
{ {
wxMenuBar* bar = GetMenuBar(); wxMenuBar* bar = GetMenuBar();
#ifdef __WXMSW__
wxWindow* focusWin = wxFindFocusDescendant((wxWindow*) this); wxWindow* focusWin = wxFindFocusDescendant((wxWindow*) this);
#else
wxWindow* focusWin = (wxWindow*) NULL;
#endif
if ( bar != NULL ) if ( bar != NULL )
{ {
int nCount = bar->GetMenuCount(); int nCount = bar->GetMenuCount();

4
src/common/tbarbase.cpp
View File

@@ -530,7 +530,11 @@ void wxToolBarBase::DoToolbarUpdates()
while (parent->GetParent()) while (parent->GetParent())
parent = parent->GetParent(); parent = parent->GetParent();
#ifdef __WXMSW__
wxWindow* focusWin = wxFindFocusDescendant(parent); wxWindow* focusWin = wxFindFocusDescendant(parent);
#else
wxWindow* focusWin = (wxWindow*) NULL;
#endif
wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler() ; wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler() ;