fixes to allow dragging in multiselection tree ctrl (patch 759421)

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

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index e53657dea2607a3569a0dbb3a24abd5cd4bb9f21..a187599235a0ad8bbb3dc0fc5eb6900c54ceebaf 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -38,7 +38,7 @@
 #include "wx/image.h"
 #include "wx/settings.h"
 
-#include "wx/tbarbase.h"
+#include "wx/toolbar.h"
 
 // ----------------------------------------------------------------------------
 // wxWindows macros
@@ -47,7 +47,6 @@
 IMPLEMENT_CLASS(wxToolBarBase, wxControl)
 
 BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
-    EVT_IDLE(wxToolBarBase::OnIdle)
 END_EVENT_TABLE()
 
 #include "wx/listimpl.cpp"
@@ -581,17 +580,11 @@ void wxToolBarBase::OnMouseEnter(int id)
 // UI updates
 // ----------------------------------------------------------------------------
 
-void wxToolBarBase::OnIdle(wxIdleEvent& event)
-{
-    if (wxUpdateUIEvent::CanUpdate())
-        DoToolbarUpdates();
-
-    event.Skip();
-}
-
 // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
-void wxToolBarBase::DoToolbarUpdates()
+void wxToolBarBase::UpdateWindowUI(long flags)
 {
+    wxWindowBase::UpdateWindowUI(flags);
+
     wxEvtHandler* evtHandler = GetEventHandler() ;
 
     for ( wxToolBarToolsList::Node* node = m_tools.GetFirst();