Merge branch 'master' into martin-t/dmgtext

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

diff --git a/qcsrc/menu/item/container.qh b/qcsrc/menu/item/container.qh
index dbb4cf2211c27f2b641c9d017e42fe353cfa512e..bc2d8e6d0bcce9e991861781e7ff3a76e0f0c760 100644 (file)
--- a/qcsrc/menu/item/container.qh
+++ b/qcsrc/menu/item/container.qh
@@ -2,12 +2,12 @@
 
 #include <menu/item.qh>
 
-CLASS(Container, Item)
+CLASS(Container, MenuItem)
        METHOD(Container, draw, void(entity));
        METHOD(Container, keyUp, float(entity, float, float, float));
        METHOD(Container, keyDown, float(entity, float, float, float));
        METHOD(Container, mouseMove, float(entity, vector));
-       METHOD(Container, mousePress, float(entity, vector));
+       METHOD(Container, mousePress, bool(Container this, vector pos));
        METHOD(Container, mouseDrag, float(entity, vector));
        METHOD(Container, mouseRelease, float(entity, vector));
        METHOD(Container, focusLeave, void(entity));
@@ -25,12 +25,12 @@ CLASS(Container, Item)
        METHOD(Container, showNotify, void(entity));
        METHOD(Container, hideNotify, void(entity));
        METHOD(Container, preferredFocusedGrandChild, entity(entity));
-       ATTRIB(Container, focusable, float, 0)
-       ATTRIB(Container, firstChild, entity, NULL)
-       ATTRIB(Container, lastChild, entity, NULL)
-       ATTRIB(Container, focusedChild, entity, NULL)
-       ATTRIB(Container, savedFocus, entity, NULL)
-       ATTRIB(Container, shown, float, 0)
+       ATTRIB(Container, focusable, float, 0);
+       ATTRIB(Container, firstChild, entity);
+       ATTRIB(Container, lastChild, entity);
+       ATTRIB(Container, focusedChild, entity);
+       ATTRIB(Container, savedFocus, entity);
+       ATTRIB(Container, shown, float, 0);
 
        METHOD(Container, enterSubitem, void(entity, entity));
        METHOD(Container, enterLieSubitem, void(entity, vector, vector, vector, float));