#ifdefed out Ole... functions for Cygwin.

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index c84e70f38c194b5439d31e1fdff53c961052a3ec..de088d74f0d374e3097c915c5418d9e50fd76853 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -370,17 +370,11 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
 {
   int i = 0;
   int commandId = event.GetId();
 {
   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) ||
     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 +425,6 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
   {
     wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
     
   {
     wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
     

-//    wxEventType eventType = (wxEventType) entry->m_eventType;
-  

     if (entry->m_fn)
     {
     if ((event.GetEventType() == entry->m_eventType) &&
     if (entry->m_fn)
     {
     if ((event.GetEventType() == entry->m_eventType) &&


@@ -451,7 +443,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
       else
             return TRUE;
        }
       else
             return TRUE;
        }

-    };
+    }

     node = node->Next();
   }
   return FALSE;
     node = node->Next();
   }
   return FALSE;