IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
#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(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(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
const wxEventTable *wxEvtHandler::GetEventTable() const
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)
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(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_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
*/
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_id = theId;
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
*/
int id,
int pos,
int orient)
- : wxCommandEvent(commandType, id)
+ : wxCommandEvent(commandType, id)
{
m_extraLong = orient;
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
*
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)
/*
- * Keyboard events
+ * Keyboard event
*
*/
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
- obj->m_canVeto = m_canVeto;
-}
-
-void wxShowEvent::CopyObject(wxObject& obj_d) const
-{
- wxShowEvent *obj = (wxShowEvent *)&obj_d;
- wxEvent::CopyObject(obj_d);
-
- obj->m_show = m_show;
}
-void wxJoystickEvent::CopyObject(wxObject& obj_d) const
+wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt)
+ : wxEvent(evt)
{
- 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;
-}
+ m_x = evt.m_x;
+ m_y = evt.m_y;
-void wxDropFilesEvent::CopyObject(wxObject& obj_d) const
-{
- wxDropFilesEvent *obj = (wxDropFilesEvent *)&obj_d;
- wxEvent::CopyObject(obj_d);
+ m_keyCode = evt.m_keyCode;
- 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.
-}
+ 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;
-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;
+#if wxUSE_UNICODE
+ m_uniChar = evt.m_uniChar;
+#endif
}
-void wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const
+long wxKeyEvent::KeyCode() const
{
- wxQueryNewPaletteEvent *obj = (wxQueryNewPaletteEvent *)&obj_d;
- wxEvent::CopyObject(obj_d);
-
- obj->m_paletteRealized = m_paletteRealized;
+ return m_keyCode;
}
wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *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)
{
m_eventsLocker = new wxCriticalSection;
# endif
#endif
+ // no client data (yet)
+ m_clientData = NULL;
+ m_clientDataType = wxClientData_None;
}
wxEvtHandler::~wxEvtHandler()
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;
};
delete m_eventsLocker;
# endif
#endif
+
+ // we only delete object data, not untyped
+ if ( m_clientDataType == wxClientData_Object )
+ delete m_clientObject;
}
#if wxUSE_THREADS
{
// 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__)
{
#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;
info = CLASSINFO(wxWindowMSW);
# elif defined(__WXGTK__)
info = CLASSINFO(wxWindowGTK);
+# elif defined(__WXX11__)
+ info = CLASSINFO(wxWindowX11);
# elif defined(__WXMGL__)
info = CLASSINFO(wxWindowMGL);
+# elif defined(__WXPM__)
+ info = CLASSINFO(wxWindowOS2);
# elif defined(__WXMAC__)
info = CLASSINFO(wxWindowMac);
# elif defined(__WXMOTIF__)
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
+ // 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() )
{
{
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();
- if (parent && !parent->IsBeingDeleted())
+ if ( parent && !parent->IsBeingDeleted() )
return parent->GetEventHandler()->ProcessEvent(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;
};
+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()
{
projects / wxWidgets.git / blobdiff