X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e702ff0f08a54622a6b0f1e2ec39537b082c3a8e..5701b057fb4b5bf672da2fb19230d179f7f3e251:/src/common/event.cpp?ds=inline diff --git a/src/common/event.cpp b/src/common/event.cpp index c64449a3a5..b7cb5cafaf 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -37,6 +37,7 @@ 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) @@ -59,6 +60,8 @@ 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) const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; } @@ -67,14 +70,7 @@ { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] }; const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = - { { 0, 0, 0, - #ifdef __SGI_CC__ - // stupid SGI compiler --- offer aug 98 - 0L } - #else // !SGI CC - NULL } - #endif // SGI/!SGI - }; + { { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } }; #endif // !USE_SHARED_LIBRARY @@ -97,7 +93,6 @@ wxEvent::wxEvent(int theId) { m_eventType = wxEVT_NULL; m_eventObject = (wxObject *) NULL; - m_eventHandle = (char *) NULL; m_timeStamp = 0; m_id = theId; m_skipped = FALSE; @@ -105,6 +100,20 @@ wxEvent::wxEvent(int theId) m_isCommandEvent = FALSE; } +void wxEvent::CopyObject(wxObject& object_dest) const +{ + 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; +} + /* * Command events * @@ -118,10 +127,22 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId) m_extraLong = 0; m_commandInt = 0; m_id = theId; - m_commandString = (char *) NULL; + m_commandString = (wxChar *) NULL; 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; +} + /* * Scroll events */ @@ -136,6 +157,28 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType, m_commandInt = pos; } +/* + * ScrollWin events + */ + +wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType, + int pos, + int orient) +{ + 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 @@ -156,6 +199,23 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType) m_y = 0; } +void wxMouseEvent::CopyObject(wxObject& obj_d) const +{ + 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; +} + // 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 @@ -171,7 +231,7 @@ bool wxMouseEvent::ButtonDClick(int but) const case 3: return RightDClick(); default: - wxFAIL_MSG("invalid parameter in wxMouseEvent::ButtonDClick"); + wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonDClick")); } return FALSE; @@ -192,7 +252,7 @@ bool wxMouseEvent::ButtonDown(int but) const case 3: return RightDown(); default: - wxFAIL_MSG("invalid parameter in wxMouseEvent::ButtonDown"); + wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonDown")); } return FALSE; @@ -212,7 +272,7 @@ bool wxMouseEvent::ButtonUp(int but) const case 3: return RightUp(); default: - wxFAIL_MSG("invalid parameter in wxMouseEvent::ButtonUp"); + wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonUp")); } return FALSE; @@ -231,7 +291,7 @@ bool wxMouseEvent::Button(int but) const case 3: return (RightDown() || RightUp() || RightDClick()); default: - wxFAIL_MSG("invalid parameter in wxMouseEvent::Button"); + wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::Button")); } return FALSE; @@ -249,7 +309,7 @@ bool wxMouseEvent::ButtonIsDown(int but) const case 3: return RightIsDown(); default: - wxFAIL_MSG("invalid parameter in wxMouseEvent::ButtonIsDown"); + wxFAIL_MSG(_T("invalid parameter in wxMouseEvent::ButtonIsDown")); } return FALSE; @@ -276,6 +336,157 @@ wxKeyEvent::wxKeyEvent(wxEventType type) m_metaDown = FALSE; 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_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; +#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 +{ + 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; +} + +void wxDropFilesEvent::CopyObject(wxObject& obj_d) const +{ + wxDropFilesEvent *obj = (wxDropFilesEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + 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; +} + +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; +} + +void wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const +{ + wxQueryNewPaletteEvent *obj = (wxQueryNewPaletteEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_paletteRealized = m_paletteRealized; +} + +wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win) + : wxEvent(wxEVT_CREATE) +{ + SetEventObject(win); +} + +wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win) + : wxEvent(wxEVT_DESTROY) +{ + SetEventObject(win); } /* @@ -317,15 +528,21 @@ wxEvtHandler::~wxEvtHandler() delete m_dynamicEvents; }; +#if wxUSE_THREADS if (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; @@ -337,8 +554,7 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event) if (m_pendingEvents == NULL) m_pendingEvents = new wxList(); - event_main = (wxEvent *)event.GetClassInfo()->CreateObject(); - *event_main = event; + event_main = (wxEvent *)event.Clone(); m_pendingEvents->Append(event_main); @@ -346,6 +562,11 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event) wxPendingEvents->Append(this); wxPendingEventsLocker->Leave(); +#ifdef __WXGTK__ + if (g_isIdle) + wxapp_install_idle_handler(); +#endif + return TRUE; } @@ -370,26 +591,27 @@ void wxEvtHandler::ProcessPendingEvents() bool wxEvtHandler::ProcessEvent(wxEvent& event) { - // check that our flag corresponds to reality + /* check that our flag corresponds to reality */ wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) ); - // 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. + /* 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 + /* Then static per-class event tables */ const wxEventTable *table = GetEventTable(); +#if 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. @@ -398,7 +620,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) // 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; @@ -413,9 +635,10 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) } } } +#endif // Search upwards through the inheritance hierarchy - while ( table ) + while (table) { if ( SearchEventTable((wxEventTable&)*table, event) ) return TRUE; @@ -511,7 +734,7 @@ void wxEvtHandler::Connect( int id, int lastId, bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) { wxCHECK_MSG( m_dynamicEvents, FALSE, - "caller should check that we have dynamic events" ); + _T("caller should check that we have dynamic events") ); int commandId = event.GetId();