From 2d29bf54f1a5417a4e351fda7e385e37f28c5218 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 24 Apr 2005 10:08:35 +0000 Subject: [PATCH] Restored previous revision after retag git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/window.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index f113a10f7e..6fc526fac7 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -3601,7 +3601,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 -- 2.45.2