// 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
#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 !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
- IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
+#if wxUSE_GUI
+ #include "wx/validate.h"
+#endif // wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
+
+#if wxUSE_GUI
IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
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)
+ IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
+#endif // wxUSE_GUI
+
+const wxEventTable *wxEvtHandler::GetEventTable() const
+ { return &wxEvtHandler::sm_eventTable; }
- const wxEventTable *wxEvtHandler::GetEventTable() const
- { return &wxEvtHandler::sm_eventTable; }
+const wxEventTable wxEvtHandler::sm_eventTable =
+ { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
- const wxEventTable wxEvtHandler::sm_eventTable =
- { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
+const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
+ { DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) };
- const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
- { { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } };
+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
-#endif // !USE_SHARED_LIBRARY
+// 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
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+// common event types are defined here, other event types are defined by the
+// components which use them
+
+DEFINE_EVENT_TYPE(wxEVT_NULL)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_MENU_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SLIDER_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RADIOBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RADIOBUTTON_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SCROLLBAR_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_VLBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_COMBOBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_RCLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_ENTER)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRL_UPDATED)
+
+// Sockets and timers send events, too
+DEFINE_EVENT_TYPE(wxEVT_SOCKET)
+DEFINE_EVENT_TYPE(wxEVT_TIMER)
+
+// Mouse event types
+DEFINE_EVENT_TYPE(wxEVT_LEFT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_LEFT_UP)
+DEFINE_EVENT_TYPE(wxEVT_MIDDLE_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_MIDDLE_UP)
+DEFINE_EVENT_TYPE(wxEVT_RIGHT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_RIGHT_UP)
+DEFINE_EVENT_TYPE(wxEVT_MOTION)
+DEFINE_EVENT_TYPE(wxEVT_ENTER_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_LEAVE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_MIDDLE_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_SET_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_KILL_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_MOUSEWHEEL)
+
+// Non-client mouse events
+DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_UP)
+DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_UP)
+DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_UP)
+DEFINE_EVENT_TYPE(wxEVT_NC_MOTION)
+DEFINE_EVENT_TYPE(wxEVT_NC_ENTER_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_NC_LEAVE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_DCLICK)
+
+// Character input event type
+DEFINE_EVENT_TYPE(wxEVT_CHAR)
+DEFINE_EVENT_TYPE(wxEVT_CHAR_HOOK)
+DEFINE_EVENT_TYPE(wxEVT_NAVIGATION_KEY)
+DEFINE_EVENT_TYPE(wxEVT_KEY_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_KEY_UP)
+
+// Set cursor event
+DEFINE_EVENT_TYPE(wxEVT_SET_CURSOR)
+
+// wxScrollbar and wxSlider event identifiers
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_TOP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_BOTTOM)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_LINEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_LINEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE)
+
+// Scroll events from wxWindow
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBTRACK)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBRELEASE)
+
+// System events
+DEFINE_EVENT_TYPE(wxEVT_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_MOVE)
+DEFINE_EVENT_TYPE(wxEVT_CLOSE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_END_SESSION)
+DEFINE_EVENT_TYPE(wxEVT_QUERY_END_SESSION)
+DEFINE_EVENT_TYPE(wxEVT_ACTIVATE_APP)
+DEFINE_EVENT_TYPE(wxEVT_POWER)
+DEFINE_EVENT_TYPE(wxEVT_ACTIVATE)
+DEFINE_EVENT_TYPE(wxEVT_CREATE)
+DEFINE_EVENT_TYPE(wxEVT_DESTROY)
+DEFINE_EVENT_TYPE(wxEVT_SHOW)
+DEFINE_EVENT_TYPE(wxEVT_ICONIZE)
+DEFINE_EVENT_TYPE(wxEVT_MAXIMIZE)
+DEFINE_EVENT_TYPE(wxEVT_MOUSE_CAPTURE_CHANGED)
+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_MENU_CHAR)
+DEFINE_EVENT_TYPE(wxEVT_MENU_INIT)
+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_SETTING_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_QUERY_NEW_PALETTE)
+DEFINE_EVENT_TYPE(wxEVT_PALETTE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_JOY_BUTTON_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_JOY_BUTTON_UP)
+DEFINE_EVENT_TYPE(wxEVT_JOY_MOVE)
+DEFINE_EVENT_TYPE(wxEVT_JOY_ZMOVE)
+DEFINE_EVENT_TYPE(wxEVT_DROP_FILES)
+DEFINE_EVENT_TYPE(wxEVT_DRAW_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_MEASURE_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMPARE_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_INIT_DIALOG)
+DEFINE_EVENT_TYPE(wxEVT_IDLE)
+DEFINE_EVENT_TYPE(wxEVT_UPDATE_UI)
+
+// Generic command events
+// Note: a click is a higher-level event than button down/up
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SET_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_KILL_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_ENTER)
+
+// Help events
+DEFINE_EVENT_TYPE(wxEVT_HELP)
+DEFINE_EVENT_TYPE(wxEVT_DETAILED_HELP)
+
+#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// event initialization
+// ----------------------------------------------------------------------------
+
+int wxNewEventType()
+{
+ // MT-FIXME
+ static int s_lastUsedEventType = wxEVT_FIRST;
+
+#if WXWIN_COMPATIBILITY_2
+ // check that we don't overlap with the user-defined types: if it does
+ // happen, the best solution is probably to update the existing code to
+ // use wxNewEventType() instead of wxEVT_USER_FIRST
+ //
+ // due to the uncertainty
+ wxASSERT_MSG( s_lastUsedEventType < wxEVT_USER_FIRST - 1,
+ _T("possible event type conflict") );
+#endif // WXWIN_COMPATIBILITY_2
+
+ return s_lastUsedEventType++;
+}
+
+// ----------------------------------------------------------------------------
+// wxEvent
+// ----------------------------------------------------------------------------
+
/*
* General wxWindows events, covering
* all interesting things that might happen (button clicking, resizing,
{
m_eventType = wxEVT_NULL;
m_eventObject = (wxObject *) NULL;
- m_eventHandle = (char *) NULL;
m_timeStamp = 0;
m_id = theId;
m_skipped = FALSE;
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;
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;
obj->m_isCommandEvent = m_isCommandEvent;
}
+#if wxUSE_GUI
+
/*
* Command events
*
m_extraLong = 0;
m_commandInt = 0;
m_id = theId;
- m_commandString = (wxChar *) NULL;
+ m_commandString = wxEmptyString;
m_isCommandEvent = TRUE;
}
void wxCommandEvent::CopyObject(wxObject& obj_d) const
{
- wxCommandEvent *obj = (wxCommandEvent *)&obj_d;
+ 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_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();
}
/*
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
*
m_middleDown = FALSE;
m_x = 0;
m_y = 0;
+ m_wheelRotation = 0;
+ m_wheelDelta = 0;
+ m_linesPerAction = 0;
}
void wxMouseEvent::CopyObject(wxObject& obj_d) const
case 3:
return RightDClick();
default:
- wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonDClick"));
+ wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick"));
}
return FALSE;
case 3:
return RightDown();
default:
- wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonDown"));
+ wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown"));
}
return FALSE;
case 3:
return RightUp();
default:
- wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonUp"));
+ wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp"));
}
return FALSE;
{
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:
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;
case 3:
return RightIsDown();
default:
- wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonIsDown"));
+ wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonIsDown"));
}
return FALSE;
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;
#endif
obj->m_canVeto = m_canVeto;
}
-
+
void wxShowEvent::CopyObject(wxObject& obj_d) const
{
wxShowEvent *obj = (wxShowEvent *)&obj_d;
obj->m_buttonChange = m_buttonChange;
obj->m_buttonState = m_buttonState;
obj->m_joyStick = m_joyStick;
-}
+}
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
obj->m_paletteRealized = m_paletteRealized;
}
+wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
+{
+ SetEventType(wxEVT_CREATE);
+ SetEventObject(win);
+}
+
+wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win)
+{
+ SetEventType(wxEVT_DESTROY);
+ 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
*/
m_enabled = TRUE;
m_dynamicEvents = (wxList *) NULL;
m_isWindow = FALSE;
+ m_pendingEvents = (wxList *) NULL;
#if wxUSE_THREADS
- m_eventsLocker = new wxCriticalSection();
+# if !defined(__VISAGECPP__)
+ m_eventsLocker = new wxCriticalSection;
+# endif
#endif
- m_pendingEvents = (wxList *) NULL;
}
wxEvtHandler::~wxEvtHandler()
wxNode *node = m_dynamicEvents->First();
while (node)
{
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
- if (entry->m_callbackUserData) delete entry->m_callbackUserData;
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+
+ if (entry->m_callbackUserData)
+ delete entry->m_callbackUserData;
delete entry;
node = node->Next();
}
delete m_dynamicEvents;
};
-#if wxUSE_THREADS
- if (m_pendingEvents)
- delete m_pendingEvents;
+ delete m_pendingEvents;
+#if wxUSE_THREADS
+# if !defined(__VISAGECPP__)
delete m_eventsLocker;
+# endif
#endif
}
#if wxUSE_THREADS
-#ifdef __WXGTK__
-extern bool g_isIdle;
+bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
+{
+ // check that we are really in a child thread
+ wxASSERT_MSG( !wxThread::IsMain(),
+ wxT("use ProcessEvent() in main thread") );
-extern void wxapp_install_idle_handler();
-#endif
+ AddPendingEvent(event);
-bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
+ return TRUE;
+}
+
+#endif // wxUSE_THREADS
+
+void wxEvtHandler::AddPendingEvent(wxEvent& event)
{
- wxEvent *event_main;
- wxCriticalSectionLocker locker(*m_eventsLocker);
+ // 1) Add event to list of pending events of this event handler
+#if defined(__VISAGECPP__)
+ wxENTER_CRIT_SECT( m_eventsLocker);
+#else
+ wxENTER_CRIT_SECT( *m_eventsLocker);
+#endif
- // check that we are really in a child thread
- wxASSERT( !wxThread::IsMain() );
+ if ( !m_pendingEvents )
+ m_pendingEvents = new wxList;
+
+ wxEvent *event2 = (wxEvent *)event.Clone();
- if (m_pendingEvents == NULL)
- m_pendingEvents = new wxList();
+ m_pendingEvents->Append(event2);
- event_main = (wxEvent *)event.Clone();
+#if defined(__VISAGECPP__)
+ wxLEAVE_CRIT_SECT( m_eventsLocker);
+#else
+ wxLEAVE_CRIT_SECT( *m_eventsLocker);
+#endif
+
+ // 2) Add this event handler to list of event handlers that
+ // have pending events.
- m_pendingEvents->Append(event_main);
+ wxENTER_CRIT_SECT(*wxPendingEventsLocker);
- wxPendingEventsLocker->Enter();
+ if ( !wxPendingEvents )
+ wxPendingEvents = new wxList;
wxPendingEvents->Append(this);
- wxPendingEventsLocker->Leave();
-#ifdef __WXGTK__
- if (g_isIdle) wxapp_install_idle_handler();
-#endif
+ wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
- return TRUE;
+ // 3) Inform the system that new pending events are somwehere,
+ // and that these should be processed in idle time.
+ wxWakeUpIdle();
}
void wxEvtHandler::ProcessPendingEvents()
{
- wxCriticalSectionLocker locker(*m_eventsLocker);
+#if defined(__VISAGECPP__)
+ wxENTER_CRIT_SECT( m_eventsLocker);
+#else
+ wxENTER_CRIT_SECT( *m_eventsLocker);
+#endif
+
wxNode *node = m_pendingEvents->First();
- wxEvent *event;
+ while ( node )
+ {
+ wxEvent *event = (wxEvent *)node->Data();
+ delete node;
- while (node != NULL) {
- event = (wxEvent *)node->Data();
- ProcessEvent(*event);
- delete node;
- node = m_pendingEvents->First();
+ // In ProcessEvent, new events might get added and
+ // we can safely leave the crtical section here.
+#if defined(__VISAGECPP__)
+ wxLEAVE_CRIT_SECT( m_eventsLocker);
+#else
+ wxLEAVE_CRIT_SECT( *m_eventsLocker);
+#endif
+ ProcessEvent(*event);
+ delete event;
+#if defined(__VISAGECPP__)
+ wxENTER_CRIT_SECT( m_eventsLocker);
+#else
+ wxENTER_CRIT_SECT( *m_eventsLocker);
+#endif
+
+ node = m_pendingEvents->First();
}
-}
+
+#if defined(__VISAGECPP__)
+ wxLEAVE_CRIT_SECT( m_eventsLocker);
+#else
+ wxLEAVE_CRIT_SECT( *m_eventsLocker);
#endif
+}
/*
* Event table stuff
bool wxEvtHandler::ProcessEvent(wxEvent& event)
{
+#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
if ( GetEvtHandlerEnabled() )
{
-#if wxUSE_THREADS
- // Check whether we are in a child thread.
- if (!wxThread::IsMain())
+
+#if 0
+/*
+ What is this? When using GUI threads, a non main
+ threads can send an event and process it itself.
+ This breaks GTK's GUI threads, so please explain.
+*/
+
+ // 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
-
const wxEventTable *table = GetEventTable();
+#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.
// 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;
}
}
}
+#endif
// Search upwards through the inheritance hierarchy
- while ( table )
+ while (table)
{
if ( SearchEventTable((wxEventTable&)*table, event) )
return TRUE;
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
if (parent && !parent->IsBeingDeleted())
return parent->GetEventHandler()->ProcessEvent(event);
}
+#endif // wxUSE_GUI
// Last try - application object.
if ( wxTheApp && (this != wxTheApp) )
bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
{
- int i = 0;
- int commandId = event.GetId();
-
- // BC++ doesn't like while (table.entries[i].m_fn)
+ wxEventType eventType = event.GetEventType();
+ int eventId = event.GetId();
-#ifdef __SC__
- while (table.entries[i].m_fn != 0)
+ // BC++ doesn't like testing for m_fn without != 0
+ for ( int i = 0; table.entries[i].m_fn != 0; i++ )
+ {
+ // the line using reference exposes a bug in gcc: although it _seems_
+ // to work, it leads to weird crashes later on during program
+ // execution
+#ifdef __GNUG__
+ wxEventTableEntry entry = table.entries[i];
#else
- while (table.entries[i].m_fn != 0L)
+ const wxEventTableEntry& entry = table.entries[i];
#endif
- {
- if ((event.GetEventType() == table.entries[i].m_eventType) &&
- (table.entries[i].m_id == -1 || // Match, if event spec says any id will do (id == -1)
- (table.entries[i].m_lastId == -1 && commandId == table.entries[i].m_id) ||
- (table.entries[i].m_lastId != -1 &&
- (commandId >= table.entries[i].m_id && commandId <= table.entries[i].m_lastId))))
+
+ // match only if the event type is the same and the id is either -1 in
+ // the event table (meaning "any") or the event id matches the id
+ // specified in the event table either exactly or by falling into
+ // range between first and last
+ if ( eventType == entry.m_eventType )
{
- event.Skip(FALSE);
- event.m_callbackUserData = table.entries[i].m_callbackUserData;
+ int tableId1 = entry.m_id,
+ tableId2 = entry.m_lastId;
- (this->*((wxEventFunction) (table.entries[i].m_fn)))(event);
+ if ( (tableId1 == -1) ||
+ (tableId2 == -1 && eventId == tableId1) ||
+ (tableId2 != -1 &&
+ (eventId >= tableId1 && eventId <= tableId2)) )
+ {
+ event.Skip(FALSE);
+ event.m_callbackUserData = entry.m_callbackUserData;
- if ( event.GetSkipped() )
- return FALSE;
- else
- return TRUE;
+ (this->*((wxEventFunction) (entry.m_fn)))(event);
+
+ return !event.GetSkipped();
+ }
}
- i++;
}
+
return FALSE;
}
+
void wxEvtHandler::Connect( int id, int lastId,
- wxEventType eventType,
+ int eventType,
wxObjectEventFunction func,
wxObject *userData )
{
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
wxEventTableEntry *entry = new wxEventTableEntry;
+ entry->m_eventType = eventType;
entry->m_id = id;
entry->m_lastId = lastId;
- entry->m_eventType = eventType;
entry->m_fn = func;
entry->m_callbackUserData = userData;
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxDynamicEventTableEntry *entry =
+ new wxDynamicEventTableEntry(eventType, id, lastId, func, userData);
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
if (!m_dynamicEvents)
m_dynamicEvents = new wxList;
m_dynamicEvents->Append( (wxObject*) entry );
}
+bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
+ wxObjectEventFunction func,
+ wxObject *userData )
+{
+ if (!m_dynamicEvents)
+ return FALSE;
+
+ wxNode *node = m_dynamicEvents->First();
+ while (node)
+ {
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+
+ if ((entry->m_id == id) &&
+ ((entry->m_lastId == lastId) || (lastId == -1)) &&
+ ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) &&
+ ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) &&
+ ((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL)))
+ {
+ if (entry->m_callbackUserData)
+ delete entry->m_callbackUserData;
+ m_dynamicEvents->DeleteNode( node );
+ delete entry;
+ return TRUE;
+ }
+ node = node->Next();
+ }
+ return FALSE;
+}
+
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();
wxNode *node = m_dynamicEvents->First();
while (node)
{
- wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
if (entry->m_fn)
{
}
#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)
return focusWin;
}
+#endif // wxUSE_GUI
projects / wxWidgets.git / blobdiff