no message

[wxWidgets.git] / src / common / event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 8843bd11c87a9a520629bf027481c1d86df05d01..d770701860cd258000accb22577839687b1e2e3e 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -205,19 +205,6 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType,
 {
     m_extraLong = orient;
     m_commandInt = pos;
-<<<<<<< event.cpp
-    m_isScrolling = TRUE;
-}
-
-void wxScrollEvent::CopyObject(wxObject& obj_d) const
-{
-    wxScrollEvent *obj = (wxScrollEvent*)&obj_d;
-
-    wxCommandEvent::CopyObject(obj_d);
-
-    obj->m_isScrolling  = m_isScrolling;
-=======
->>>>>>> 1.69
 }
 
 /*