Creating new revision to retag with WX_2_6_0

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 6fc526fac784654f5eee7e7921e9e83a67162873..f113a10f7e8475f18ffe5d95b8de1c768bad4c76 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3601,11 +3601,7 @@ wxWindowMSW::MSWOnDrawItem(int WXUNUSED_UNLESS_ODRAWN(id),
     {
         wxMenuItem *pMenuItem = (wxMenuItem *)(pDrawStruct->itemData);
 
     {
         wxMenuItem *pMenuItem = (wxMenuItem *)(pDrawStruct->itemData);
 

-        // see comment before the same test in MSWOnMeasureItem() below
-        if ( !pMenuItem )
-            return false;
-
-        wxCHECK_MSG( wxDynamicCast(pMenuItem, wxMenuItem),
+        wxCHECK_MSG( pMenuItem && pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)),

                          false, _T("MSWOnDrawItem: bad wxMenuItem pointer") );
 
         // prepare to call OnDrawItem(): notice using of wxDCTemp to prevent
                          false, _T("MSWOnDrawItem: bad wxMenuItem pointer") );
 
         // prepare to call OnDrawItem(): notice using of wxDCTemp to prevent