From: Guilhem Lavaux Date: Thu, 13 May 1999 15:24:59 +0000 (+0000) Subject: * Some more CopyObject() X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f305c661926d1686aedad884a4ccb311e1cee6be * Some more CopyObject() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/event.h b/include/wx/event.h index 1b5f6c0bfa..bdcc916e04 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -1001,6 +1001,8 @@ public: bool ButtonIsDown(int but = wxJOY_BUTTON_ANY) const { return (((but == wxJOY_BUTTON_ANY) && (m_buttonState != 0)) || ((m_buttonState & but) == but)); } + + void CopyObject(wxObject& obj) const; }; // Drop files event class @@ -1025,6 +1027,8 @@ public: wxPoint GetPosition() const { return m_pos; } int GetNumberOfFiles() const { return m_noFiles; } wxString *GetFiles() const { return m_files; } + + void CopyObject(wxObject& obj) const; }; // Idle event @@ -1043,6 +1047,8 @@ public: void RequestMore(bool needMore = TRUE) { m_requestMore = needMore; } bool MoreRequested() const { return m_requestMore; } + void CopyObject(wxObject& obj) const; + protected: bool m_requestMore; }; @@ -1083,6 +1089,8 @@ public: void Enable(bool enable) { m_enabled = enable; m_setEnabled = TRUE; } void SetText(const wxString& text) { m_text = text; m_setText = TRUE; } + void CopyObject(wxObject& obj) const; + protected: bool m_checked; bool m_enabled; @@ -1124,6 +1132,8 @@ public: void SetChangedWindow(wxWindow* win) { m_changedWindow = win; } wxWindow* GetChangedWindow() const { return m_changedWindow; } + void CopyObject(wxObject& obj) const; + protected: wxWindow* m_changedWindow; }; @@ -1145,6 +1155,8 @@ public: void SetPaletteRealized(bool realized) { m_paletteRealized = realized; } bool GetPaletteRealized() const { return m_paletteRealized; } + void CopyObject(wxObject& obj) const; + protected: bool m_paletteRealized; }; diff --git a/src/common/event.cpp b/src/common/event.cpp index fc2779379a..00c121814f 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -406,7 +406,66 @@ void wxShowEvent::CopyObject(wxObject& obj_d) const 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; +} /* * Event handler