Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added event Clone functions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-11-23 12:37:00 +00:00
parent f1fa9adc7a
commit 41286fd1de
6 changed files with 60 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/include/wx/gizmos/dynamicsash.h
View File

@@ -90,8 +90,11 @@ class wxScrollBar;
class wxDynamicSashSplitEvent : public wxCommandEvent { class wxDynamicSashSplitEvent : public wxCommandEvent {
public: public:
wxDynamicSashSplitEvent(); wxDynamicSashSplitEvent();
wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event): wxCommandEvent(event) { }
wxDynamicSashSplitEvent(wxObject *target); wxDynamicSashSplitEvent(wxObject *target);
virtual wxEvent* Clone() const { return new wxDynamicSashSplitEvent(*this); }
private: private:
DECLARE_DYNAMIC_CLASS(wxDynamicSashSplitEvent) DECLARE_DYNAMIC_CLASS(wxDynamicSashSplitEvent)
}; };
@@ -109,8 +112,11 @@ private:
class wxDynamicSashUnifyEvent : public wxCommandEvent { class wxDynamicSashUnifyEvent : public wxCommandEvent {
public: public:
wxDynamicSashUnifyEvent(); wxDynamicSashUnifyEvent();
wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {}
wxDynamicSashUnifyEvent(wxObject *target); wxDynamicSashUnifyEvent(wxObject *target);
virtual wxEvent* Clone() const { return new wxDynamicSashUnifyEvent(*this); }
private: private:
DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent); DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent);
}; };

4
contrib/include/wx/stc/stc.h
View File

@@ -1641,6 +1641,7 @@ private:
class wxStyledTextEvent : public wxCommandEvent { class wxStyledTextEvent : public wxCommandEvent {
public: public:
wxStyledTextEvent(const wxStyledTextEvent& event);
wxStyledTextEvent(wxEventType commandType=0, int id=0); wxStyledTextEvent(wxEventType commandType=0, int id=0);
~wxStyledTextEvent() {} ~wxStyledTextEvent() {}
@@ -1694,7 +1695,8 @@ public:
bool GetControl() const; bool GetControl() const;
bool GetAlt() const; bool GetAlt() const;
void CopyObject(wxObject& obj) const; // void CopyObject(wxObject& obj) const;
virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
#ifndef SWIG #ifndef SWIG
private: private:

2
contrib/src/gizmos/dynamicsash.cpp
View File

@@ -84,6 +84,8 @@ public:
wxDynamicSashReparentEvent(); wxDynamicSashReparentEvent();
wxDynamicSashReparentEvent(wxObject *object); wxDynamicSashReparentEvent(wxObject *object);
virtual wxEvent* Clone() const { return NULL; }
DECLARE_DYNAMIC_CLASS(wxDynamicSashReparentEvent); DECLARE_DYNAMIC_CLASS(wxDynamicSashReparentEvent);
}; };

47
contrib/src/stc/stc.cpp
View File

@@ -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::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; }
bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; } bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; }
void wxStyledTextEvent::CopyObject(wxObject& obj) const { wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
wxCommandEvent::CopyObject(obj); 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;
wxStyledTextEvent* o = (wxStyledTextEvent*)&obj; m_margin = event.m_margin;
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; m_message = event.m_message;
m_wParam = event.m_wParam;
m_lParam = event.m_lParam;
o->m_message = m_message; m_listType = event.m_listType;
o->m_wParam = m_wParam; m_x = event.m_x;
o->m_lParam = m_lParam; m_y = event.m_y;
o->m_listType = m_listType;
o->m_x = m_x;
o->m_y = m_y;
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
o->m_dragText = m_dragText; m_dragText = event.m_dragText;
o->m_dragAllowMove =m_dragAllowMove; m_dragAllowMove =event.m_dragAllowMove;
o->m_dragResult = m_dragResult; m_dragResult = event.m_dragResult;
#endif #endif
} }

4
include/wx/stc/stc.h
View File

@@ -1641,6 +1641,7 @@ private:
class wxStyledTextEvent : public wxCommandEvent { class wxStyledTextEvent : public wxCommandEvent {
public: public:
wxStyledTextEvent(const wxStyledTextEvent& event);
wxStyledTextEvent(wxEventType commandType=0, int id=0); wxStyledTextEvent(wxEventType commandType=0, int id=0);
~wxStyledTextEvent() {} ~wxStyledTextEvent() {}
@@ -1694,7 +1695,8 @@ public:
bool GetControl() const; bool GetControl() const;
bool GetAlt() const; bool GetAlt() const;
void CopyObject(wxObject& obj) const; // void CopyObject(wxObject& obj) const;
virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
#ifndef SWIG #ifndef SWIG
private: private:

47
src/stc/stc.cpp
View File

@@ -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::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; }
bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; } bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; }
void wxStyledTextEvent::CopyObject(wxObject& obj) const { wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
wxCommandEvent::CopyObject(obj); 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;
wxStyledTextEvent* o = (wxStyledTextEvent*)&obj; m_margin = event.m_margin;
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; m_message = event.m_message;
m_wParam = event.m_wParam;
m_lParam = event.m_lParam;
o->m_message = m_message; m_listType = event.m_listType;
o->m_wParam = m_wParam; m_x = event.m_x;
o->m_lParam = m_lParam; m_y = event.m_y;
o->m_listType = m_listType;
o->m_x = m_x;
o->m_y = m_y;
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
o->m_dragText = m_dragText; m_dragText = event.m_dragText;
o->m_dragAllowMove =m_dragAllowMove; m_dragAllowMove =event.m_dragAllowMove;
o->m_dragResult = m_dragResult; m_dragResult = event.m_dragResult;
#endif #endif
} }