From 41286fd1def19641be3ae5bb9666c84a1c0b5525 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 23 Nov 2001 12:37:00 +0000 Subject: [PATCH] Added event Clone functions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/gizmos/dynamicsash.h | 6 +++ contrib/include/wx/stc/stc.h | 4 +- contrib/src/gizmos/dynamicsash.cpp | 2 + contrib/src/stc/stc.cpp | 53 ++++++++++++------------- include/wx/stc/stc.h | 4 +- src/stc/stc.cpp | 53 ++++++++++++------------- 6 files changed, 66 insertions(+), 56 deletions(-) diff --git a/contrib/include/wx/gizmos/dynamicsash.h b/contrib/include/wx/gizmos/dynamicsash.h index 10b6b94c80..cd4b958ae3 100644 --- a/contrib/include/wx/gizmos/dynamicsash.h +++ b/contrib/include/wx/gizmos/dynamicsash.h @@ -90,8 +90,11 @@ class wxScrollBar; class wxDynamicSashSplitEvent : public wxCommandEvent { public: wxDynamicSashSplitEvent(); + wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event): wxCommandEvent(event) { } wxDynamicSashSplitEvent(wxObject *target); + virtual wxEvent* Clone() const { return new wxDynamicSashSplitEvent(*this); } + private: DECLARE_DYNAMIC_CLASS(wxDynamicSashSplitEvent) }; @@ -109,8 +112,11 @@ private: class wxDynamicSashUnifyEvent : public wxCommandEvent { public: wxDynamicSashUnifyEvent(); + wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {} wxDynamicSashUnifyEvent(wxObject *target); + virtual wxEvent* Clone() const { return new wxDynamicSashUnifyEvent(*this); } + private: DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent); }; diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h index e52252ac7e..9eadfcd66a 100644 --- a/contrib/include/wx/stc/stc.h +++ b/contrib/include/wx/stc/stc.h @@ -1641,6 +1641,7 @@ private: class wxStyledTextEvent : public wxCommandEvent { public: + wxStyledTextEvent(const wxStyledTextEvent& event); wxStyledTextEvent(wxEventType commandType=0, int id=0); ~wxStyledTextEvent() {} @@ -1694,7 +1695,8 @@ public: bool GetControl() const; bool GetAlt() const; - void CopyObject(wxObject& obj) const; +// void CopyObject(wxObject& obj) const; + virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); } #ifndef SWIG private: diff --git a/contrib/src/gizmos/dynamicsash.cpp b/contrib/src/gizmos/dynamicsash.cpp index 3787b4df05..37d37bf15c 100644 --- a/contrib/src/gizmos/dynamicsash.cpp +++ b/contrib/src/gizmos/dynamicsash.cpp @@ -84,6 +84,8 @@ public: wxDynamicSashReparentEvent(); wxDynamicSashReparentEvent(wxObject *object); + virtual wxEvent* Clone() const { return NULL; } + DECLARE_DYNAMIC_CLASS(wxDynamicSashReparentEvent); }; diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp index f56024c0ca..0868e08296 100644 --- a/contrib/src/stc/stc.cpp +++ b/contrib/src/stc/stc.cpp @@ -2064,35 +2064,34 @@ bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0 bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; } bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; } -void wxStyledTextEvent::CopyObject(wxObject& obj) const { - wxCommandEvent::CopyObject(obj); - - wxStyledTextEvent* o = (wxStyledTextEvent*)&obj; - o->m_position = m_position; - o->m_key = m_key; - o->m_modifiers = m_modifiers; - o->m_modificationType = m_modificationType; - o->m_text = m_text; - o->m_length = m_length; - o->m_linesAdded = m_linesAdded; - o->m_line = m_line; - o->m_foldLevelNow = m_foldLevelNow; - o->m_foldLevelPrev = m_foldLevelPrev; - - o->m_margin = m_margin; - - o->m_message = m_message; - o->m_wParam = m_wParam; - o->m_lParam = m_lParam; - - o->m_listType = m_listType; - o->m_x = m_x; - o->m_y = m_y; +wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event): + wxCommandEvent(event) +{ + m_position = event.m_position; + m_key = event.m_key; + m_modifiers = event.m_modifiers; + m_modificationType = event.m_modificationType; + m_text = event.m_text; + m_length = event.m_length; + m_linesAdded = event.m_linesAdded; + m_line = event.m_line; + m_foldLevelNow = event.m_foldLevelNow; + m_foldLevelPrev = event.m_foldLevelPrev; + + m_margin = event.m_margin; + + m_message = event.m_message; + m_wParam = event.m_wParam; + m_lParam = event.m_lParam; + + m_listType = event.m_listType; + m_x = event.m_x; + m_y = event.m_y; #if wxUSE_DRAG_AND_DROP - o->m_dragText = m_dragText; - o->m_dragAllowMove =m_dragAllowMove; - o->m_dragResult = m_dragResult; + m_dragText = event.m_dragText; + m_dragAllowMove =event.m_dragAllowMove; + m_dragResult = event.m_dragResult; #endif } diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index e52252ac7e..9eadfcd66a 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -1641,6 +1641,7 @@ private: class wxStyledTextEvent : public wxCommandEvent { public: + wxStyledTextEvent(const wxStyledTextEvent& event); wxStyledTextEvent(wxEventType commandType=0, int id=0); ~wxStyledTextEvent() {} @@ -1694,7 +1695,8 @@ public: bool GetControl() const; bool GetAlt() const; - void CopyObject(wxObject& obj) const; +// void CopyObject(wxObject& obj) const; + virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); } #ifndef SWIG private: diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp index f56024c0ca..0868e08296 100644 --- a/src/stc/stc.cpp +++ b/src/stc/stc.cpp @@ -2064,35 +2064,34 @@ bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0 bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; } bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; } -void wxStyledTextEvent::CopyObject(wxObject& obj) const { - wxCommandEvent::CopyObject(obj); - - wxStyledTextEvent* o = (wxStyledTextEvent*)&obj; - o->m_position = m_position; - o->m_key = m_key; - o->m_modifiers = m_modifiers; - o->m_modificationType = m_modificationType; - o->m_text = m_text; - o->m_length = m_length; - o->m_linesAdded = m_linesAdded; - o->m_line = m_line; - o->m_foldLevelNow = m_foldLevelNow; - o->m_foldLevelPrev = m_foldLevelPrev; - - o->m_margin = m_margin; - - o->m_message = m_message; - o->m_wParam = m_wParam; - o->m_lParam = m_lParam; - - o->m_listType = m_listType; - o->m_x = m_x; - o->m_y = m_y; +wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event): + wxCommandEvent(event) +{ + m_position = event.m_position; + m_key = event.m_key; + m_modifiers = event.m_modifiers; + m_modificationType = event.m_modificationType; + m_text = event.m_text; + m_length = event.m_length; + m_linesAdded = event.m_linesAdded; + m_line = event.m_line; + m_foldLevelNow = event.m_foldLevelNow; + m_foldLevelPrev = event.m_foldLevelPrev; + + m_margin = event.m_margin; + + m_message = event.m_message; + m_wParam = event.m_wParam; + m_lParam = event.m_lParam; + + m_listType = event.m_listType; + m_x = event.m_x; + m_y = event.m_y; #if wxUSE_DRAG_AND_DROP - o->m_dragText = m_dragText; - o->m_dragAllowMove =m_dragAllowMove; - o->m_dragResult = m_dragResult; + m_dragText = event.m_dragText; + m_dragAllowMove =event.m_dragAllowMove; + m_dragResult = event.m_dragResult; #endif } -- 2.45.2