X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem.qc;h=6d725259d281ffeb8297902f8c4c62712e54b62f;hb=64c394a1bbc01e778c8ee64caf47f9d9f9a575ac;hp=12132affb4a267baf6124ee9cb7ff73b0321392a;hpb=c741e6b3f012aa525f23e1df30d1d933b383fbc5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item.qc b/qcsrc/menu/item.qc
index 12132affb..6d725259d 100644
--- a/qcsrc/menu/item.qc
+++ b/qcsrc/menu/item.qc
@@ -1,54 +1,28 @@
-#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
-	METHOD(Item, destroy, void(Item this))
+#include "item.qh"
+
+#include "item/container.qh"
+#include "item/borderimage.qh"
+
+	METHOD(MenuItem, destroy, void(MenuItem this))
 	{
 		// free memory associated with this
 	}
 
-	METHOD(Item, relinquishFocus, void(Item this))
+	METHOD(MenuItem, relinquishFocus, void(MenuItem this))
 	{
 		entity par = this.parent;
 		if (!par) return;
 		if (par.instanceOfContainer) par.setFocus(par, NULL);
 	}
 
-	METHOD(Item, resizeNotify, void(Item this, vector relOrigin, vector relSize, vector absOrigin, vector absSize))
+	METHOD(MenuItem, resizeNotify, void(MenuItem this, vector relOrigin, vector relSize, vector absOrigin, vector absSize))
 	{
 		this.origin = absOrigin;
 		this.size = absSize;
 	}
 
 	int autocvar_menu_showboxes;
-	METHOD(Item, draw, void(Item this))
+	METHOD(MenuItem, draw, void(MenuItem this))
 	{
 		if (!autocvar_menu_showboxes) return;
 		vector rgb = '1 0 1';
@@ -79,52 +53,53 @@ ENDCLASS(Item)
 		}
 	}
 
-	METHOD(Item, showNotify, void(Item this))
+	METHOD(MenuItem, showNotify, void(MenuItem this))
 	{}
 
-	METHOD(Item, hideNotify, void(Item this))
+	METHOD(MenuItem, hideNotify, void(MenuItem this))
 	{}
 
-	METHOD(Item, keyDown, float(Item this, float scan, float ascii, float shift))
+	METHOD(MenuItem, keyDown, float(MenuItem this, float scan, float ascii, float shift))
 	{
 		return 0;  // unhandled
 	}
 
-	METHOD(Item, keyUp, float(Item this, float scan, float ascii, float shift))
+	METHOD(MenuItem, keyUp, float(MenuItem this, float scan, float ascii, float shift))
 	{
 		return 0;  // unhandled
 	}
 
-	METHOD(Item, mouseMove, float(Item this, vector pos))
+	METHOD(MenuItem, mouseMove, float(MenuItem this, vector pos))
 	{
 		return 0;  // unhandled
 	}
 
-	METHOD(Item, mousePress, float(Item this, vector pos))
+	METHOD(MenuItem, mousePress, bool(MenuItem this, vector pos))
 	{
-		return 0;  // unhandled
+		return false;  // unhandled
 	}
 
-	METHOD(Item, mouseDrag, float(Item this, vector pos))
+	METHOD(MenuItem, mouseDrag, float(MenuItem this, vector pos))
 	{
 		return 0;  // unhandled
 	}
 
-	METHOD(Item, mouseRelease, float(Item this, vector pos))
+	METHOD(MenuItem, mouseRelease, float(MenuItem this, vector pos))
 	{
 		return 0;  // unhandled
 	}
 
-	METHOD(Item, focusEnter, void(Item this))
+    void m_play_focus_sound();
+
+	METHOD(MenuItem, focusEnter, void(MenuItem this))
 	{
 		if (this.allowFocusSound) m_play_focus_sound();
 	}
 
-	METHOD(Item, focusLeave, void(Item this))
+	METHOD(MenuItem, focusLeave, void(MenuItem this))
 	{}
 
-	METHOD(Item, toString, string(Item this))
+	METHOD(MenuItem, toString, string(MenuItem this))
 	{
 		return string_null;
 	}
-#endif