X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfe17b74353dcf5ed47c1449e6e415aeb0f1c295..d4aa3a4b860a70c27421411fbc778fc5914f1815:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index f657f889e1..aa4c5d9172 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -46,6 +46,7 @@ #include "wx/validate.h" #endif // wxUSE_GUI + // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -205,6 +206,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; } /* @@ -218,6 +229,7 @@ wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType, m_eventType = commandType; m_extraLong = orient; m_commandInt = pos; + m_isScrolling = TRUE; } void wxScrollWinEvent::CopyObject(wxObject& obj_d) const @@ -228,6 +240,7 @@ void wxScrollWinEvent::CopyObject(wxObject& obj_d) const obj->m_extraLong = m_extraLong; obj->m_commandInt = m_commandInt; + obj->m_isScrolling = m_isScrolling; } /* @@ -644,12 +657,11 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event) wxPendingEvents = new wxList; wxPendingEvents->Append(this); + wxLEAVE_CRIT_SECT(*wxPendingEventsLocker); + // 3) Inform the system that new pending events are somwehere, // and that these should be processed in idle time. - wxWakeUpIdle(); - - wxLEAVE_CRIT_SECT(*wxPendingEventsLocker); } void wxEvtHandler::ProcessPendingEvents() @@ -667,7 +679,7 @@ void wxEvtHandler::ProcessPendingEvents() delete node; // In ProcessEvent, new events might get added and - // we can safely leave the crtical section here. + // we can safely leave the crtical section here. #if defined(__VISAGECPP__) wxLEAVE_CRIT_SECT( m_eventsLocker); #else