TouchEvent::OUT renamed to TouchEvent::OUTX to avoid conflicts with winapi

oxygine/src/oxygine/Event.h

@@ -4,8 +4,6 @@
 #include "Input.h"
 #include "closure/closure.h"
 
-#undef OUT
-
 namespace oxygine
 {
     class Event

oxygine/src/oxygine/TouchEvent.h

@@ -1,8 +1,6 @@
 #pragma once
 #include "oxygine-include.h"
 #include "Event.h"
-
-#undef OUT
 namespace oxygine
 {
     class TouchEvent : public Event
@@ -14,7 +12,7 @@ namespace oxygine
 
             CLICK,
             OVER,
-            OUT,
+            OUTX,//OUT, X - avoid conflicts with WinAPI
             MOVE,
             TOUCH_DOWN,
             TOUCH_UP,

oxygine/src/oxygine/actor/Actor.cpp

@@ -329,7 +329,7 @@ namespace oxygine
         _getStage()->removeEventListener(TouchEvent::MOVE, CLOSURE(this, &Actor::_onGlobalTouchMoveEvent));
 
         TouchEvent up = *te;
-        up.type = TouchEvent::OUT;
+        up.type = TouchEvent::OUTX;
         up.bubbles = false;
         up.localPosition = stage2local(te->localPosition, _getStage());
         dispatchEvent(&up);

oxygine/src/oxygine/actor/Button.cpp

@@ -20,7 +20,7 @@ namespace oxygine
         EventCallback ncb = CLOSURE(this, &Button::_mouseEvent);
         addEventListener(TouchEvent::TOUCH_DOWN, ncb);
         addEventListener(TouchEvent::OVER, ncb);
-        addEventListener(TouchEvent::OUT, ncb);
+        addEventListener(TouchEvent::OUTX, ncb);
         addEventListener(TouchEvent::CLICK, ncb);
 
         if (DebugActor::resSystem)
@@ -64,7 +64,7 @@ namespace oxygine
                 }
             }
             break;
-            case TouchEvent::OUT:
+            case TouchEvent::OUTX:
             {
                 if (_btnOvered == me->index)
                 {

oxygine/src/oxygine/oxygine-include.h

@@ -114,7 +114,7 @@ namespace ox = oxygine;
 
 #define OXYGINE_RENDERER 5
 
-#define OXYGINE_VERSION 9
+#define OXYGINE_VERSION 10
 
 #ifdef __GNUC__
 #   define OXYGINE_DEPRECATED __attribute__((deprecated))