fixed "toolbar getting focus" bug for the (N+1)-th time

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index be2c52c70bcba59e2ded025d3675284e40fc42f4..3f93a61e1d36c05cf3ce8426f001216bd0f3afc3 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -412,8 +412,8 @@ public:
     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void DoToolbarUpdates();
 
     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void DoToolbarUpdates();
 

-    // don't want toolbars to accept the focus by tabbing to them
-    virtual bool AcceptsFocusFromKeyboard() const { return FALSE; }
+    // don't want toolbars to accept the focus
+    virtual bool AcceptsFocus() const { return FALSE; }

 
 protected:
     // to implement in derived classes
 
 protected:
     // to implement in derived classes