Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work around VC6 ICE in DLL build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-02 21:44:36 +00:00
parent f662a526eb
commit abb7d8a351
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/event.h
View File

@@ -251,7 +251,10 @@ public:
return false; return false;
const wxEventFunction method = GetMethod(); 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; } virtual wxEvtHandler *GetEvtHandler() const { return m_handler; }
@@ -259,7 +262,7 @@ public:
private: private:
wxEvtHandler *m_handler; wxEvtHandler *m_handler;
wxObjectEventFunction m_method; wxEventFunction m_method;
}; };
#if wxEVENTS_COMPATIBILITY_2_8 #if wxEVENTS_COMPATIBILITY_2_8