check for NULL pointer in OnMeasureItem() as well as in OnDrawItem()

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 11937618438adce72cdf2843101c3f2e60b43308..d3f219b8454152ef18d6a3c9a1395f926f26b593 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3607,7 +3607,11 @@ wxWindowMSW::MSWOnDrawItem(int WXUNUSED_UNLESS_ODRAWN(id),
     {
         wxMenuItem *pMenuItem = (wxMenuItem *)(pDrawStruct->itemData);
 
-        wxCHECK_MSG( pMenuItem && pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)),
+        // see comment before the same test in MSWOnMeasureItem() below
+        if ( !pMenuItem )
+            return false;
+
+        wxCHECK_MSG( wxDynamicCast(pMenuItem, wxMenuItem),
                          false, _T("MSWOnDrawItem: bad wxMenuItem pointer") );
 
         // prepare to call OnDrawItem(): notice using of wxDCTemp to prevent