From abb7d8a3511a0107082b394af1804c12ea990fd5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 2 Feb 2009 21:44:36 +0000
Subject: [PATCH] work around VC6 ICE in DLL build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/event.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/wx/event.h b/include/wx/event.h
index eb9b3ac6ad..6b0f093f30 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -251,7 +251,10 @@ public:
             return false;
 
         const wxEventFunction method = GetMethod();
-        return !method || GetMethod() == method;
+
+        // FIXME-VC6: amazing but true: replacing "method == NULL" here with
+        //            "!method" makes VC6 crash with an ICE in DLL build (only!)
+        return method == NULL || GetMethod() == method;
     }
 
     virtual wxEvtHandler *GetEvtHandler() const { return m_handler; }
@@ -259,7 +262,7 @@ public:
 
 private:
     wxEvtHandler *m_handler;
-    wxObjectEventFunction m_method;
+    wxEventFunction m_method;
 };
 
 #if wxEVENTS_COMPATIBILITY_2_8
-- 
2.45.2