// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// wxWin macros
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
+#if wxUSE_BASE
+ IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
+ IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
+#endif // wxUSE_BASE
#if wxUSE_GUI
IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxSetCursorEvent, 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(wxWindowDestroyEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureChangedEvent, wxEvent)
#endif // wxUSE_GUI
+#if wxUSE_BASE
+
const wxEventTable *wxEvtHandler::GetEventTable() const
{ return &wxEvtHandler::sm_eventTable; }
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)
// System events
DEFINE_EVENT_TYPE(wxEVT_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_SIZING)
DEFINE_EVENT_TYPE(wxEVT_MOVE)
+DEFINE_EVENT_TYPE(wxEVT_MOVING)
DEFINE_EVENT_TYPE(wxEVT_CLOSE_WINDOW)
DEFINE_EVENT_TYPE(wxEVT_END_SESSION)
DEFINE_EVENT_TYPE(wxEVT_QUERY_END_SESSION)
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_POPUP_MENU_INIT)
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)
}
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)
{
- m_eventType = src.m_eventType;
- m_eventObject = src.m_eventObject;
- m_timeStamp = src.m_timeStamp;
- m_id = src.m_id;
- m_skipped = src.m_skipped;
- m_callbackUserData = src.m_callbackUserData;
- m_isCommandEvent = src.m_isCommandEvent;
}
+#endif // wxUSE_BASE
+
#if wxUSE_GUI
/*
*/
wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
- : wxEvent( theId, commandType )
+ : wxEvent(theId, commandType)
{
m_clientData = (char *) NULL;
m_clientObject = (wxClientData *) NULL;
int id,
int pos,
int orient)
- : wxCommandEvent(commandType, id)
+ : wxCommandEvent(commandType, id)
{
m_extraLong = orient;
m_commandInt = pos;
m_linesPerAction = 0;
}
+void wxMouseEvent::Assign(const wxMouseEvent& event)
+{
+ 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)
// or any button dclick event (but = -1)
bool wxMouseEvent::ButtonDClick(int but) const
m_altDown = FALSE;
m_keyCode = 0;
m_scanCode = 0;
+#if wxUSE_UNICODE
+ m_uniChar = 0;
+#endif
}
+wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt)
+ : wxEvent(evt)
+{
+ 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
+}
+
+long wxKeyEvent::KeyCode() const
+{
+ return m_keyCode;
+}
wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
{
// wxEvtHandler
// ----------------------------------------------------------------------------
+#if wxUSE_BASE
+
/*
* Event handler
*/
m_previousHandler = (wxEvtHandler *) NULL;
m_enabled = TRUE;
m_dynamicEvents = (wxList *) NULL;
- m_isWindow = FALSE;
m_pendingEvents = (wxList *) NULL;
#if wxUSE_THREADS
# if !defined(__VISAGECPP__)
if (m_dynamicEvents)
{
- wxNode *node = m_dynamicEvents->First();
+ wxNode *node = m_dynamicEvents->GetFirst();
while (node)
{
#if WXWIN_COMPATIBILITY_EVENT_TYPES
- wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+ wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData();
#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
- wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+ wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
if (entry->m_callbackUserData)
delete entry->m_callbackUserData;
delete entry;
- node = node->Next();
+ node = node->GetNext();
}
delete m_dynamicEvents;
};
# if !defined(__VISAGECPP__)
delete m_eventsLocker;
# endif
+
+ // Remove us from wxPendingEvents if necessary.
+ if(wxPendingEventsLocker)
+ wxENTER_CRIT_SECT(*wxPendingEventsLocker);
+ if ( wxPendingEvents ) {
+ wxPendingEvents->DeleteObject(this);
+ }
+ if(wxPendingEventsLocker)
+ wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
#endif
// we only delete object data, not untyped
{
// 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 ( !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);
wxENTER_CRIT_SECT( *m_eventsLocker);
#endif
- wxNode *node = m_pendingEvents->First();
+ wxNode *node = m_pendingEvents->GetFirst();
while ( node )
{
- wxEvent *event = (wxEvent *)node->Data();
+ wxEvent *event = (wxEvent *)node->GetData();
delete node;
// In ProcessEvent, new events might get added and
wxENTER_CRIT_SECT( *m_eventsLocker);
#endif
- node = m_pendingEvents->First();
+ node = m_pendingEvents->GetFirst();
}
#if defined(__VISAGECPP__)
* Event table stuff
*/
-bool wxEvtHandler::ProcessEvent(wxEvent& event)
+bool wxEvtHandler::TryParent(wxEvent& event)
{
-#if wxUSE_GUI
+ if ( wxTheApp && (this != wxTheApp) )
+ {
+ // Special case: don't pass wxEVT_IDLE to wxApp, since it'll always
+ // swallow it. wxEVT_IDLE is sent explicitly to wxApp so it will be
+ // processed appropriately via SearchEventTable.
+ if ( event.GetEventType() != wxEVT_IDLE )
+ {
+ if ( wxTheApp->ProcessEvent(event) )
+ return TRUE;
+ }
+ }
- // 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 __WXUNIVERSAL__
-# if defined(__WXMSW__)
- info = CLASSINFO(wxWindowMSW);
-# elif defined(__WXGTK__)
- info = CLASSINFO(wxWindowGTK);
-# elif defined(__WXMGL__)
- info = CLASSINFO(wxWindowMGL);
-# elif defined(__WXPM__)
- info = CLASSINFO(wxWindowOS2);
-# elif defined(__WXMAC__)
- info = CLASSINFO(wxWindowMac);
-# elif defined(__WXMOTIF__)
- info = CLASSINFO(wxWindowMotif);
-# endif
-#else
- info = CLASSINFO(wxWindow);
-#endif
+ return FALSE;
+}
- wxASSERT_MSG( m_isWindow == IsKindOf(info),
- wxString(GetClassInfo()->GetClassName()) + _T(" should [not] be a window but it is [not]") );
-#endif
+bool wxEvtHandler::ProcessEvent(wxEvent& event)
+{
+ // 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") );
-#endif // wxUSE_GUI
+ return rc != 0;
+ }
+ //else: proceed normally
+ }
// An event handler can be enabled or disabled
if ( GetEvtHandlerEnabled() )
{
-
-#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
+ // if we have a validator, it has higher priority than our own event
+ // table
+#if wxUSE_VALIDATORS
+ if ( TryValidator(event) )
+ return TRUE;
+#endif // wxUSE_VALIDATORS
// 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.
- // Therefore validators won't be processed if the handler
- // has been replaced with SetEventHandler.
- // 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)
- {
- wxWindow *win = (wxWindow *)this;
-
- // Can only use the validator of the window which
- // is receiving the event
- if ( win == event.GetEventObject() )
- {
- wxValidator *validator = win->GetValidator();
- if ( validator && validator->ProcessEvent(event) )
- {
- return TRUE;
- }
- }
- }
-#endif
-
- // Search upwards through the inheritance hierarchy
- while (table)
+ // Then static per-class event tables (and search upwards through the
+ // inheritance hierarchy)
+ for ( const wxEventTable *table = GetEventTable();
+ table;
+ table = table->baseTable )
{
if ( SearchEventTable((wxEventTable&)*table, event) )
return TRUE;
- table = table->baseTable;
}
}
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 ( m_isWindow && event.IsCommandEvent() )
- {
- wxWindow *win = (wxWindow *)this;
-
- // 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();
- if ( parent && !parent->IsBeingDeleted() )
- return parent->GetEventHandler()->ProcessEvent(event);
- }
- }
-#endif // wxUSE_GUI
-
- // Last try - application object.
- if ( wxTheApp && (this != wxTheApp) )
- {
- // Special case: don't pass wxEVT_IDLE to wxApp, since it'll always
- // swallow it. wxEVT_IDLE is sent explicitly to wxApp so it will be
- // processed appropriately via SearchEventTable.
- if ( event.GetEventType() != wxEVT_IDLE )
- {
- if ( wxTheApp->ProcessEvent(event) )
- return TRUE;
- }
- }
-
- return FALSE;
+ // Finally propagate the event upwards the window chain and/or to the
+ // application object as necessary
+ return TryParent(event);
}
bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
if (!m_dynamicEvents)
m_dynamicEvents = new wxList;
- m_dynamicEvents->Append( (wxObject*) entry );
+ // Insert at the front of the list so most recent additions are found first
+ m_dynamicEvents->Insert( (wxObject*) entry );
}
bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
if (!m_dynamicEvents)
return FALSE;
- wxNode *node = m_dynamicEvents->First();
+ wxNode *node = m_dynamicEvents->GetFirst();
while (node)
{
#if WXWIN_COMPATIBILITY_EVENT_TYPES
- wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+ wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData();
#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
- wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+ wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
if ((entry->m_id == id) &&
delete entry;
return TRUE;
}
- node = node->Next();
+ node = node->GetNext();
}
return FALSE;
}
int commandId = event.GetId();
- wxNode *node = m_dynamicEvents->First();
+ wxNode *node = m_dynamicEvents->GetFirst();
while (node)
{
#if WXWIN_COMPATIBILITY_EVENT_TYPES
- wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+ wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData();
#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
- wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+ wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
if (entry->m_fn)
(this->*((wxEventFunction) (entry->m_fn)))(event);
- if (event.GetSkipped())
- return FALSE;
- else
+ if ( ! event.GetSkipped() )
return TRUE;
}
}
- node = node->Next();
+ node = node->GetNext();
}
return FALSE;
};
}
#endif // WXWIN_COMPATIBILITY
+#endif // wxUSE_BASE
+
#if wxUSE_GUI
// Find a window with the focus, that is also a descendant of the given window.
projects / wxWidgets.git / blobdiff