X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1648d51bcb7633efde873b986b4a9e2af005f119..65c75abefc4b06d49421be4af5397d8b3d5647d4:/src/common/event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 574363c74d..49601ef677 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -349,9 +349,9 @@ wxEvent::wxEvent(const wxEvent &src)
     , m_timeStamp(src.m_timeStamp)
     , m_id(src.m_id)
     , m_callbackUserData(src.m_callbackUserData)
+    , m_propagationLevel(src.m_propagationLevel)
     , m_skipped(src.m_skipped)
     , m_isCommandEvent(src.m_isCommandEvent)
-    , m_propagationLevel(src.m_propagationLevel)
 {
 }
 
@@ -390,7 +390,7 @@ long wxUpdateUIEvent::sm_updateInterval = 0;
 wxUpdateUIMode wxUpdateUIEvent::sm_updateMode = wxUPDATE_UI_PROCESS_ALL;
 
 // Can we update?
-bool wxUpdateUIEvent::CanUpdate(wxWindow* win)
+bool wxUpdateUIEvent::CanUpdate(wxWindowBase *win)
 {
     // Don't update if we've switched global updating off
     // and this window doesn't support updates.
@@ -713,6 +713,9 @@ wxChildFocusEvent::wxChildFocusEvent(wxWindow *win)
 
 #endif // wxUSE_GUI
 
+
+#if wxUSE_BASE
+
 // ----------------------------------------------------------------------------
 // wxEventHashTable
 // ----------------------------------------------------------------------------
@@ -893,8 +896,6 @@ void wxEventHashTable::GrowEventTypeTable()
 // wxEvtHandler
 // ----------------------------------------------------------------------------
 
-#if wxUSE_BASE
-
 /*
  * Event handler
  */