Regenerated with tmake to add imagpcx for all platforms.

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 593d1fc13132f0b00c1bfe80260cd0987b27c791..d0e063d025d75db9c5f64f92525b7e837add2992 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -127,7 +127,7 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
     m_extraLong = 0;
     m_commandInt = 0;
     m_id = theId;
     m_extraLong = 0;
     m_commandInt = 0;
     m_id = theId;

-    m_commandString = (wxChar *) NULL;
+    m_commandString = wxEmptyString;

     m_isCommandEvent = TRUE;
 }
 
     m_isCommandEvent = TRUE;
 }
 


@@ -562,6 +562,7 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
     wxPendingEvents->Append(this);
     wxPendingEventsLocker->Leave();
 
     wxPendingEvents->Append(this);
     wxPendingEventsLocker->Leave();
 

+    // TODO: Wake up idle handler for the other platforms.

 #ifdef __WXGTK__
     if (g_isIdle) 
         wxapp_install_idle_handler();
 #ifdef __WXGTK__
     if (g_isIdle) 
         wxapp_install_idle_handler();


@@ -591,26 +592,27 @@ void wxEvtHandler::ProcessPendingEvents()
 
 bool wxEvtHandler::ProcessEvent(wxEvent& event)
 {
 
 bool wxEvtHandler::ProcessEvent(wxEvent& event)
 {

-    // check that our flag corresponds to reality
+    /* check that our flag corresponds to reality */

     wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) );
 
     wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) );
 

-    // An event handler can be enabled or disabled
+    /* An event handler can be enabled or disabled */

     if ( GetEvtHandlerEnabled() )
     {
 #if wxUSE_THREADS
     if ( GetEvtHandlerEnabled() )
     {
 #if wxUSE_THREADS

-       // Check whether we are in a child thread.
+       /* Check whether we are in a child thread. */

         if (!wxThread::IsMain())
           return ProcessThreadEvent(event);
 #endif
         if (!wxThread::IsMain())
           return ProcessThreadEvent(event);
 #endif

-        // Handle per-instance dynamic event tables first
+        /* Handle per-instance dynamic event tables first */

 
         if ( m_dynamicEvents && SearchDynamicEventTable(event) )
             return TRUE;
 
 
         if ( m_dynamicEvents && SearchDynamicEventTable(event) )
             return TRUE;
 

-        // Then static per-class event tables
+        /* Then static per-class event tables */

 
         const wxEventTable *table = GetEventTable();
 
 
         const wxEventTable *table = GetEventTable();
 

+#if wxUSE_VALIDATORS

         // Try the associated validator first, if this is a window.
         // Problem: if the event handler of the window has been replaced,
         // this wxEvtHandler may no longer be a window.
         // Try the associated validator first, if this is a window.
         // Problem: if the event handler of the window has been replaced,
         // this wxEvtHandler may no longer be a window.


@@ -619,7 +621,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
         // THIS CAN BE CURED if PushEventHandler is used instead of
         // SetEventHandler, and then processing will be passed down the
         // chain of event handlers.
         // THIS CAN BE CURED if PushEventHandler is used instead of
         // SetEventHandler, and then processing will be passed down the
         // chain of event handlers.

-        if ( m_isWindow )
+        if (m_isWindow)

         {
             wxWindow *win = (wxWindow *)this;
 
         {
             wxWindow *win = (wxWindow *)this;
 


@@ -634,9 +636,10 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
                 }
             }
         }
                 }
             }
         }

+#endif

 
         // Search upwards through the inheritance hierarchy
 
         // Search upwards through the inheritance hierarchy

-        while ( table )
+        while (table)

         {
             if ( SearchEventTable((wxEventTable&)*table, event) )
                 return TRUE;
         {
             if ( SearchEventTable((wxEventTable&)*table, event) )
                 return TRUE;