Merge branch 'master' into Mario/duel

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / item / inputcontainer.qh

diff --git a/qcsrc/menu/item/inputcontainer.qh b/qcsrc/menu/item/inputcontainer.qh
index 5d84189fafeb34653d352b98699be757bea5b51f..8ded2e657bcba13f3a7f594c078d6dafceee4043 100644 (file)
--- a/qcsrc/menu/item/inputcontainer.qh
+++ b/qcsrc/menu/item/inputcontainer.qh
@@ -4,13 +4,13 @@
 CLASS(InputContainer, Container)
        METHOD(InputContainer, keyDown, float(entity, float, float, float));
        METHOD(InputContainer, mouseMove, float(entity, vector));
-       METHOD(InputContainer, mousePress, float(entity, vector));
+       METHOD(InputContainer, mousePress, bool(InputContainer this, vector pos));
        METHOD(InputContainer, mouseRelease, float(entity, vector));
        METHOD(InputContainer, mouseDrag, float(entity, vector));
        METHOD(InputContainer, focusLeave, void(entity));
        METHOD(InputContainer, resizeNotify, void(entity, vector, vector, vector, vector));
 
        METHOD(InputContainer, _changeFocusXY, bool(entity this, vector pos));
-       ATTRIB(InputContainer, mouseFocusedChild, entity, NULL)
-       ATTRIB(InputContainer, isTabRoot, float, 0)
+       ATTRIB(InputContainer, mouseFocusedChild, entity);
+       ATTRIB(InputContainer, isTabRoot, float, 0);
 ENDCLASS(InputContainer)