print session additions

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 3856f917365f60e3175ba15307ddc53228c75449..6e578317e2d91e5fa7c2b776af7fca624c2d3dfb 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -52,9 +52,9 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)

-IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)

 
 #if wxUSE_GUI
 
 #if wxUSE_GUI

+    IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)

     IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)


@@ -77,7 +77,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)

+    IMPLEMENT_DYNAMIC_CLASS(wxSetCursorEvent, wxEvent)

     IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)

+    IMPLEMENT_DYNAMIC_CLASS(wxDisplayChangedEvent, wxEvent)

     IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)


@@ -86,6 +88,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent)

+    IMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureChangedEvent, wxEvent)

 #endif // wxUSE_GUI
 
 const wxEventTable *wxEvtHandler::GetEventTable() const
 #endif // wxUSE_GUI
 
 const wxEventTable *wxEvtHandler::GetEventTable() const


@@ -187,6 +190,7 @@ DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEUP)
 DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEDOWN)
 DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK)
 DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE)
 DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEDOWN)
 DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK)
 DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE)

+DEFINE_EVENT_TYPE(wxEVT_SCROLL_ENDSCROLL)

 
 // Scroll events from wxWindow
 DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP)
 
 // Scroll events from wxWindow
 DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP)


@@ -217,12 +221,12 @@ DEFINE_EVENT_TYPE(wxEVT_PAINT)
 DEFINE_EVENT_TYPE(wxEVT_ERASE_BACKGROUND)
 DEFINE_EVENT_TYPE(wxEVT_NC_PAINT)
 DEFINE_EVENT_TYPE(wxEVT_PAINT_ICON)
 DEFINE_EVENT_TYPE(wxEVT_ERASE_BACKGROUND)
 DEFINE_EVENT_TYPE(wxEVT_NC_PAINT)
 DEFINE_EVENT_TYPE(wxEVT_PAINT_ICON)

-DEFINE_EVENT_TYPE(wxEVT_MENU_CHAR)
-DEFINE_EVENT_TYPE(wxEVT_MENU_INIT)
+DEFINE_EVENT_TYPE(wxEVT_MENU_OPEN)
+DEFINE_EVENT_TYPE(wxEVT_MENU_CLOSE)

 DEFINE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT)
 DEFINE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT)

-DEFINE_EVENT_TYPE(wxEVT_POPUP_MENU_INIT)

 DEFINE_EVENT_TYPE(wxEVT_CONTEXT_MENU)
 DEFINE_EVENT_TYPE(wxEVT_SYS_COLOUR_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_CONTEXT_MENU)
 DEFINE_EVENT_TYPE(wxEVT_SYS_COLOUR_CHANGED)

+DEFINE_EVENT_TYPE(wxEVT_DISPLAY_CHANGED)

 DEFINE_EVENT_TYPE(wxEVT_SETTING_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_QUERY_NEW_PALETTE)
 DEFINE_EVENT_TYPE(wxEVT_PALETTE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_SETTING_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_QUERY_NEW_PALETTE)
 DEFINE_EVENT_TYPE(wxEVT_PALETTE_CHANGED)


@@ -293,9 +297,9 @@ int wxNewEventType()
  *
  */
 
  *
  */
 

-wxEvent::wxEvent(int theId)
+wxEvent::wxEvent(int theId, wxEventType commandType )

 {
 {

-    m_eventType = wxEVT_NULL;
+    m_eventType = commandType;

     m_eventObject = (wxObject *) NULL;
     m_timeStamp = 0;
     m_id = theId;
     m_eventObject = (wxObject *) NULL;
     m_timeStamp = 0;
     m_id = theId;


@@ -304,18 +308,16 @@ wxEvent::wxEvent(int theId)
     m_isCommandEvent = FALSE;
 }
 
     m_isCommandEvent = FALSE;
 }
 

-void wxEvent::CopyObject(wxObject& object_dest) const
+wxEvent::wxEvent(const wxEvent &src)
+    : wxObject()
+    , m_eventObject(src.m_eventObject)
+    , m_eventType(src.m_eventType)
+    , m_timeStamp(src.m_timeStamp)
+    , m_id(src.m_id)
+    , m_callbackUserData(src.m_callbackUserData)
+    , m_skipped(src.m_skipped)
+    , m_isCommandEvent(src.m_isCommandEvent)

 {
 {

-    wxEvent *obj = (wxEvent *)&object_dest;
-    wxObject::CopyObject(object_dest);
-
-    obj->m_eventType = m_eventType;
-    obj->m_eventObject = m_eventObject;
-    obj->m_timeStamp = m_timeStamp;
-    obj->m_id = m_id;
-    obj->m_skipped = m_skipped;
-    obj->m_callbackUserData = m_callbackUserData;
-    obj->m_isCommandEvent = m_isCommandEvent;

 }
 
 #if wxUSE_GUI
 }
 
 #if wxUSE_GUI


@@ -326,43 +328,16 @@ void wxEvent::CopyObject(wxObject& object_dest) const
  */
 
 wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
  */
 
 wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)

+  : wxEvent(theId, commandType)

 {
 {

-    m_eventType = commandType;

     m_clientData = (char *) NULL;
     m_clientObject = (wxClientData *) NULL;
     m_extraLong = 0;
     m_commandInt = 0;
     m_clientData = (char *) NULL;
     m_clientObject = (wxClientData *) NULL;
     m_extraLong = 0;
     m_commandInt = 0;

-    m_id = theId;

     m_commandString = wxEmptyString;
     m_isCommandEvent = TRUE;
 }
 
     m_commandString = wxEmptyString;
     m_isCommandEvent = TRUE;
 }
 

-void wxCommandEvent::CopyObject(wxObject& obj_d) const
-{
-    wxCommandEvent *obj = (wxCommandEvent *)&obj_d;
-
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_clientData    = m_clientData;
-    obj->m_clientObject  = m_clientObject;
-    obj->m_extraLong     = m_extraLong;
-    obj->m_commandInt    = m_commandInt;
-    obj->m_commandString = m_commandString;
-}
-
-/*
- * Notify events
- */
-
-void wxNotifyEvent::CopyObject(wxObject& obj_d) const
-{
-    wxNotifyEvent *obj = (wxNotifyEvent *)&obj_d;
-
-    wxEvent::CopyObject(obj_d);
-
-    if (!m_bAllow) obj->Veto();
-}
-

 /*
  * Scroll events
  */
 /*
  * Scroll events
  */


@@ -371,7 +346,7 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType,
                              int id,
                              int pos,
                              int orient)
                              int id,
                              int pos,
                              int orient)

-             : wxCommandEvent(commandType, id)
+    : wxCommandEvent(commandType, id)

 {
     m_extraLong = orient;
     m_commandInt = pos;
 {
     m_extraLong = orient;
     m_commandInt = pos;


@@ -390,16 +365,6 @@ 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
  *


@@ -422,21 +387,25 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType)
     m_linesPerAction = 0;
 }
 
     m_linesPerAction = 0;
 }
 

-void wxMouseEvent::CopyObject(wxObject& obj_d) const
+void wxMouseEvent::Assign(const wxMouseEvent& event)

 {
 {

-    wxMouseEvent *obj = (wxMouseEvent *)&obj_d;
-
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_metaDown = m_metaDown;
-    obj->m_altDown = m_altDown;
-    obj->m_controlDown = m_controlDown;
-    obj->m_shiftDown = m_shiftDown;
-    obj->m_leftDown = m_leftDown;
-    obj->m_rightDown = m_rightDown;
-    obj->m_middleDown = m_middleDown;
-    obj->m_x = m_x;
-    obj->m_y = m_y;
+    m_eventType = event.m_eventType;
+    
+    m_x = event.m_x;
+    m_y = event.m_y;
+
+    m_leftDown = event.m_leftDown;
+    m_middleDown = event.m_middleDown;
+    m_rightDown = event.m_rightDown;
+
+    m_controlDown = event.m_controlDown;
+    m_shiftDown = event.m_shiftDown;
+    m_altDown = event.m_altDown;
+    m_metaDown = event.m_metaDown;
+
+    m_wheelRotation = event.m_wheelRotation;
+    m_wheelDelta = event.m_wheelDelta;
+    m_linesPerAction = event.m_linesPerAction;

 }
 
 // True if was a button dclick event (1 = left, 2 = middle, 3 = right)
 }
 
 // True if was a button dclick event (1 = left, 2 = middle, 3 = right)


@@ -563,7 +532,7 @@ wxPoint wxMouseEvent::GetLogicalPosition(const wxDC& dc) const
 
 
 /*
 
 
 /*

- * Keyboard events
+ * Keyboard event

  *
  */
 
  *
  */
 


@@ -576,142 +545,32 @@ wxKeyEvent::wxKeyEvent(wxEventType type)
     m_altDown = FALSE;
     m_keyCode = 0;
     m_scanCode = 0;
     m_altDown = FALSE;
     m_keyCode = 0;
     m_scanCode = 0;

-}
-
-void wxKeyEvent::CopyObject(wxObject& obj_d) const
-{
-    wxKeyEvent *obj = (wxKeyEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_x = m_x;
-    obj->m_y = m_y;
-    obj->m_keyCode = m_keyCode;
-
-    obj->m_shiftDown   = m_shiftDown;
-    obj->m_controlDown = m_controlDown;
-    obj->m_metaDown    = m_metaDown;
-    obj->m_altDown     = m_altDown;
-    obj->m_keyCode     = m_keyCode;
-}
-
-
-/*
- * Misc events
- */
-
-void wxSizeEvent::CopyObject(wxObject& obj_d) const
-{
-    wxSizeEvent *obj = (wxSizeEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_size = m_size;
-}
-
-void wxMoveEvent::CopyObject(wxObject& obj_d) const
-{
-    wxMoveEvent *obj = (wxMoveEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_pos = m_pos;
-}
-
-void wxEraseEvent::CopyObject(wxObject& obj_d) const
-{
-    wxEraseEvent *obj = (wxEraseEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_dc = m_dc;
-}
-
-void wxActivateEvent::CopyObject(wxObject& obj_d) const
-{
-    wxActivateEvent *obj = (wxActivateEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_active = m_active;
-}
-
-void wxMenuEvent::CopyObject(wxObject& obj_d) const
-{
-    wxMenuEvent *obj = (wxMenuEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_menuId = m_menuId;
-}
-
-void wxCloseEvent::CopyObject(wxObject& obj_d) const
-{
-    wxCloseEvent *obj = (wxCloseEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_loggingOff = m_loggingOff;
-    obj->m_veto = m_veto;
-#if WXWIN_COMPATIBILITY
-    obj->m_force = m_force;
+#if wxUSE_UNICODE
+    m_uniChar = 0;

 #endif
 #endif

-    obj->m_canVeto = m_canVeto;

 }
 
 }
 

-void wxShowEvent::CopyObject(wxObject& obj_d) const
+wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt) 
+    : wxEvent(evt)

 {
 {

-    wxShowEvent *obj = (wxShowEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_show = m_show;
-}
-
-void wxJoystickEvent::CopyObject(wxObject& obj_d) const
-{
-    wxJoystickEvent *obj = (wxJoystickEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_pos = m_pos;
-    obj->m_zPosition = m_zPosition;
-    obj->m_buttonChange = m_buttonChange;
-    obj->m_buttonState = m_buttonState;
-    obj->m_joyStick = m_joyStick;
-}
-
-void wxDropFilesEvent::CopyObject(wxObject& obj_d) const
-{
-    wxDropFilesEvent *obj = (wxDropFilesEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_noFiles = m_noFiles;
-    obj->m_pos = m_pos;
-    // TODO: Problem with obj->m_files. It should be deallocated by the
-    // destructor of the event.
-}
-
-void wxUpdateUIEvent::CopyObject(wxObject &obj_d) const
-{
-    wxUpdateUIEvent *obj = (wxUpdateUIEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_checked = m_checked;
-    obj->m_enabled = m_enabled;
-    obj->m_text = m_text;
-    obj->m_setText = m_setText;
-    obj->m_setChecked = m_setChecked;
-    obj->m_setEnabled = m_setEnabled;
-}
-
-void wxPaletteChangedEvent::CopyObject(wxObject &obj_d) const
-{
-    wxPaletteChangedEvent *obj = (wxPaletteChangedEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_changedWindow = m_changedWindow;
-}
-
-void wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const
-{
-    wxQueryNewPaletteEvent *obj = (wxQueryNewPaletteEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_paletteRealized = m_paletteRealized;
+    m_x = evt.m_x;
+    m_y = evt.m_y;
+
+    m_keyCode = evt.m_keyCode;
+
+    m_controlDown = evt.m_controlDown;
+    m_shiftDown = evt.m_shiftDown;
+    m_altDown = evt.m_altDown;
+    m_metaDown = evt.m_metaDown;
+    m_scanCode = evt.m_scanCode;
+    m_rawCode = evt.m_rawCode;
+    m_rawFlags = evt.m_rawFlags;
+        
+#if wxUSE_UNICODE
+    m_uniChar = evt.m_uniChar;
+#endif

 }
 }

-
+    

 wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
 {
     SetEventType(wxEVT_CREATE);
 wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
 {
     SetEventType(wxEVT_CREATE);


@@ -724,14 +583,6 @@ wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win)
     SetEventObject(win);
 }
 
     SetEventObject(win);
 }
 

-void wxIdleEvent::CopyObject(wxObject& obj_d) const
-{
-    wxIdleEvent *obj = (wxIdleEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_requestMore = m_requestMore;
-}
-

 wxChildFocusEvent::wxChildFocusEvent(wxWindow *win)
                  : wxCommandEvent(wxEVT_CHILD_FOCUS)
 {
 wxChildFocusEvent::wxChildFocusEvent(wxWindow *win)
                  : wxCommandEvent(wxEVT_CHILD_FOCUS)
 {


@@ -761,6 +612,9 @@ wxEvtHandler::wxEvtHandler()
     m_eventsLocker = new wxCriticalSection;
 #  endif
 #endif
     m_eventsLocker = new wxCriticalSection;
 #  endif
 #endif

+    // no client data (yet)
+    m_clientData = NULL;
+    m_clientDataType = wxClientData_None;

 }
 
 wxEvtHandler::~wxEvtHandler()
 }
 
 wxEvtHandler::~wxEvtHandler()


@@ -798,6 +652,10 @@ wxEvtHandler::~wxEvtHandler()
     delete m_eventsLocker;
 #  endif
 #endif
     delete m_eventsLocker;
 #  endif
 #endif

+
+    // we only delete object data, not untyped
+    if ( m_clientDataType == wxClientData_Object )
+        delete m_clientObject;

 }
 
 #if wxUSE_THREADS
 }
 
 #if wxUSE_THREADS


@@ -819,6 +677,13 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event)
 {
     // 1) Add event to list of pending events of this event handler
 
 {
     // 1) Add event to list of pending events of this event handler
 

+    wxEvent *eventCopy = event.Clone();
+
+    // we must be able to copy the events here so the event class must
+    // implement Clone() properly instead of just providing a NULL stab for it
+    wxCHECK_RET( eventCopy,
+                 _T("events of this type aren't supposed to be posted") );
+

 #if defined(__VISAGECPP__)
     wxENTER_CRIT_SECT( m_eventsLocker);
 #else
 #if defined(__VISAGECPP__)
     wxENTER_CRIT_SECT( m_eventsLocker);
 #else


@@ -828,9 +693,7 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event)
     if ( !m_pendingEvents )
       m_pendingEvents = new wxList;
 
     if ( !m_pendingEvents )
       m_pendingEvents = new wxList;
 

-    wxEvent *event2 = (wxEvent *)event.Clone();
-
-    m_pendingEvents->Append(event2);
+    m_pendingEvents->Append(eventCopy);

 
 #if defined(__VISAGECPP__)
     wxLEAVE_CRIT_SECT( m_eventsLocker);
 
 #if defined(__VISAGECPP__)
     wxLEAVE_CRIT_SECT( m_eventsLocker);


@@ -901,8 +764,8 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
 {
 #if wxUSE_GUI
 
 {
 #if wxUSE_GUI
 

-    // We have to use the actual window or processing events from wxWindowNative
-    // destructor won't work (we don't see the wxWindow class)
+    // We have to use the actual window or processing events from
+    // wxWindowNative destructor won't work (we don't see the wxWindow class)

 #ifdef __WXDEBUG__
     // check that our flag corresponds to reality
     wxClassInfo* info = NULL;
 #ifdef __WXDEBUG__
     // check that our flag corresponds to reality
     wxClassInfo* info = NULL;


@@ -911,8 +774,12 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
     info = CLASSINFO(wxWindowMSW);
 #  elif defined(__WXGTK__)
     info = CLASSINFO(wxWindowGTK);
     info = CLASSINFO(wxWindowMSW);
 #  elif defined(__WXGTK__)
     info = CLASSINFO(wxWindowGTK);

+#  elif defined(__WXX11__)
+    info = CLASSINFO(wxWindowX11);

 #  elif defined(__WXMGL__)
     info = CLASSINFO(wxWindowMGL);
 #  elif defined(__WXMGL__)
     info = CLASSINFO(wxWindowMGL);

+#  elif defined(__WXPM__)
+    info = CLASSINFO(wxWindowOS2);

 #  elif defined(__WXMAC__)
     info = CLASSINFO(wxWindowMac);
 #  elif defined(__WXMOTIF__)
 #  elif defined(__WXMAC__)
     info = CLASSINFO(wxWindowMac);
 #  elif defined(__WXMOTIF__)


@@ -922,12 +789,32 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
     info = CLASSINFO(wxWindow);
 #endif
 
     info = CLASSINFO(wxWindow);
 #endif
 

-    wxASSERT_MSG( m_isWindow == IsKindOf(info),
-                  _T("this should [not] be a window but it is [not]") );
-#endif
+    if ( m_isWindow != IsKindOf(info) )
+    {
+        wxString msg = GetClassInfo()->GetClassName();
+        msg += _T(" should [not] be a window but it is [not]");
+
+        wxFAIL_MSG( msg );
+    }
+
+#endif // __WXDEBUG__

 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 

+    // allow the application to hook into event processing
+    if ( wxTheApp )
+    {
+        int rc = wxTheApp->FilterEvent(event);
+        if ( rc != -1 )
+        {
+            wxASSERT_MSG( rc == 1 || rc == 0,
+                          _T("unexpected wxApp::FilterEvent return value") );
+
+            return rc != 0;
+        }
+        //else: proceed normally
+    }
+

     // An event handler can be enabled or disabled
     if ( GetEvtHandlerEnabled() )
     {
     // An event handler can be enabled or disabled
     if ( GetEvtHandlerEnabled() )
     {


@@ -1001,12 +888,14 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
     {
         wxWindow *win = (wxWindow *)this;
 
     {
         wxWindow *win = (wxWindow *)this;
 

-        // also, don't propagate events beyond the first top level window: it
-        // doesn't make sense to process dialogs events in the parent frame
-        if ( !win->IsTopLevel() )
+        // honour the requests to stop propagation at this window: this is
+        // used by the dialogs, for example, to prevent processing the events
+        // from the dialog controls in the parent frame which rarely, if ever,
+        // makes sense
+        if ( !(win->GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) )

         {
             wxWindow *parent = win->GetParent();
         {
             wxWindow *parent = win->GetParent();

-            if (parent && !parent->IsBeingDeleted())
+            if ( parent && !parent->IsBeingDeleted() )

                 return parent->GetEventHandler()->ProcessEvent(event);
         }
     }
                 return parent->GetEventHandler()->ProcessEvent(event);
         }
     }


@@ -1169,6 +1058,48 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
     return FALSE;
 };
 
     return FALSE;
 };
 

+void wxEvtHandler::DoSetClientObject( wxClientData *data )
+{
+    wxASSERT_MSG( m_clientDataType != wxClientData_Void,
+                  wxT("can't have both object and void client data") );
+
+    if ( m_clientObject )
+        delete m_clientObject;
+
+    m_clientObject = data;
+    m_clientDataType = wxClientData_Object;
+}
+
+wxClientData *wxEvtHandler::DoGetClientObject() const
+{
+    // it's not an error to call GetClientObject() on a window which doesn't
+    // have client data at all - NULL will be returned
+    wxASSERT_MSG( m_clientDataType != wxClientData_Void,
+                  wxT("this window doesn't have object client data") );
+
+    return m_clientObject;
+}
+
+void wxEvtHandler::DoSetClientData( void *data )
+{
+    wxASSERT_MSG( m_clientDataType != wxClientData_Object,
+                  wxT("can't have both object and void client data") );
+
+    m_clientData = data;
+    m_clientDataType = wxClientData_Void;
+}
+
+void *wxEvtHandler::DoGetClientData() const
+{
+    // it's not an error to call GetClientData() on a window which doesn't have
+    // client data at all - NULL will be returned
+    wxASSERT_MSG( m_clientDataType != wxClientData_Object,
+                  wxT("this window doesn't have void client data") );
+
+    return m_clientData;
+}
+
+

 #if WXWIN_COMPATIBILITY
 bool wxEvtHandler::OnClose()
 {
 #if WXWIN_COMPATIBILITY
 bool wxEvtHandler::OnClose()
 {