Added optional event sink for use with dynamic event tables

Removed comments and commented-out code re. focus window processing
from wxToolBarBase


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-06-30 13:11:51 +00:00
parent d48568a5ec
commit 65b17727e6
5 changed files with 37 additions and 31 deletions

View File

@@ -591,21 +591,7 @@ void wxToolBarBase::OnIdle(wxIdleEvent& event)
// Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
void wxToolBarBase::DoToolbarUpdates()
{
wxWindow* parent = this;
while (parent->GetParent())
parent = parent->GetParent();
// This kind of #ifdef is a good way to annoy people. It breaks
// apps, but only on one platform and due to a hack in officially
// platform independent code. It took me hours to fix this. RR.
//
// #ifdef __WXMSW__
// wxWindow* focusWin = wxFindFocusDescendant(parent);
// #else
wxWindow* focusWin = (wxWindow*) NULL;
// #endif
wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler() ;
wxEvtHandler* evtHandler = GetEventHandler() ;
for ( wxToolBarToolsList::Node* node = m_tools.GetFirst();
node;