X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9779893b90e4ffbb036329c2411f15aff0a93295..617eb021db47c64790700e4b3a0e02c90761cda8:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index b41f00363a..eaf9a7eff9 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -50,7 +50,6 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) @@ -94,7 +93,6 @@ const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } }; -#endif // !USE_SHARED_LIBRARY // ---------------------------------------------------------------------------- // global variables @@ -175,10 +173,24 @@ void wxCommandEvent::CopyObject(wxObject& obj_d) const wxEvent::CopyObject(obj_d); - obj->m_clientData = m_clientData; - obj->m_clientObject = m_clientObject; - obj->m_extraLong = m_extraLong; - obj->m_commandInt = m_commandInt; + obj->m_clientData = m_clientData; + obj->m_clientObject = m_clientObject; + obj->m_extraLong = m_extraLong; + obj->m_commandInt = m_commandInt; + obj->m_commandString = m_commandString; +} + +/* + * Notify events + */ + +void wxNotifyEvent::CopyObject(wxObject& obj_d) const +{ + wxNotifyEvent *obj = (wxNotifyEvent *)&obj_d; + + wxEvent::CopyObject(obj_d); + + if (!m_bAllow) obj->Veto(); } /* @@ -193,6 +205,16 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType, { m_extraLong = orient; m_commandInt = pos; + m_isScrolling = TRUE; +} + +void wxScrollEvent::CopyObject(wxObject& obj_d) const +{ + wxScrollEvent *obj = (wxScrollEvent*)&obj_d; + + wxCommandEvent::CopyObject(obj_d); + + obj->m_isScrolling = m_isScrolling; } /* @@ -206,6 +228,7 @@ wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType, m_eventType = commandType; m_extraLong = orient; m_commandInt = pos; + m_isScrolling = TRUE; } void wxScrollWinEvent::CopyObject(wxObject& obj_d) const @@ -216,6 +239,7 @@ void wxScrollWinEvent::CopyObject(wxObject& obj_d) const obj->m_extraLong = m_extraLong; obj->m_commandInt = m_commandInt; + obj->m_isScrolling = m_isScrolling; } /* @@ -382,6 +406,10 @@ void wxKeyEvent::CopyObject(wxObject& obj_d) const wxKeyEvent *obj = (wxKeyEvent *)&obj_d; wxEvent::CopyObject(obj_d); + obj->m_x = m_x; + obj->m_y = m_y; + obj->m_keyCode = m_keyCode; + obj->m_shiftDown = m_shiftDown; obj->m_controlDown = m_controlDown; obj->m_metaDown = m_metaDown; @@ -508,14 +536,16 @@ void wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const } wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win) - : wxEvent(wxEVT_CREATE) + : wxEvent() { + SetEventType(wxEVT_CREATE); SetEventObject(win); } wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win) - : wxEvent(wxEVT_DESTROY) + : wxEvent() { + SetEventType(wxEVT_DESTROY); SetEventObject(win); } @@ -542,7 +572,9 @@ wxEvtHandler::wxEvtHandler() m_isWindow = FALSE; m_pendingEvents = (wxList *) NULL; #if wxUSE_THREADS +# if !defined(__VISAGECPP__) m_eventsLocker = new wxCriticalSection; +# endif #endif } @@ -571,7 +603,9 @@ wxEvtHandler::~wxEvtHandler() delete m_pendingEvents; #if wxUSE_THREADS +# if !defined(__VISAGECPP__) delete m_eventsLocker; +# endif #endif } @@ -579,8 +613,6 @@ wxEvtHandler::~wxEvtHandler() bool wxEvtHandler::ProcessThreadEvent(wxEvent& event) { - wxCriticalSectionLocker locker(*m_eventsLocker); - // check that we are really in a child thread wxASSERT_MSG( !wxThread::IsMain(), wxT("use ProcessEvent() in main thread") ); @@ -594,6 +626,14 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event) void wxEvtHandler::AddPendingEvent(wxEvent& event) { + // 1) Add event to list of pending events of this event handler + +#if defined(__VISAGECPP__) + wxENTER_CRIT_SECT( m_eventsLocker); +#else + wxENTER_CRIT_SECT( *m_eventsLocker); +#endif + if ( !m_pendingEvents ) m_pendingEvents = new wxList; @@ -601,32 +641,65 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event) m_pendingEvents->Append(event2); - wxENTER_CRIT_SECT(wxPendingEventsLocker); +#if defined(__VISAGECPP__) + wxLEAVE_CRIT_SECT( m_eventsLocker); +#else + wxLEAVE_CRIT_SECT( *m_eventsLocker); +#endif + + // 2) Add this event handler to list of event handlers that + // have pending events. + + wxENTER_CRIT_SECT(*wxPendingEventsLocker); if ( !wxPendingEvents ) wxPendingEvents = new wxList; wxPendingEvents->Append(this); - wxLEAVE_CRIT_SECT(wxPendingEventsLocker); - + wxLEAVE_CRIT_SECT(*wxPendingEventsLocker); + + // 3) Inform the system that new pending events are somwehere, + // and that these should be processed in idle time. wxWakeUpIdle(); } void wxEvtHandler::ProcessPendingEvents() { - wxCRIT_SECT_LOCKER(locker, m_eventsLocker); +#if defined(__VISAGECPP__) + wxENTER_CRIT_SECT( m_eventsLocker); +#else + wxENTER_CRIT_SECT( *m_eventsLocker); +#endif wxNode *node = m_pendingEvents->First(); - wxEvent *event; - while ( node ) { - event = (wxEvent *)node->Data(); + wxEvent *event = (wxEvent *)node->Data(); + delete node; + + // In ProcessEvent, new events might get added and + // we can safely leave the crtical section here. +#if defined(__VISAGECPP__) + wxLEAVE_CRIT_SECT( m_eventsLocker); +#else + wxLEAVE_CRIT_SECT( *m_eventsLocker); +#endif ProcessEvent(*event); delete event; - delete node; +#if defined(__VISAGECPP__) + wxENTER_CRIT_SECT( m_eventsLocker); +#else + wxENTER_CRIT_SECT( *m_eventsLocker); +#endif + node = m_pendingEvents->First(); } + +#if defined(__VISAGECPP__) + wxLEAVE_CRIT_SECT( m_eventsLocker); +#else + wxLEAVE_CRIT_SECT( *m_eventsLocker); +#endif } /* @@ -643,11 +716,18 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) // An event handler can be enabled or disabled if ( GetEvtHandlerEnabled() ) { -#if wxUSE_THREADS + +#if 0 +/* + What is this? When using GUI threads, a non main + threads can send an event and process it itself. + This breaks GTK's GUI threads, so please explain. +*/ + // Check whether we are in a child thread. if ( !wxThread::IsMain() ) return ProcessThreadEvent(event); -#endif // wxUSE_THREADS +#endif // Handle per-instance dynamic event tables first if ( m_dynamicEvents && SearchDynamicEventTable(event) ) @@ -760,6 +840,7 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event) } return FALSE; } + void wxEvtHandler::Connect( int id, int lastId, wxEventType eventType, wxObjectEventFunction func, @@ -778,6 +859,33 @@ void wxEvtHandler::Connect( int id, int lastId, m_dynamicEvents->Append( (wxObject*) entry ); } +bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType, + wxObjectEventFunction func, + wxObject *userData ) +{ + if (!m_dynamicEvents) + return FALSE; + + wxNode *node = m_dynamicEvents->First(); + while (node) + { + wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); + if ((entry->m_id == id) && + ((entry->m_lastId == lastId) || (lastId == -1)) && + ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) && + ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) && + ((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL))) + { + if (entry->m_callbackUserData) delete entry->m_callbackUserData; + m_dynamicEvents->DeleteNode( node ); + delete entry; + return TRUE; + } + node = node->Next(); + } + return FALSE; +} + bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) { wxCHECK_MSG( m_dynamicEvents, FALSE,