removed WXWIN_COMPATIBILITY and WXWIN_COMPATIBILITY_2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -304,16 +304,6 @@ int wxNewEventType()
|
||||
// MT-FIXME
|
||||
static int s_lastUsedEventType = wxEVT_FIRST;
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2
|
||||
// check that we don't overlap with the user-defined types: if it does
|
||||
// happen, the best solution is probably to update the existing code to
|
||||
// use wxNewEventType() instead of wxEVT_USER_FIRST
|
||||
//
|
||||
// due to the uncertainty
|
||||
wxASSERT_MSG( s_lastUsedEventType < wxEVT_USER_FIRST - 1,
|
||||
_T("possible event type conflict") );
|
||||
#endif // WXWIN_COMPATIBILITY_2
|
||||
|
||||
return s_lastUsedEventType++;
|
||||
}
|
||||
|
||||
@@ -1321,17 +1311,6 @@ void *wxEvtHandler::DoGetClientData() const
|
||||
return m_clientData;
|
||||
}
|
||||
|
||||
|
||||
#if WXWIN_COMPATIBILITY
|
||||
bool wxEvtHandler::OnClose()
|
||||
{
|
||||
if (GetNextHandler())
|
||||
return GetNextHandler()->OnClose();
|
||||
else
|
||||
return FALSE;
|
||||
}
|
||||
#endif // WXWIN_COMPATIBILITY
|
||||
|
||||
#endif // wxUSE_BASE
|
||||
|
||||
#if wxUSE_GUI
|
||||
|
||||
Reference in New Issue
Block a user