menu help string fix

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 2f9d0dabb7a1ab4d7fffe54eefd8c21a79d64631..03a362b615437d6ba553c70b15bb3742f4320257 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -878,21 +878,16 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
 {
   if (GetStatusBar())
   {
 {
   if (GetStatusBar())
   {

-    if (event.GetMenuId() == -1)
-      SetStatusText("");
-    else
+    int menuId = event.GetMenuId();
+    if ( menuId != -1 )

     {
       wxMenuBar *menuBar = GetMenuBar();
       if (menuBar)
       {
     {
       wxMenuBar *menuBar = GetMenuBar();
       if (menuBar)
       {

-// #ifndef __SALFORDC__
-        int menuId = event.GetMenuId();
-        wxString helpString;
-        // This causes a spurious access violation with Salford C++
-        helpString = menuBar->GetHelpString(menuId);
-        if (helpString != "")
-            SetStatusText(helpString);
-// #endif
+        // set status text even if the string is empty - this will at
+        // least remove the string from the item which was previously
+        // selected
+        SetStatusText(menuBar->GetHelpString(menuId));

       }
     }
   }
       }
     }
   }