Merge branch 'master' into DefaultUser/trigger_cleanup

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

diff --git a/qcsrc/menu/item.qc b/qcsrc/menu/item.qc
index 12132affb4a267baf6124ee9cb7ff73b0321392a..a5c7cfa8544c70219099a4a12079b7a87dd5a408 100644 (file)
--- a/qcsrc/menu/item.qc
+++ b/qcsrc/menu/item.qc
@@ -1,34 +1,8 @@
-#ifndef ITEM_H
-#define ITEM_H
-#include "skin.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, mouseDrag, float(Item, vector));
-       METHOD(Item, mouseRelease, float(Item, vector));
-       METHOD(Item, focusEnter, void(Item));
-       METHOD(Item, focusLeave, void(Item));
-       METHOD(Item, resizeNotify, void(Item, vector, vector, vector, vector));
-       METHOD(Item, relinquishFocus, void(Item));
-       METHOD(Item, showNotify, void(Item));
-       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)
-ENDCLASS(Item)
-#endif
-
-#ifdef IMPLEMENTATION
+#include "item.qh"
+
+#include "item/container.qh"
+#include "item/borderimage.qh"
+
        METHOD(Item, destroy, void(Item this))
        {
                // free memory associated with this
@@ -100,9 +74,9 @@ ENDCLASS(Item)
                return 0;  // unhandled
        }
 
-       METHOD(Item, mousePress, float(Item this, vector pos))
+       METHOD(Item, mousePress, bool(Item this, vector pos))
        {
-               return 0;  // unhandled
+               return false;  // unhandled
        }
 
        METHOD(Item, mouseDrag, float(Item this, vector pos))
@@ -115,6 +89,8 @@ ENDCLASS(Item)
                return 0;  // unhandled
        }
 
+    void m_play_focus_sound();
+
        METHOD(Item, focusEnter, void(Item this))
        {
                if (this.allowFocusSound) m_play_focus_sound();
@@ -127,4 +103,3 @@ ENDCLASS(Item)
        {
                return string_null;
        }
-#endif