Merge branch 'master' into martin-t/defaults

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

diff --git a/qcsrc/menu/item.qh b/qcsrc/menu/item.qh
index 118a45426788a044479e882f2961a7ae0ede0605..6cee17b3fdd5f9ccd24a66d078f040aaee9110a2 100644 (file)
--- a/qcsrc/menu/item.qh
+++ b/qcsrc/menu/item.qh
@@ -2,13 +2,15 @@
 
 // convenience
 #include "skin.qh"
+#include "draw.qh"
+#include "menu.qh"
 
 CLASS(Item, Object)
        METHOD(Item, draw, void(Item));
        METHOD(Item, keyDown, float(Item, float, float, float));
        METHOD(Item, keyUp, float(Item, float, float, float));
        METHOD(Item, mouseMove, float(Item, vector));
-       METHOD(Item, mousePress, float(Item, vector));
+       METHOD(Item, mousePress, bool(Item this, vector pos));
        METHOD(Item, mouseDrag, float(Item, vector));
        METHOD(Item, mouseRelease, float(Item, vector));
        METHOD(Item, focusEnter, void(Item));
@@ -19,12 +21,12 @@ CLASS(Item, Object)
        METHOD(Item, hideNotify, void(Item));
        METHOD(Item, toString, string(Item));
        METHOD(Item, destroy, void(Item));
-       ATTRIB(Item, focused, float, 0)
-       ATTRIB(Item, focusable, float, 0)
-       ATTRIB(Item, allowFocusSound, float, 0)
-       ATTRIB(Item, parent, entity, NULL)
-       ATTRIB(Item, preferredFocusPriority, float, 0)
-       ATTRIB(Item, origin, vector, '0 0 0')
-       ATTRIB(Item, size, vector, '0 0 0')
-       ATTRIB(Item, tooltip, string, string_null)
+       ATTRIB(Item, focused, float, 0);
+       ATTRIB(Item, focusable, float, 0);
+       ATTRIB(Item, allowFocusSound, float, 0);
+       ATTRIB(Item, parent, entity);
+       ATTRIB(Item, preferredFocusPriority, float, 0);
+       ATTRIB(Item, origin, vector, '0 0 0');
+       ATTRIB(Item, size, vector, '0 0 0');
+       ATTRIB(Item, tooltip, string);
 ENDCLASS(Item)