X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fcontainer.qh;h=bc2d8e6d0bcce9e991861781e7ff3a76e0f0c760;hb=415aa53e6a5e50a97d95e14f48fb3589f04f64d5;hp=dbb4cf2211c27f2b641c9d017e42fe353cfa512e;hpb=37cf62041a76248472ef6a78feaaed33e35a2260;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item/container.qh b/qcsrc/menu/item/container.qh
index dbb4cf221..bc2d8e6d0 100644
--- 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));