From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Thu, 14 Oct 2004 17:27:33 +0000 (+0000)
Subject: Fix to the crash in all MSW/OpenWatcom apps using toolbars. wxString() in A?B:C is... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/326a37f1484ae04edd588728526876c4c784405c

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


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 69f106b9ee..57daadc573 100644
--- 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 );
     }