isScrolling() in wxScroll[Win]Event

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/event.h b/include/wx/event.h
index 83d7212b5f55fdfb88009d5806b062b2cecab2d3..7e0eb589978e1c88319fb4f3b5d743d65b0c0781 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -482,8 +482,14 @@ public:
 
     int GetOrientation() const { return (int) m_extraLong ; }
     int GetPosition() const { return m_commandInt ; }
 
     int GetOrientation() const { return (int) m_extraLong ; }
     int GetPosition() const { return m_commandInt ; }

+    bool IsScrolling() const { return m_isScrolling; }

     void SetOrientation(int orient) { m_extraLong = (long) orient; }
     void SetPosition(int pos) { m_commandInt = pos; }
     void SetOrientation(int orient) { m_extraLong = (long) orient; }
     void SetPosition(int pos) { m_commandInt = pos; }

+    void SetScrolling(bool isScrolling) { m_isScrolling = isScrolling; }
+
+    void CopyObject(wxObject& obj) const;
+public:
+    bool m_isScrolling;

 };
 
 // ScrollWin event class, derived fom wxEvent. wxScrollWinEvents
 };
 
 // ScrollWin event class, derived fom wxEvent. wxScrollWinEvents


@@ -513,13 +519,16 @@ public:
 
     int GetOrientation() const { return (int) m_extraLong ; }
     int GetPosition() const { return m_commandInt ; }
 
     int GetOrientation() const { return (int) m_extraLong ; }
     int GetPosition() const { return m_commandInt ; }

+    bool IsScrolling() const { return m_isScrolling; }

     void SetOrientation(int orient) { m_extraLong = (long) orient; }
     void SetPosition(int pos) { m_commandInt = pos; }
     void SetOrientation(int orient) { m_extraLong = (long) orient; }
     void SetPosition(int pos) { m_commandInt = pos; }

+    void SetScrolling(bool isScrolling) { m_isScrolling = isScrolling; }

 
     void CopyObject(wxObject& object_dest) const;
 public:
     int               m_commandInt;    // Additional information
     long              m_extraLong;
 
     void CopyObject(wxObject& object_dest) const;
 public:
     int               m_commandInt;    // Additional information
     long              m_extraLong;

+    bool              m_isScrolling;

 };
 
 // Mouse event class
 };
 
 // Mouse event class

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 97f135ff08c874c6106e64ec2802c752be135757..eaf9a7eff90d8013f092c11054b2b69fcf3b6e22 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -205,6 +205,16 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType,
 {
     m_extraLong = orient;
     m_commandInt = pos;
 {
     m_extraLong = orient;
     m_commandInt = pos;

+    m_isScrolling = TRUE;
+}
+
+void wxScrollEvent::CopyObject(wxObject& obj_d) const
+{
+    wxScrollEvent *obj = (wxScrollEvent*)&obj_d;
+
+    wxCommandEvent::CopyObject(obj_d);
+
+    obj->m_isScrolling  = m_isScrolling;

 }
 
 /*
 }
 
 /*


@@ -218,6 +228,7 @@ wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType,
     m_eventType = commandType;
     m_extraLong = orient;
     m_commandInt = pos;
     m_eventType = commandType;
     m_extraLong = orient;
     m_commandInt = pos;

+    m_isScrolling = TRUE;

 }
 
 void wxScrollWinEvent::CopyObject(wxObject& obj_d) const
 }
 
 void wxScrollWinEvent::CopyObject(wxObject& obj_d) const


@@ -228,6 +239,7 @@ void wxScrollWinEvent::CopyObject(wxObject& obj_d) const
 
     obj->m_extraLong    = m_extraLong;
     obj->m_commandInt   = m_commandInt;
 
     obj->m_extraLong    = m_extraLong;
     obj->m_commandInt   = m_commandInt;

+    obj->m_isScrolling  = m_isScrolling;

 }
 
 /*
 }
 
 /*