Another one bites the dust.

[wxWidgets.git] / src / common / tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 77034f80a42b2f67c67577b7818e4750f988903b..6f7793b419b498309e14be46d99517939236afc7 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -149,28 +149,6 @@ bool wxToolBarBase::OnLeftClick(int toolIndex, bool toggleDown)
     event.SetEventObject(this);
     event.SetExtraLong((long) toggleDown);
 
-    // First try sending the command to a window that has the focus, within a frame that
-    // also contains this toolbar.
-    wxFrame* frame = (wxFrame*) NULL;
-    wxWindow* win = this;
-    wxWindow* focusWin = (wxWindow*) NULL;
-
-    while (win)
-    {
-        if (win->IsKindOf(CLASSINFO(wxFrame)))
-        {
-            frame = (wxFrame*) win;
-            break;
-        }
-        else
-            win = win->GetParent();
-    }
-    if (frame)
-        focusWin = wxFindFocusDescendant(frame);
-
-    if (focusWin && focusWin->GetEventHandler()->ProcessEvent(event))
-        return TRUE;
-
     // Send events to this toolbar instead (and thence up the window hierarchy)
     GetEventHandler()->ProcessEvent(event);
 
@@ -242,6 +220,7 @@ wxToolBarTool *wxToolBarBase::AddTool(int index, const wxBitmap& bitmap, const w
 void wxToolBarBase::AddSeparator ()
 {
   wxToolBarTool *tool = new wxToolBarTool;
+  tool->m_index = -1;
   tool->m_toolStyle = wxTOOL_STYLE_SEPARATOR;
   m_tools.Append(-1, tool);
 }
@@ -757,27 +736,7 @@ void wxToolBarBase::OnIdle(wxIdleEvent& event)
 // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
 void wxToolBarBase::DoToolbarUpdates()
 {
-    // First try sending the command to a window that has the focus, within a frame that
-    // also contains this toolbar.
-    wxFrame* frame = (wxFrame*) NULL;
-    wxWindow* win = this;
-    wxWindow* focusWin = (wxWindow*) NULL;
-
-    while (win)
-    {
-        if (win->IsKindOf(CLASSINFO(wxFrame)))
-        {
-            frame = (wxFrame*) win;
-            break;
-        }
-        else
-            win = win->GetParent();
-    }
-    if (frame)
-        focusWin = wxFindFocusDescendant(frame);
-
-
-    wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler() ;
+    wxEvtHandler* evtHandler = GetEventHandler() ;
 
     wxNode* node = GetTools().First();
     while (node)