summaryrefslogtreecommitdiff
path: root/scene/gui/control.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-08 16:28:12 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-08 16:28:12 -0300
commit920947f297ff3b8d959d15c8e15e7a28dcbdb08f (patch)
tree160ca184a2d8ec1a43238d25e10ef198bdd6b5c8 /scene/gui/control.cpp
parent0a59c3c3a6a8c13a5c82d59d9587fca31f900604 (diff)
renamed _input_event for GUI events to _gui_input, so it's more differentiated than generalized _input
Diffstat (limited to 'scene/gui/control.cpp')
-rw-r--r--scene/gui/control.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 6589dfcef0..abfe11dba0 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -2558,7 +2558,7 @@ void Control::_bind_methods() {
ClassDB::bind_method(_MD("_font_changed"), &Control::_font_changed);
- BIND_VMETHOD(MethodInfo("_input_event",PropertyInfo(Variant::INPUT_EVENT,"event")));
+ BIND_VMETHOD(MethodInfo("_gui_input",PropertyInfo(Variant::INPUT_EVENT,"event")));
BIND_VMETHOD(MethodInfo(Variant::VECTOR2,"get_minimum_size"));
BIND_VMETHOD(MethodInfo(Variant::OBJECT,"get_drag_data",PropertyInfo(Variant::VECTOR2,"pos")));
BIND_VMETHOD(MethodInfo(Variant::BOOL,"can_drop_data",PropertyInfo(Variant::VECTOR2,"pos"),PropertyInfo(Variant::NIL,"data")));
@@ -2636,7 +2636,7 @@ void Control::_bind_methods() {
BIND_CONSTANT( SIZE_EXPAND_FILL );
ADD_SIGNAL( MethodInfo("resized") );
- ADD_SIGNAL( MethodInfo("input_event",PropertyInfo(Variant::INPUT_EVENT,"ev")) );
+ ADD_SIGNAL( MethodInfo("gui_input",PropertyInfo(Variant::INPUT_EVENT,"ev")) );
ADD_SIGNAL( MethodInfo("mouse_enter") );
ADD_SIGNAL( MethodInfo("mouse_exit") );
ADD_SIGNAL( MethodInfo("focus_enter") );