Prechádzať zdrojové kódy

Removed unimplemented Control::ENTER and Control::LEAVE event types.

seanpaultaylor 12 rokov pred
rodič
commit
56fc1e46ad

+ 0 - 10
gameplay/src/Control.h

@@ -166,16 +166,6 @@ public:
              */
             RIGHT_CLICK     = 0x40,
 
-            /**
-             * Event triggered when a mouse cursor enters a control.
-             */
-            ENTER           = 0x80,
-
-            /**
-             * Event triggered when a mouse cursor leaves a control.
-             */
-            LEAVE           = 0x100,
-
             /**
              * Event triggered when a control gains focus.
              */

+ 0 - 10
gameplay/src/lua/lua_ControlListenerEventType.cpp

@@ -13,8 +13,6 @@ static const char* luaEnumString_ControlListenerEventType_VALUE_CHANGED = "VALUE
 static const char* luaEnumString_ControlListenerEventType_TEXT_CHANGED = "TEXT_CHANGED";
 static const char* luaEnumString_ControlListenerEventType_MIDDLE_CLICK = "MIDDLE_CLICK";
 static const char* luaEnumString_ControlListenerEventType_RIGHT_CLICK = "RIGHT_CLICK";
-static const char* luaEnumString_ControlListenerEventType_ENTER = "ENTER";
-static const char* luaEnumString_ControlListenerEventType_LEAVE = "LEAVE";
 static const char* luaEnumString_ControlListenerEventType_FOCUS_GAINED = "FOCUS_GAINED";
 static const char* luaEnumString_ControlListenerEventType_FOCUS_LOST = "FOCUS_LOST";
 
@@ -34,10 +32,6 @@ Control::Listener::EventType lua_enumFromString_ControlListenerEventType(const c
         return Control::Listener::MIDDLE_CLICK;
     if (strcmp(s, luaEnumString_ControlListenerEventType_RIGHT_CLICK) == 0)
         return Control::Listener::RIGHT_CLICK;
-    if (strcmp(s, luaEnumString_ControlListenerEventType_ENTER) == 0)
-        return Control::Listener::ENTER;
-    if (strcmp(s, luaEnumString_ControlListenerEventType_LEAVE) == 0)
-        return Control::Listener::LEAVE;
     if (strcmp(s, luaEnumString_ControlListenerEventType_FOCUS_GAINED) == 0)
         return Control::Listener::FOCUS_GAINED;
     if (strcmp(s, luaEnumString_ControlListenerEventType_FOCUS_LOST) == 0)
@@ -61,10 +55,6 @@ const char* lua_stringFromEnum_ControlListenerEventType(Control::Listener::Event
         return luaEnumString_ControlListenerEventType_MIDDLE_CLICK;
     if (e == Control::Listener::RIGHT_CLICK)
         return luaEnumString_ControlListenerEventType_RIGHT_CLICK;
-    if (e == Control::Listener::ENTER)
-        return luaEnumString_ControlListenerEventType_ENTER;
-    if (e == Control::Listener::LEAVE)
-        return luaEnumString_ControlListenerEventType_LEAVE;
     if (e == Control::Listener::FOCUS_GAINED)
         return luaEnumString_ControlListenerEventType_FOCUS_GAINED;
     if (e == Control::Listener::FOCUS_LOST)

+ 0 - 2
gameplay/src/lua/lua_Global.cpp

@@ -234,8 +234,6 @@ void luaRegister_lua_Global()
         gameplay::ScriptUtil::registerConstantString("TEXT_CHANGED", "TEXT_CHANGED", scopePath);
         gameplay::ScriptUtil::registerConstantString("MIDDLE_CLICK", "MIDDLE_CLICK", scopePath);
         gameplay::ScriptUtil::registerConstantString("RIGHT_CLICK", "RIGHT_CLICK", scopePath);
-        gameplay::ScriptUtil::registerConstantString("ENTER", "ENTER", scopePath);
-        gameplay::ScriptUtil::registerConstantString("LEAVE", "LEAVE", scopePath);
         gameplay::ScriptUtil::registerConstantString("FOCUS_GAINED", "FOCUS_GAINED", scopePath);
         gameplay::ScriptUtil::registerConstantString("FOCUS_LOST", "FOCUS_LOST", scopePath);
     }