More _T() in asserts...

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 00c121814f54fc23d18a9c7fc3f1d94ee0674a4f..b7cb5cafaf6e01a7c849a20729f88778dc7dca9b 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -60,6 +60,8 @@
     IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)
 
     const wxEventTable *wxEvtHandler::GetEventTable() const
         { return &wxEvtHandler::sm_eventTable; }
@@ -91,7 +93,6 @@ wxEvent::wxEvent(int theId)
 {
     m_eventType = wxEVT_NULL;
     m_eventObject = (wxObject *) NULL;
-    m_eventHandle = (char *) NULL;
     m_timeStamp = 0;
     m_id = theId;
     m_skipped = FALSE;
@@ -106,7 +107,6 @@ void wxEvent::CopyObject(wxObject& object_dest) const
 
     obj->m_eventType = m_eventType;
     obj->m_eventObject = m_eventObject;
-    obj->m_eventHandle = m_eventHandle;
     obj->m_timeStamp = m_timeStamp;
     obj->m_id = m_id;
     obj->m_skipped = m_skipped;
@@ -164,12 +164,22 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType,
 wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType,
                                    int pos,
                                    int orient)
-             : wxEvent(commandType)
 {
+    m_eventType = commandType;
     m_extraLong = orient;
     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
  *
@@ -467,6 +477,18 @@ void wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const
     obj->m_paletteRealized = m_paletteRealized;
 }
 
+wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
+                   : wxEvent(wxEVT_CREATE)
+{
+    SetEventObject(win);
+}
+
+wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win)
+                    : wxEvent(wxEVT_DESTROY)
+{
+    SetEventObject(win);
+}
+
 /*
  * Event handler
  */
@@ -518,7 +540,6 @@ wxEvtHandler::~wxEvtHandler()
 
 #ifdef __WXGTK__
 extern bool g_isIdle;
-
 extern void wxapp_install_idle_handler();
 #endif
 
@@ -527,7 +548,6 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
     wxEvent *event_main;
     wxCriticalSectionLocker locker(*m_eventsLocker);
 
-
     // check that we are really in a child thread
     wxASSERT( !wxThread::IsMain() );
 
@@ -543,7 +563,8 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
     wxPendingEventsLocker->Leave();
 
 #ifdef __WXGTK__
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 #endif
 
     return TRUE;
@@ -570,26 +591,27 @@ void wxEvtHandler::ProcessPendingEvents()
 
 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)) );
 
-    // An event handler can be enabled or disabled
+    /* An event handler can be enabled or disabled */
     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
-        // Handle per-instance dynamic event tables first
+        /* Handle per-instance dynamic event tables first */
 
         if ( m_dynamicEvents && SearchDynamicEventTable(event) )
             return TRUE;
 
-        // Then static per-class event tables
+        /* Then static per-class event tables */
 
         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.
@@ -598,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.
-        if ( m_isWindow )
+        if (m_isWindow)
         {
             wxWindow *win = (wxWindow *)this;
 
@@ -613,9 +635,10 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
                 }
             }
         }
+#endif
 
         // Search upwards through the inheritance hierarchy
-        while ( table )
+        while (table)
         {
             if ( SearchEventTable((wxEventTable&)*table, event) )
                 return TRUE;