menu help string fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-02-23 22:53:48 +00:00
parent 634903fd04
commit d20eef8ac8

View File

@ -878,21 +878,16 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
{
if (GetStatusBar())
{
if (event.GetMenuId() == -1)
SetStatusText("");
else
int menuId = event.GetMenuId();
if ( menuId != -1 )
{
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));
}
}
}