X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa767a452107db3fcc5773a8955927b059ccf945..6edc74808aab15c7f2645f9b8f24a89f66141adb:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index 93eaa2e234..72468e1a2e 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -25,6 +25,7 @@ #endif #include "wx/event.h" +#include "wx/evtloop.h" #ifndef WX_PRECOMP #include "wx/list.h" @@ -42,6 +43,8 @@ #endif // wxUSE_GUI #endif +#include "wx/thread.h" + // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -141,8 +144,6 @@ wxList *wxPendingEvents = (wxList *)NULL; wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL; #endif -#if !WXWIN_COMPATIBILITY_EVENT_TYPES - // common event types are defined here, other event types are defined by the // components which use them @@ -154,14 +155,10 @@ DEFINE_EVENT_TYPE(wxEVT_IDLE) DEFINE_EVENT_TYPE(wxEVT_SOCKET) DEFINE_EVENT_TYPE(wxEVT_TIMER) -#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES - #endif // wxUSE_BASE #if wxUSE_GUI -#if !WXWIN_COMPATIBILITY_EVENT_TYPES - DEFINE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED) @@ -264,7 +261,6 @@ DEFINE_EVENT_TYPE(wxEVT_END_SESSION) DEFINE_EVENT_TYPE(wxEVT_QUERY_END_SESSION) DEFINE_EVENT_TYPE(wxEVT_HIBERNATE) DEFINE_EVENT_TYPE(wxEVT_ACTIVATE_APP) -DEFINE_EVENT_TYPE(wxEVT_POWER) DEFINE_EVENT_TYPE(wxEVT_ACTIVATE) DEFINE_EVENT_TYPE(wxEVT_CREATE) DEFINE_EVENT_TYPE(wxEVT_DESTROY) @@ -316,8 +312,6 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_ENTER) DEFINE_EVENT_TYPE(wxEVT_HELP) DEFINE_EVENT_TYPE(wxEVT_DETAILED_HELP) -#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES - #endif // wxUSE_GUI #if wxUSE_BASE @@ -519,17 +513,23 @@ wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType, wxMouseEvent::wxMouseEvent(wxEventType commandType) { m_eventType = commandType; - m_metaDown = false; - m_altDown = false; - m_controlDown = false; - m_shiftDown = false; + + m_x = 0; + m_y = 0; + m_leftDown = false; - m_rightDown = false; m_middleDown = false; + m_rightDown = false; m_aux1Down = false; m_aux2Down = false; - m_x = 0; - m_y = 0; + + m_controlDown = false; + m_shiftDown = false; + m_altDown = false; + m_metaDown = false; + + m_clickCount = -1; + m_wheelRotation = 0; m_wheelDelta = 0; m_linesPerAction = 0; @@ -770,13 +770,6 @@ wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt) #endif } -#if WXWIN_COMPATIBILITY_2_6 -long wxKeyEvent::KeyCode() const -{ - return m_keyCode; -} -#endif // WXWIN_COMPATIBILITY_2_6 - wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win) { SetEventType(wxEVT_CREATE); @@ -1061,11 +1054,7 @@ wxEvtHandler::~wxEvtHandler() it != end; ++it ) { -#if WXWIN_COMPATIBILITY_EVENT_TYPES - wxEventTableEntry *entry = (wxEventTableEntry*)*it; -#else // !WXWIN_COMPATIBILITY_EVENT_TYPES wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)*it; -#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES if (entry->m_callbackUserData) delete entry->m_callbackUserData; @@ -1309,6 +1298,42 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) return TryParent(event); } +bool wxEvtHandler::SafelyProcessEvent(wxEvent& event) +{ +#if wxUSE_EXCEPTIONS + try + { +#endif + return ProcessEvent(event); +#if wxUSE_EXCEPTIONS + } + catch ( ... ) + { + wxEventLoopBase *loop = wxEventLoopBase::GetActive(); + try + { + if ( !wxTheApp || !wxTheApp->OnExceptionInMainLoop() ) + { + if ( loop ) + loop->Exit(); + } + //else: continue running current event loop + + return false; + } + catch ( ... ) + { + // OnExceptionInMainLoop() threw, possibly rethrowing the same + // exception again: very good, but we still need Exit() to + // be called + if ( loop ) + loop->Exit(); + throw; + } + } +#endif // wxUSE_EXCEPTIONS +} + bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event) { @@ -1332,17 +1357,8 @@ void wxEvtHandler::Connect( int id, int lastId, wxObject *userData, wxEvtHandler* eventSink ) { -#if WXWIN_COMPATIBILITY_EVENT_TYPES - wxEventTableEntry *entry = new wxEventTableEntry; - entry->m_eventType = eventType; - entry->m_id = id; - entry->m_lastId = lastId; - entry->m_fn = func; - entry->m_callbackUserData = userData; -#else // !WXWIN_COMPATIBILITY_EVENT_TYPES wxDynamicEventTableEntry *entry = new wxDynamicEventTableEntry(eventType, id, lastId, func, userData, eventSink); -#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES if (!m_dynamicEvents) m_dynamicEvents = new wxList; @@ -1362,11 +1378,7 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType, wxList::compatibility_iterator node = m_dynamicEvents->GetFirst(); while (node) { -#if WXWIN_COMPATIBILITY_EVENT_TYPES - wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData(); -#else // !WXWIN_COMPATIBILITY_EVENT_TYPES - wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData(); -#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES + wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData(); if ((entry->m_id == id) && ((entry->m_lastId == lastId) || (lastId == wxID_ANY)) && @@ -1394,11 +1406,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) wxList::compatibility_iterator node = m_dynamicEvents->GetFirst(); while (node) { -#if WXWIN_COMPATIBILITY_EVENT_TYPES - wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData(); -#else // !WXWIN_COMPATIBILITY_EVENT_TYPES wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData(); -#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES // get next node before (maybe) calling the event handler as it could // call Disconnect() invalidating the current node @@ -1406,17 +1414,10 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) if ((event.GetEventType() == entry->m_eventType) && (entry->m_fn != 0)) { - wxEvtHandler *handler = -#if !WXWIN_COMPATIBILITY_EVENT_TYPES - entry->m_eventSink ? entry->m_eventSink - : -#endif - this; - + wxEvtHandler *handler = entry->m_eventSink ? entry->m_eventSink + : this; if ( ProcessEventIfMatches(*entry, handler, event) ) - { return true; - } } }