X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..5de5db0eb14aa86b5b177050720deb0f4c210fba:/src/common/event.cpp?ds=sidebyside

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 2cc283f10d..de088d74f0 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -54,7 +54,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
@@ -104,6 +104,7 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
 {
   m_eventType = commandType;
   m_clientData = (char *) NULL;
+  m_clientObject = (wxClientData *) NULL;
   m_extraLong = 0;
   m_commandInt = 0;
   m_id = theId;
@@ -134,6 +135,11 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType)
   m_altDown = FALSE;
   m_controlDown = FALSE;
   m_shiftDown = FALSE;
+  m_leftDown = FALSE;
+  m_rightDown = FALSE;
+  m_middleDown = FALSE;
+  m_x = 0;
+  m_y = 0;
 }
 
 // True if was a button dclick event (1 = left, 2 = middle, 3 = right)
@@ -257,7 +263,6 @@ wxKeyEvent::wxKeyEvent(wxEventType type)
 
 wxEvtHandler::wxEvtHandler(void)
 {
-  m_clientData = (char *) NULL;
   m_nextHandler = (wxEvtHandler *) NULL;
   m_previousHandler = (wxEvtHandler *) NULL;
   m_enabled = TRUE;
@@ -365,17 +370,11 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
 {
   int i = 0;
   int commandId = event.GetId();
-  
-  while (table.entries[i].m_fn != 
-#ifdef __SGI_CC__
-								0L
-#else
-								NULL
-#endif
-		)
-  {
-//    wxEventType eventType = (wxEventType) table.entries[i].m_eventType;
 
+  // BC++ doesn't like while (table.entries[i].m_fn)
+
+  while (table.entries[i].m_fn != 0L)
+  {
     if ((event.GetEventType() == table.entries[i].m_eventType) &&
         (table.entries[i].m_id == -1 || // Match, if event spec says any id will do (id == -1)
           (table.entries[i].m_lastId == -1 && commandId == table.entries[i].m_id) ||
@@ -426,8 +425,6 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
   {
     wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
     
-//    wxEventType eventType = (wxEventType) entry->m_eventType;
-  
     if (entry->m_fn)
     {
     if ((event.GetEventType() == entry->m_eventType) &&
@@ -446,7 +443,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
       else
             return TRUE;
        }
-    };
+    }
     node = node->Next();
   }
   return FALSE;