More _T() in asserts...

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 0c2e5f813cc0188c93e3ead20afe52f33fe2374f..b7cb5cafaf6e01a7c849a20729f88778dc7dca9b 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -170,6 +170,16 @@ wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType,
     m_commandInt = pos;
 }
 
     m_commandInt = pos;
 }
 

+void wxScrollWinEvent::CopyObject(wxObject& obj_d) const
+{
+    wxScrollWinEvent *obj = (wxScrollWinEvent*)&obj_d; 
+
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_extraLong    = m_extraLong;
+    obj->m_commandInt   = m_commandInt;
+}
+

 /*
  * Mouse events
  *
 /*
  * Mouse events
  *


@@ -530,7 +540,6 @@ wxEvtHandler::~wxEvtHandler()
 
 #ifdef __WXGTK__
 extern bool g_isIdle;
 
 #ifdef __WXGTK__
 extern bool g_isIdle;

-

 extern void wxapp_install_idle_handler();
 #endif
 
 extern void wxapp_install_idle_handler();
 #endif
 


@@ -554,7 +563,8 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
     wxPendingEventsLocker->Leave();
 
 #ifdef __WXGTK__
     wxPendingEventsLocker->Leave();
 
 #ifdef __WXGTK__

-//    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();

 #endif
 
     return TRUE;
 #endif
 
     return TRUE;


@@ -581,26 +591,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.


@@ -609,7 +620,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;
 


@@ -624,9 +635,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;