X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3bad8c39260b8bda7762b4aacd49346b46064a2a..fe7cefd493837b49e8095b87aad1a01679eb7592:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index c7d1d33bde..914995e2fa 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -369,6 +368,7 @@ wxEvent::wxEvent(int theId, wxEventType commandType) m_handlerToProcessOnlyIn = NULL; m_isCommandEvent = false; m_propagationLevel = wxEVENT_PROPAGATE_NONE; + m_propagatedFrom = NULL; m_wasProcessed = false; m_willBeProcessedAgain = false; } @@ -382,6 +382,7 @@ wxEvent::wxEvent(const wxEvent& src) , m_callbackUserData(src.m_callbackUserData) , m_handlerToProcessOnlyIn(NULL) , m_propagationLevel(src.m_propagationLevel) + , m_propagatedFrom(NULL) , m_skipped(src.m_skipped) , m_isCommandEvent(src.m_isCommandEvent) , m_wasProcessed(false) @@ -400,6 +401,7 @@ wxEvent& wxEvent::operator=(const wxEvent& src) m_callbackUserData = src.m_callbackUserData; m_handlerToProcessOnlyIn = NULL; m_propagationLevel = src.m_propagationLevel; + m_propagatedFrom = NULL; m_skipped = src.m_skipped; m_isCommandEvent = src.m_isCommandEvent; @@ -565,6 +567,7 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType) m_wheelRotation = 0; m_wheelDelta = 0; m_linesPerAction = 0; + m_columnsPerAction = 0; } void wxMouseEvent::Assign(const wxMouseEvent& event) @@ -587,6 +590,7 @@ void wxMouseEvent::Assign(const wxMouseEvent& event) m_wheelRotation = event.m_wheelRotation; m_wheelDelta = event.m_wheelDelta; m_linesPerAction = event.m_linesPerAction; + m_columnsPerAction = event.m_columnsPerAction; m_wheelAxis = event.m_wheelAxis; }