From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 Mar 2002 13:58:15 +0000 (+0000)
Subject: clear the frame statusbar when the mouse leaves the toolbar or enters a tool without... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/66ce9e0609ac419e6eeff665b1087193954ed84a

clear the frame statusbar when the mouse leaves the toolbar or enters a tool without help string


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

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index e88af6fddb..93d6bbfc3f 100644
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -505,15 +505,23 @@ void wxToolBarBase::OnMouseEnter(int id)
 
     (void)GetEventHandler()->ProcessEvent(event);
 
-    wxToolBarToolBase *tool = FindById(id);
-    if ( !tool || !tool->GetLongHelp() )
-        return;
-
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     if ( !frame )
         return;
 
-    frame->SetStatusText(tool->GetLongHelp());
+    wxString helpstring;
+
+    if ( id != -1 )
+    {
+        wxToolBarToolBase *tool = FindById(id);
+        if ( tool )
+            helpstring = tool->GetLongHelp();
+    }
+
+    // set the status text anyhow, even if the string is empty: this ensures
+    // that it is cleared when the mouse leaves the toolbar or enters a tool
+    // without help
+    frame->SetStatusText(helpstring);
 }
 
 // ----------------------------------------------------------------------------