From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 12 Oct 2004 21:08:54 +0000 (+0000)
Subject: check that item pointer is non-NULL in WM_DRAW/MEASUREITEM
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/42f25dcfc725bea1ec5cc634af28cad26f34d39e

check that item pointer is non-NULL in WM_DRAW/MEASUREITEM


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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 02e5c2cfcf..bcad284c87 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3662,7 +3662,8 @@ wxWindowMSW::MSWOnDrawItem(int WXUNUSED_UNLESS_ODRAWN(id),
     {
         wxMenuItem *pMenuItem = (wxMenuItem *)(pDrawStruct->itemData);
 
-        wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), false );
+        wxCHECK_MSG( pMenuItem && pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)),
+                         false, _T("MSWOnDrawItem: bad wxMenuItem pointer") );
 
         // prepare to call OnDrawItem(): notice using of wxDCTemp to prevent
         // the DC from being released
@@ -3719,7 +3720,8 @@ wxWindowMSW::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)
     {
         wxMenuItem *pMenuItem = (wxMenuItem *)(pMeasureStruct->itemData);
 
-        wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), false );
+        wxCHECK_MSG( pMenuItem && pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)),
+                        false, _T("MSWOnMeasureItem: bad wxMenuItem pointer") );
 
         size_t w, h;
         bool rc = pMenuItem->OnMeasureItem(&w, &h);