CW Win32 support

[wxWidgets.git] / src / common / event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index dd13024c2349f5eb2d2695b37f1bb107d0a1f253..402ee199c2ee9578d5b14cc34468f11b8090eb75 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -35,6 +35,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
@@ -104,6 +105,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;
@@ -262,7 +264,6 @@ wxKeyEvent::wxKeyEvent(wxEventType type)
 
 wxEvtHandler::wxEvtHandler(void)
 {
-  m_clientData = (char *) NULL;
   m_nextHandler = (wxEvtHandler *) NULL;
   m_previousHandler = (wxEvtHandler *) NULL;
   m_enabled = TRUE;
@@ -370,17 +371,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) ||
@@ -431,8 +426,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) &&
@@ -451,7 +444,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
       else
             return TRUE;
        }
-    };
+    }
     node = node->Next();
   }
   return FALSE;