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

reverted r55167, see #9854

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-24 13:38:53 +00:00
parent 13139e9300
commit 7ce2fb7139
2 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/event.h
View File

@@ -2419,8 +2419,6 @@ protected:
// Is event handler enabled? // Is event handler enabled?
bool m_enabled; bool m_enabled;
// Avoid adding events from another thread during dtor
bool m_beingDeleted;
// The user data: either an object which will be deleted by the container // The user data: either an object which will be deleted by the container

38
src/common/event.cpp
View File

@@ -1032,8 +1032,6 @@ void wxEventHashTable::GrowEventTypeTable()
wxEvtHandler::wxEvtHandler() wxEvtHandler::wxEvtHandler()
{ {
m_beingDeleted = false;
m_nextHandler = (wxEvtHandler *) NULL; m_nextHandler = (wxEvtHandler *) NULL;
m_previousHandler = (wxEvtHandler *) NULL; m_previousHandler = (wxEvtHandler *) NULL;
m_enabled = true; m_enabled = true;
@@ -1047,8 +1045,6 @@ wxEvtHandler::wxEvtHandler()
wxEvtHandler::~wxEvtHandler() wxEvtHandler::~wxEvtHandler()
{ {
m_beingDeleted = true;
// Takes itself out of the list of handlers // Takes itself out of the list of handlers
if (m_previousHandler) if (m_previousHandler)
m_previousHandler->m_nextHandler = m_nextHandler; m_previousHandler->m_nextHandler = m_nextHandler;
@@ -1066,6 +1062,7 @@ wxEvtHandler::~wxEvtHandler()
wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)*it; wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)*it;
// Remove ourselves from sink destructor notifications // Remove ourselves from sink destructor notifications
// (this has usually been been done, in wxTrackable destructor)
wxEvtHandler *eventSink = entry->m_eventSink; wxEvtHandler *eventSink = entry->m_eventSink;
if ( eventSink ) if ( eventSink )
{ {
@@ -1086,17 +1083,8 @@ wxEvtHandler::~wxEvtHandler()
}; };
if (m_pendingEvents) if (m_pendingEvents)
{
// At this time, we could still be used from other threads.
// Continue to use sync objects.
wxENTER_CRIT_SECT( m_pendingEventsLock );
m_pendingEvents->DeleteContents(true); m_pendingEvents->DeleteContents(true);
delete m_pendingEvents; delete m_pendingEvents;
m_pendingEvents = NULL;
wxLEAVE_CRIT_SECT( m_pendingEventsLock );
}
// Remove us from wxPendingEvents if necessary. // Remove us from wxPendingEvents if necessary.
if ( wxPendingEvents ) if ( wxPendingEvents )
@@ -1144,9 +1132,6 @@ void wxEvtHandler::QueueEvent(wxEvent *event)
{ {
wxCHECK_RET( event, "NULL event can't be posted" ); wxCHECK_RET( event, "NULL event can't be posted" );
// Catch the situation where destructor is already invoked (in another thread)
if( m_beingDeleted ) return;
// 1) Add this event to our list of pending events // 1) Add this event to our list of pending events
wxENTER_CRIT_SECT( m_pendingEventsLock ); wxENTER_CRIT_SECT( m_pendingEventsLock );
@@ -1178,21 +1163,10 @@ void wxEvtHandler::ProcessPendingEvents()
{ {
wxENTER_CRIT_SECT( m_pendingEventsLock ); wxENTER_CRIT_SECT( m_pendingEventsLock );
// This method is only called by wxApp if this handler does have // this method is only called by wxApp if this handler does have
// pending events, but it happens occasionally when using multi- // pending events
// threading and we don't want a crash due to that. wxCHECK_RET( m_pendingEvents && !m_pendingEvents->IsEmpty(),
if( !m_pendingEvents ) "should have pending events if called" );
{
wxLEAVE_CRIT_SECT( m_pendingEventsLock );
return;
}
if( m_pendingEvents->IsEmpty() )
{
wxPendingEvents->DeleteObject(this);
wxLEAVE_CRIT_SECT( m_pendingEventsLock );
return;
}
wxList::compatibility_iterator node = m_pendingEvents->GetFirst(); wxList::compatibility_iterator node = m_pendingEvents->GetFirst();
wxEventPtr event(wx_static_cast(wxEvent *, node->GetData())); wxEventPtr event(wx_static_cast(wxEvent *, node->GetData()));