Merge branch 'master' into DefaultUser/trigger_cleanup

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

diff --git a/qcsrc/menu/item/button.qh b/qcsrc/menu/item/button.qh
index 6fd2bc8882b032c00b924765c8cee27015bdbccb..2077da70071c5b680c55e6ac83b10838b83bf2a4 100644 (file)
--- a/qcsrc/menu/item/button.qh
+++ b/qcsrc/menu/item/button.qh
@@ -9,34 +9,34 @@ CLASS(Button, Label)
        METHOD(Button, showNotify, void(entity));
        METHOD(Button, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(Button, keyDown, float(entity, float, float, float));
-       METHOD(Button, mousePress, float(entity, vector));
+       METHOD(Button, mousePress, bool(Button this, vector pos));
        METHOD(Button, mouseDrag, float(entity, vector));
        METHOD(Button, mouseRelease, float(entity, vector));
        METHOD(Button, playClickSound, void(entity));
-       ATTRIB(Button, onClick, void(entity, entity), func_null)
-       ATTRIB(Button, onClickEntity, entity, NULL)
-       ATTRIB(Button, src, string, string_null)
-       ATTRIB(Button, srcSuffix, string, string_null)
-       ATTRIB(Button, src2, string, string_null) // is centered, same aspect, and stretched to label size
-       ATTRIB(Button, src2scale, float, 1)
-       ATTRIB(Button, srcMulti, float, 1)        // 0: button square left, text right; 1: button stretched, text over it
-       ATTRIB(Button, buttonLeftOfText, float, 0)
-       ATTRIB(Button, focusable, float, 1)
-       ATTRIB(Button, allowFocusSound, float, 1)
-       ATTRIB(Button, pressed, float, 0)
-       ATTRIB(Button, clickTime, float, 0)
-       ATTRIB(Button, applyButton, entity, NULL)
-       ATTRIB(Button, disableOnClick, bool, false)
-       ATTRIB(Button, disabled, float, 0)
-       ATTRIB(Button, disabledAlpha, float, 0.3)
-       ATTRIB(Button, forcePressed, float, 0)
-       ATTRIB(Button, color, vector, '1 1 1')
-       ATTRIB(Button, colorC, vector, '1 1 1')
-       ATTRIB(Button, colorF, vector, '1 1 1')
-       ATTRIB(Button, colorD, vector, '1 1 1')
-       ATTRIB(Button, color2, vector, '1 1 1')
-       ATTRIB(Button, alpha2, float, 1)
+       ATTRIB(Button, onClick, void(entity, entity));
+       ATTRIB(Button, onClickEntity, entity);
+       ATTRIB(Button, src, string);
+       ATTRIB(Button, srcSuffix, string);
+       ATTRIB(Button, src2, string); // is centered, same aspect, and stretched to label size
+       ATTRIB(Button, src2scale, float, 1);
+       ATTRIB(Button, srcMulti, float, 1);        // 0: button square left, text right; 1: button stretched, text over it
+       ATTRIB(Button, buttonLeftOfText, float, 0);
+       ATTRIB(Button, focusable, float, 1);
+       ATTRIB(Button, allowFocusSound, float, 1);
+       ATTRIB(Button, pressed, float, 0);
+       ATTRIB(Button, clickTime, float, 0);
+       ATTRIB(Button, applyButton, entity);
+       ATTRIB(Button, disableOnClick, bool, false);
+       ATTRIB(Button, disabled, float, 0);
+       ATTRIB(Button, disabledAlpha, float, 0.3);
+       ATTRIB(Button, forcePressed, float, 0);
+       ATTRIB(Button, color, vector, '1 1 1');
+       ATTRIB(Button, colorC, vector, '1 1 1');
+       ATTRIB(Button, colorF, vector, '1 1 1');
+       ATTRIB(Button, colorD, vector, '1 1 1');
+       ATTRIB(Button, color2, vector, '1 1 1');
+       ATTRIB(Button, alpha2, float, 1);
 
-       ATTRIB(Button, origin, vector, '0 0 0')
-       ATTRIB(Button, size, vector, '0 0 0')
+       ATTRIB(Button, origin, vector, '0 0 0');
+       ATTRIB(Button, size, vector, '0 0 0');
 ENDCLASS(Button)