removed second parameter of wxFrame::DoGiveHelp(), the help string is always shown (even if it's empty), not hidden; this hopefully really fixes restoring the previously shown status bar text when the menu is dismissed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -631,10 +631,16 @@ void wxToolBarBase::OnMouseEnter(int id)
|
||||
if( frame )
|
||||
{
|
||||
wxString help;
|
||||
wxToolBarToolBase* tool = id == wxID_ANY ? (wxToolBarToolBase*)NULL : FindById(id);
|
||||
if(tool)
|
||||
help = tool->GetLongHelp();
|
||||
frame->DoGiveHelp( help, id != wxID_ANY );
|
||||
if ( id != wxID_ANY )
|
||||
{
|
||||
const wxToolBarToolBase * const tool = FindById(id);
|
||||
if ( tool )
|
||||
help = tool->GetLongHelp();
|
||||
}
|
||||
|
||||
// do it even if help string is empty to avoid showing the help for the
|
||||
// previously selected tool when another one is selected
|
||||
frame->DoGiveHelp(help);
|
||||
}
|
||||
|
||||
(void)GetEventHandler()->ProcessEvent(event);
|
||||
|
Reference in New Issue
Block a user