Browse Source

removing deprecated Actor::setInputEnabled | getInputEnabled | getInputChildrenEnabled | setInputChildrenEnabled
"Input" word was replaced with "Touch"

dmuratshin 10 years ago
parent
commit
47fb5b911e

+ 1 - 1
examples/Demo/src/TestAlphaHitTest.h

@@ -27,7 +27,7 @@ public:
 
 
         sprite->addEventListener(TouchEvent::OVER, CLOSURE(this, &TestAlphaHitTest::onEvent));
         sprite->addEventListener(TouchEvent::OVER, CLOSURE(this, &TestAlphaHitTest::onEvent));
         sprite->addEventListener(TouchEvent::OUT, CLOSURE(this, &TestAlphaHitTest::onEvent));
         sprite->addEventListener(TouchEvent::OUT, CLOSURE(this, &TestAlphaHitTest::onEvent));
-        sprite->setInputChildrenEnabled(false);
+        sprite->setTouchChildrenEnabled(false);
 
 
         txt = new TextField;
         txt = new TextField;
         txt->attachTo(content);
         txt->attachTo(content);

+ 2 - 2
examples/Demo/src/TestDrag.h

@@ -51,7 +51,7 @@ public:
         contacts = new Actor;
         contacts = new Actor;
         contacts->attachTo(content);
         contacts->attachTo(content);
         contacts->setPriority(10000);
         contacts->setPriority(10000);
-        contacts->setInputChildrenEnabled(false);
+        contacts->setTouchChildrenEnabled(false);
     }
     }
 
 
     void doUpdate(const UpdateState& us)
     void doUpdate(const UpdateState& us)
@@ -205,7 +205,7 @@ public:
             dragging->attachTo(ball->getParent());
             dragging->attachTo(ball->getParent());
             dragging->setColor(Color::Red);
             dragging->setColor(Color::Red);
             dragging->setAnchor(0, 0);
             dragging->setAnchor(0, 0);
-            dragging->setInputEnabled(false);
+            dragging->setTouchEnabled(false);
             drag.start(touchedBy, dragging.get(), dragging->getSize() / 2);
             drag.start(touchedBy, dragging.get(), dragging->getSize() / 2);
         }
         }
     }
     }

+ 2 - 2
examples/Demo/src/TestInputText.h

@@ -12,8 +12,8 @@ public:
     TextWithBackground(const string& defText)
     TextWithBackground(const string& defText)
     {
     {
         text = new TextField;
         text = new TextField;
-        //Don't handle input events on this Actor
-        text->setInputEnabled(false);
+        //Don't handle touch events on this Actor
+        text->setTouchEnabled(false);
 
 
         TextStyle style;
         TextStyle style;
         style.color = Color::Black;
         style.color = Color::Black;

+ 2 - 2
examples/Demo/src/TestPerf.h

@@ -28,8 +28,8 @@ public:
         toggle dr[] = {toggle("driver=null", 0, new VideoDriverNull), toggle("driver=default", 0, 0)};
         toggle dr[] = {toggle("driver=null", 0, new VideoDriverNull), toggle("driver=default", 0, 0)};
         addToggle("driver", dr, 2);
         addToggle("driver", dr, 2);
 
 
-        content->setInputEnabled(false);
-        content->setInputChildrenEnabled(false);
+        content->setTouchEnabled(false);
+        content->setTouchChildrenEnabled(false);
     }
     }
 
 
     void toggleClicked(string id, const toggle* data)
     void toggleClicked(string id, const toggle* data)

+ 1 - 1
examples/Demo/src/test.cpp

@@ -23,7 +23,7 @@ void Test::init()
     //Load logo from oxygine server
     //Load logo from oxygine server
     spWebImage sp = new WebImage;
     spWebImage sp = new WebImage;
     sp->load("http://oxygine.org/test/logo.png");
     sp->load("http://oxygine.org/test/logo.png");
-    sp->setInputEnabled(false);
+    sp->setTouchEnabled(false);
     sp->attachTo(getStage());
     sp->attachTo(getStage());
     sp->setPriority(10);
     sp->setPriority(10);
     sp->setAlpha(128);
     sp->setAlpha(128);

+ 1 - 1
examples/Match3/src/Board.cpp

@@ -36,7 +36,7 @@ void Board::init(int w, int h)
     _view->setSize(_size.x * JewelSize.x, _size.y * JewelSize.y);
     _view->setSize(_size.x * JewelSize.x, _size.y * JewelSize.y);
 
 
     _view->addEventListener(TouchEvent::TOUCH_DOWN, CLOSURE(this, &Board::touched));
     _view->addEventListener(TouchEvent::TOUCH_DOWN, CLOSURE(this, &Board::touched));
-    _view->setInputChildrenEnabled(false);
+    _view->setTouchChildrenEnabled(false);
 
 
     _view->setCallbackDoUpdate(CLOSURE(this, &Board::update));
     _view->setCallbackDoUpdate(CLOSURE(this, &Board::update));
 }
 }

+ 2 - 2
oxygine/src/Actor.cpp

@@ -1158,8 +1158,8 @@ namespace oxygine
         setAttrV2(node, "size", getSize(), Vector2(0, 0));
         setAttrV2(node, "size", getSize(), Vector2(0, 0));
         setAttr(node, "rotation", getRotation(), 0.0f);
         setAttr(node, "rotation", getRotation(), 0.0f);
         setAttr(node, "visible", getVisible(), true);
         setAttr(node, "visible", getVisible(), true);
-        setAttr(node, "input", getInputEnabled(), true);
-        setAttr(node, "inputch", getInputChildrenEnabled(), true);
+        setAttr(node, "input", getTouchEnabled(), true);
+        setAttr(node, "inputch", getTouchChildrenEnabled(), true);
         setAttr(node, "alpha", getAlpha(), (unsigned char)255);
         setAttr(node, "alpha", getAlpha(), (unsigned char)255);
         setAttrV2(node, "anchor", getAnchor(), Vector2(0, 0));
         setAttrV2(node, "anchor", getAnchor(), Vector2(0, 0));