X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/361ba943f90a3dbc0da9155802baf27928998d23..77cc73a78e51832c71351a2758df508672b8c294:/include/wx/event.h?ds=sidebyside

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