X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e45d90901d75b511a851f94306f171fefb06e493..26cdd42d2cbd99d23159ae4b4d41ae93ed23317c:/src/common/event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 088e5fdbfc..59f6bc004a 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -554,10 +554,10 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType)
 
     m_clickCount = -1;
 
+    m_wheelAxis = wxMOUSE_WHEEL_VERTICAL;
     m_wheelRotation = 0;
     m_wheelDelta = 0;
     m_linesPerAction = 0;
-    m_wheelAxis = 0;
 }
 
 void wxMouseEvent::Assign(const wxMouseEvent& event)
@@ -735,6 +735,8 @@ wxKeyEvent::wxKeyEvent(wxEventType type)
 #if wxUSE_UNICODE
     m_uniChar = WXK_NONE;
 #endif
+
+    InitPropagation();
 }
 
 wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt)
@@ -742,6 +744,8 @@ wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt)
             wxKeyboardState(evt)
 {
     DoAssignMembers(evt);
+
+    InitPropagation();
 }
 
 wxKeyEvent::wxKeyEvent(wxEventType eventType, const wxKeyEvent& evt)
@@ -751,6 +755,8 @@ wxKeyEvent::wxKeyEvent(wxEventType eventType, const wxKeyEvent& evt)
     DoAssignMembers(evt);
 
     m_eventType = eventType;
+
+    InitPropagation();
 }
 
 bool wxKeyEvent::IsKeyInCategory(int category) const
@@ -1156,6 +1162,8 @@ wxEventFilter* wxEvtHandler::ms_filterList = NULL;
             // Skip the assert below.
             return;
         }
+
+        prev = f;
     }
 
     wxFAIL_MSG( "Filter not found" );