As in 2.2.9, toolbars should not get the focus.

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

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index faee5036421be4933d09586b25d8a3744fe85cca..dd998f47d99ceca77356917c2a61dd9dfa112cc0 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -68,6 +68,8 @@ public:
     void OnMouseEvent(wxMouseEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
+    void SetFocus() {}
+
     static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
 
 protected:

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index d51e0ebad9f97ec91d91064b3bab9b4006267b00..53874e300a8864e83e4896017e4bfc7381a0ccb9 100644 (file)
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TBARMSW_H_