// wxWin macros
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
- 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(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
+IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
- const wxEventTable *wxEvtHandler::GetEventTable() const
- { return &wxEvtHandler::sm_eventTable; }
+#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(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(wxNcPaintEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxChildFocusEvent, wxCommandEvent)
+ 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)
+ IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent)
+#endif // wxUSE_GUI
- const wxEventTable wxEvtHandler::sm_eventTable =
- { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
+const wxEventTable *wxEvtHandler::GetEventTable() const
+ { return &wxEvtHandler::sm_eventTable; }
- const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
- { { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } };
+const wxEventTable wxEvtHandler::sm_eventTable =
+ { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
-#endif // !USE_SHARED_LIBRARY
+const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
+ { DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) };
// ----------------------------------------------------------------------------
// global variables
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_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_CHILD_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
// ----------------------------------------------------------------------------
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();
}
/*
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
// or any button up event (but = -1)
bool wxMouseEvent::ButtonUp(int but) const
{
- switch (but) {
+ switch (but)
+ {
case -1:
return (LeftUp() || MiddleUp() || RightUp());
case 1:
// True if the given button is currently changing state
bool wxMouseEvent::Button(int but) const
{
- switch (but) {
+ switch (but)
+ {
case -1:
return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1));
case 1:
bool wxMouseEvent::ButtonIsDown(int but) const
{
- switch (but) {
+ switch (but)
+ {
case -1:
return (LeftIsDown() || MiddleIsDown() || RightIsDown());
case 1:
return FALSE;
}
+int wxMouseEvent::GetButton() const
+{
+ for ( int i = 1; i <= 3; i++ )
+ {
+ if ( Button(i) )
+ {
+ return i;
+ }
+ }
+
+ return -1;
+}
+
// Find the logical position of the event given the DC
wxPoint wxMouseEvent::GetLogicalPosition(const wxDC& dc) 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;
}
wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
- : wxEvent(wxEVT_CREATE)
{
+ SetEventType(wxEVT_CREATE);
SetEventObject(win);
}
wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win)
- : wxEvent(wxEVT_DESTROY)
{
+ SetEventType(wxEVT_DESTROY);
SetEventObject(win);
}
-#endif // wxUSE_GUI
-
void wxIdleEvent::CopyObject(wxObject& obj_d) const
{
wxIdleEvent *obj = (wxIdleEvent *)&obj_d;
obj->m_requestMore = m_requestMore;
}
+wxChildFocusEvent::wxChildFocusEvent(wxWindow *win)
+ : wxCommandEvent(wxEVT_CHILD_FOCUS)
+{
+ SetEventObject(win);
+}
+
+#endif // wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// wxEvtHandler
+// ----------------------------------------------------------------------------
+
/*
* Event handler
*/
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();
}
// 2) Add this event handler to list of event handlers that
// have pending events.
-
+
wxENTER_CRIT_SECT(*wxPendingEventsLocker);
if ( !wxPendingEvents )
// 3) Inform the system that new pending events are somwehere,
// and that these should be processed in idle time.
-
wxWakeUpIdle();
}
{
wxEvent *event = (wxEvent *)node->Data();
delete node;
-
+
// In ProcessEvent, new events might get added and
- // we can safely leave the crtical section here.
+ // we can safely leave the crtical section here.
#if defined(__VISAGECPP__)
wxLEAVE_CRIT_SECT( m_eventsLocker);
#else
#else
wxENTER_CRIT_SECT( *m_eventsLocker);
#endif
-
+
node = m_pendingEvents->First();
}
-
+
#if defined(__VISAGECPP__)
wxLEAVE_CRIT_SECT( m_eventsLocker);
#else
bool wxEvtHandler::ProcessEvent(wxEvent& event)
{
#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)
+#ifdef __WXDEBUG__
// check that our flag corresponds to reality
- wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) );
+ 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(__WXMAC__)
+ info = CLASSINFO(wxWindowMac);
+# elif defined(__WXMOTIF__)
+ info = CLASSINFO(wxWindowMotif);
+# endif
+#else
+ info = CLASSINFO(wxWindow);
+#endif
+
+ wxASSERT_MSG( m_isWindow == IsKindOf(info),
+ _T("this should [not] be a window but it is [not]") );
+#endif
+
#endif // wxUSE_GUI
// An event handler can be enabled or disabled
if ( GetEvtHandlerEnabled() )
{
-#if wxUSE_THREADS
+
+#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 // wxUSE_THREADS
+#endif
// Handle per-instance dynamic event tables first
if ( m_dynamicEvents && SearchDynamicEventTable(event) )
}
#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
+ // 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;
- wxWindow *parent = win->GetParent();
- if (parent && !parent->IsBeingDeleted())
- return parent->GetEventHandler()->ProcessEvent(event);
+
+ // 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() )
+ {
+ wxWindow *parent = win->GetParent();
+ if (parent && !parent->IsBeingDeleted())
+ return parent->GetEventHandler()->ProcessEvent(event);
+ }
}
#endif // wxUSE_GUI
bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
{
- int i = 0;
- int commandId = event.GetId();
+ wxEventType eventType = event.GetEventType();
+ int eventId = event.GetId();
- // BC++ doesn't like while (table.entries[i].m_fn)
-
-#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;
{
if (!m_dynamicEvents)
return FALSE;
-
+
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_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;
+ if (entry->m_callbackUserData)
+ delete entry->m_callbackUserData;
m_dynamicEvents->DeleteNode( node );
delete entry;
return TRUE;
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)
{
projects / wxWidgets.git / blobdiff