Fix to the crash in all MSW/OpenWatcom apps using toolbars. wxString() in A?B:C is...

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

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 69f106b9ee85172b1b780cd3d94e2efd34316caf..57daadc5735e0643eb10b758c4988d4f27c0ed75 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -611,8 +611,10 @@ void wxToolBarBase::OnMouseEnter(int id)
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     if( frame )
     {
-        wxToolBarToolBase* tool = id == wxID_ANY ? (wxToolBarToolBase*)0 : FindById(id);
-        wxString help = tool ? tool->GetLongHelp() : wxString();
+        wxString help;
+        wxToolBarToolBase* tool = id == wxID_ANY ? (wxToolBarToolBase*)NULL : FindById(id);
+        if(tool)
+            help = tool->GetLongHelp();
         frame->DoGiveHelp( help, id != wxID_ANY );
     }