merge with/from trunk at r35190
[blender.git] / intern / ghost / intern / GHOST_EventWheel.h
index 55e9dfb00cffcdaeeddf0082e848d096110e7b8f..5ee9290c2b6b29cdb72b522e37844ca35e952549 100644 (file)
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -25,8 +25,9 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
-/**
- * @file       GHOST_EventWheel.h
+
+/** \file ghost/intern/GHOST_EventWheel.h
+ *  \ingroup GHOSTeel.h
  * Declaration of GHOST_EventWheel class.
  */
 
@@ -58,6 +59,22 @@ public:
                m_data = &m_wheelEventData;
        }
 
+       GHOST_EventWheel(GHOST_TUns64 msec, GHOST_TEventType type, GHOST_IWindow* window, char buf[256])
+               : GHOST_Event(msec, type, window)
+       {
+               int z;
+               sscanf(buf, "wheel: %d", &z);
+               
+               m_wheelEventData.z = z;
+               m_data = &m_wheelEventData;
+       }
+       
+       virtual int serialize(char buf[256])
+       {
+               sprintf(buf, "wheel: %d", m_wheelEventData.z);
+               
+               return 0;
+       }
 protected:
        /** The z-displacement of the mouse wheel. */
        GHOST_TEventWheelData m_wheelEventData;