X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f439844be27aa4ec09dd1d3365ce44653291c2af..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index d0e063d025..b41f00363a 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -6,9 +6,17 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "event.h" #endif @@ -22,46 +30,60 @@ #ifndef WX_PRECOMP #include "wx/defs.h" - #include "wx/control.h" - #include "wx/utils.h" #include "wx/app.h" - #include "wx/dc.h" + #include "wx/list.h" + + #if wxUSE_GUI + #include "wx/control.h" + #include "wx/utils.h" + #include "wx/dc.h" + #endif // wxUSE_GUI #endif #include "wx/event.h" -#include "wx/validate.h" + +#if wxUSE_GUI + #include "wx/validate.h" +#endif // wxUSE_GUI + +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) - IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent) - IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent) - IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent) - 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) + + #if wxUSE_GUI + IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent) + 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) + #endif // wxUSE_GUI const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; } @@ -74,12 +96,26 @@ #endif // !USE_SHARED_LIBRARY +// ---------------------------------------------------------------------------- +// global variables +// ---------------------------------------------------------------------------- + +// To put pending event handlers +wxList *wxPendingEvents = (wxList *)NULL; + #if wxUSE_THREADS -/* To put pending event handlers */ -extern wxList *wxPendingEvents; -extern wxCriticalSection *wxPendingEventsLocker; + // protects wxPendingEvents list + wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL; #endif +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxEvent +// ---------------------------------------------------------------------------- + /* * General wxWindows events, covering * all interesting things that might happen (button clicking, resizing, @@ -102,7 +138,7 @@ wxEvent::wxEvent(int theId) void wxEvent::CopyObject(wxObject& object_dest) const { - wxEvent *obj = (wxEvent *)&object_dest; + wxEvent *obj = (wxEvent *)&object_dest; wxObject::CopyObject(object_dest); obj->m_eventType = m_eventType; @@ -114,6 +150,8 @@ void wxEvent::CopyObject(wxObject& object_dest) const obj->m_isCommandEvent = m_isCommandEvent; } +#if wxUSE_GUI + /* * Command events * @@ -133,7 +171,7 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId) void wxCommandEvent::CopyObject(wxObject& obj_d) const { - wxCommandEvent *obj = (wxCommandEvent *)&obj_d; + wxCommandEvent *obj = (wxCommandEvent *)&obj_d; wxEvent::CopyObject(obj_d); @@ -172,7 +210,7 @@ wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType, void wxScrollWinEvent::CopyObject(wxObject& obj_d) const { - wxScrollWinEvent *obj = (wxScrollWinEvent*)&obj_d; + wxScrollWinEvent *obj = (wxScrollWinEvent*)&obj_d; wxEvent::CopyObject(obj_d); @@ -231,7 +269,7 @@ bool wxMouseEvent::ButtonDClick(int but) const case 3: return RightDClick(); default: - wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonDClick")); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick")); } return FALSE; @@ -252,7 +290,7 @@ bool wxMouseEvent::ButtonDown(int but) const case 3: return RightDown(); default: - wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonDown")); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown")); } return FALSE; @@ -272,7 +310,7 @@ bool wxMouseEvent::ButtonUp(int but) const case 3: return RightUp(); default: - wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonUp")); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp")); } return FALSE; @@ -283,7 +321,7 @@ bool wxMouseEvent::Button(int but) const { switch (but) { case -1: - return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1)) ; + return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1)); case 1: return (LeftDown() || LeftUp() || LeftDClick()); case 2: @@ -291,7 +329,7 @@ bool wxMouseEvent::Button(int but) const case 3: return (RightDown() || RightUp() || RightDClick()); default: - wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::Button")); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::Button")); } return FALSE; @@ -309,7 +347,7 @@ bool wxMouseEvent::ButtonIsDown(int but) const case 3: return RightIsDown(); default: - wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonIsDown")); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonIsDown")); } return FALSE; @@ -408,7 +446,7 @@ void wxCloseEvent::CopyObject(wxObject& obj_d) const #endif obj->m_canVeto = m_canVeto; } - + void wxShowEvent::CopyObject(wxObject& obj_d) const { wxShowEvent *obj = (wxShowEvent *)&obj_d; @@ -427,7 +465,7 @@ void wxJoystickEvent::CopyObject(wxObject& obj_d) const obj->m_buttonChange = m_buttonChange; obj->m_buttonState = m_buttonState; obj->m_joyStick = m_joyStick; -} +} void wxDropFilesEvent::CopyObject(wxObject& obj_d) const { @@ -437,15 +475,7 @@ void wxDropFilesEvent::CopyObject(wxObject& obj_d) const 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 wxIdleEvent::CopyObject(wxObject& obj_d) const -{ - wxIdleEvent *obj = (wxIdleEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_requestMore = m_requestMore; + // destructor of the event. } void wxUpdateUIEvent::CopyObject(wxObject &obj_d) const @@ -489,6 +519,16 @@ wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win) SetEventObject(win); } +#endif // wxUSE_GUI + +void wxIdleEvent::CopyObject(wxObject& obj_d) const +{ + wxIdleEvent *obj = (wxIdleEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_requestMore = m_requestMore; +} + /* * Event handler */ @@ -500,10 +540,10 @@ wxEvtHandler::wxEvtHandler() m_enabled = TRUE; m_dynamicEvents = (wxList *) NULL; m_isWindow = FALSE; + m_pendingEvents = (wxList *) NULL; #if wxUSE_THREADS - m_eventsLocker = new wxCriticalSection(); + m_eventsLocker = new wxCriticalSection; #endif - m_pendingEvents = (wxList *) NULL; } wxEvtHandler::~wxEvtHandler() @@ -528,63 +568,66 @@ wxEvtHandler::~wxEvtHandler() delete m_dynamicEvents; }; -#if wxUSE_THREADS - if (m_pendingEvents) - delete m_pendingEvents; + delete m_pendingEvents; +#if wxUSE_THREADS delete m_eventsLocker; #endif } #if wxUSE_THREADS -#ifdef __WXGTK__ -extern bool g_isIdle; -extern void wxapp_install_idle_handler(); -#endif - bool wxEvtHandler::ProcessThreadEvent(wxEvent& event) { - wxEvent *event_main; wxCriticalSectionLocker locker(*m_eventsLocker); // check that we are really in a child thread - wxASSERT( !wxThread::IsMain() ); + wxASSERT_MSG( !wxThread::IsMain(), + wxT("use ProcessEvent() in main thread") ); + + AddPendingEvent(event); + + return TRUE; +} + +#endif // wxUSE_THREADS + +void wxEvtHandler::AddPendingEvent(wxEvent& event) +{ + if ( !m_pendingEvents ) + m_pendingEvents = new wxList; - if (m_pendingEvents == NULL) - m_pendingEvents = new wxList(); + wxEvent *event2 = (wxEvent *)event.Clone(); - event_main = (wxEvent *)event.Clone(); + m_pendingEvents->Append(event2); - m_pendingEvents->Append(event_main); + wxENTER_CRIT_SECT(wxPendingEventsLocker); - wxPendingEventsLocker->Enter(); + if ( !wxPendingEvents ) + wxPendingEvents = new wxList; wxPendingEvents->Append(this); - wxPendingEventsLocker->Leave(); - // TODO: Wake up idle handler for the other platforms. -#ifdef __WXGTK__ - if (g_isIdle) - wxapp_install_idle_handler(); -#endif + wxLEAVE_CRIT_SECT(wxPendingEventsLocker); - return TRUE; + wxWakeUpIdle(); } void wxEvtHandler::ProcessPendingEvents() { - wxCriticalSectionLocker locker(*m_eventsLocker); + wxCRIT_SECT_LOCKER(locker, m_eventsLocker); + wxNode *node = m_pendingEvents->First(); wxEvent *event; - while (node != NULL) { - event = (wxEvent *)node->Data(); - ProcessEvent(*event); - delete node; - node = m_pendingEvents->First(); + while ( node ) + { + event = (wxEvent *)node->Data(); + ProcessEvent(*event); + delete event; + delete node; + node = m_pendingEvents->First(); } } -#endif /* * Event table stuff @@ -592,27 +635,28 @@ void wxEvtHandler::ProcessPendingEvents() bool wxEvtHandler::ProcessEvent(wxEvent& event) { - /* check that our flag corresponds to reality */ +#if wxUSE_GUI + // check that our flag corresponds to reality wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) ); +#endif // wxUSE_GUI - /* 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. */ - if (!wxThread::IsMain()) + // Check whether we are in a child thread. + if ( !wxThread::IsMain() ) return ProcessThreadEvent(event); -#endif - /* Handle per-instance dynamic event tables first */ +#endif // wxUSE_THREADS + // 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 +#if wxUSE_GUI && 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. @@ -654,6 +698,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) return TRUE; } +#if wxUSE_GUI // Carry on up the parent-child hierarchy, // but only if event is a command event: it wouldn't // make sense for a parent to receive a child's size event, for example @@ -664,6 +709,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) if (parent && !parent->IsBeingDeleted()) return parent->GetEventHandler()->ProcessEvent(event); } +#endif // wxUSE_GUI // Last try - application object. if ( wxTheApp && (this != wxTheApp) ) @@ -735,7 +781,7 @@ void wxEvtHandler::Connect( int id, int lastId, bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) { wxCHECK_MSG( m_dynamicEvents, FALSE, - _T("caller should check that we have dynamic events") ); + wxT("caller should check that we have dynamic events") ); int commandId = event.GetId(); @@ -779,6 +825,8 @@ bool wxEvtHandler::OnClose() } #endif // WXWIN_COMPATIBILITY +#if wxUSE_GUI + // Find a window with the focus, that is also a descendant of the given window. // This is used to determine the window to initially send commands to. wxWindow* wxFindFocusDescendant(wxWindow* ancestor) @@ -802,3 +850,4 @@ wxWindow* wxFindFocusDescendant(wxWindow* ancestor) return focusWin; } +#endif // wxUSE_GUI