added wxPersistentRegisterAndRestore() function to work around VC6 brokenness in...

[wxWidgets.git] / include / wx / event.h

diff --git a/include/wx/event.h b/include/wx/event.h
index eb9b3ac6ad3c64bf021ff599e914444d5faf65bd..6b0f093f309fa0ea4d777eb68a156315297138c3 100644 (file)
--- 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