X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5a98acdf25b3d2eae7858d30ac29f629d589703..194142ed6fec5b7bc09e19b093db3e5d56f3ebc4:/src/common/event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 083e52a709..29c1c3a690 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "event.h"
 #endif
 
@@ -339,6 +339,7 @@ wxEvent::wxEvent(int theId, wxEventType commandType )
     m_skipped = FALSE;
     m_callbackUserData = (wxObject *) NULL;
     m_isCommandEvent = FALSE;
+    m_propagationLevel = wxEVENT_PROPAGATE_NONE;
 }
 
 wxEvent::wxEvent(const wxEvent &src)
@@ -348,6 +349,7 @@ 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)
 {
@@ -370,6 +372,9 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
     m_extraLong = 0;
     m_commandInt = 0;
     m_isCommandEvent = TRUE;
+
+    // the command events are propagated upwards by default
+    m_propagationLevel = wxEVENT_PROPAGATE_MAX;
 }
 
 /*
@@ -385,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.
@@ -708,6 +713,9 @@ wxChildFocusEvent::wxChildFocusEvent(wxWindow *win)
 
 #endif // wxUSE_GUI
 
+
+#if wxUSE_BASE
+
 // ----------------------------------------------------------------------------
 // wxEventHashTable
 // ----------------------------------------------------------------------------
@@ -888,8 +896,6 @@ void wxEventHashTable::GrowEventTypeTable()
 // wxEvtHandler
 // ----------------------------------------------------------------------------
 
-#if wxUSE_BASE
-
 /*
  * Event handler
  */