X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Flistbox.qc;h=aa8487c8bf0c50db25a2c1e45e2dfb976e3a1d9f;hb=42e255d014f2c6a1871177ea511f630624cdfb57;hp=0ab574fa2f1b3869422e5b137d6a49459695580b;hpb=ea48961feb50159e05ef56f38b7fd0ebc15cc64e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/listbox.qc b/qcsrc/menu/xonotic/listbox.qc
index 0ab574fa2..aa8487c8b 100644
--- a/qcsrc/menu/xonotic/listbox.qc
+++ b/qcsrc/menu/xonotic/listbox.qc
@@ -1,27 +1,9 @@
-#ifdef INTERFACE
-CLASS(XonoticListBox) EXTENDS(ListBox)
-	METHOD(XonoticListBox, configureXonoticListBox, void(entity))
-	ATTRIB(XonoticListBox, fontSize, float, SKINFONTSIZE_NORMAL)
-	ATTRIB(XonoticListBox, scrollbarWidth, float, SKINWIDTH_SCROLLBAR)
-	ATTRIB(XonoticListBox, src, string, SKINGFX_SCROLLBAR)
-	ATTRIB(XonoticListBox, tolerance, vector, SKINTOLERANCE_SLIDER)
-	ATTRIB(XonoticListBox, rowsPerItem, float, 1)
-	METHOD(XonoticListBox, resizeNotify, void(entity, vector, vector, vector, vector))
-	ATTRIB(XonoticListBox, color, vector, SKINCOLOR_SCROLLBAR_N)
-	ATTRIB(XonoticListBox, colorF, vector, SKINCOLOR_SCROLLBAR_F)
-	ATTRIB(XonoticListBox, color2, vector, SKINCOLOR_SCROLLBAR_S)
-	ATTRIB(XonoticListBox, colorC, vector, SKINCOLOR_SCROLLBAR_C)
-	ATTRIB(XonoticListBox, colorBG, vector, SKINCOLOR_LISTBOX_BACKGROUND)
-	ATTRIB(XonoticListBox, alphaBG, float, SKINALPHA_LISTBOX_BACKGROUND)
-ENDCLASS(XonoticListBox)
-entity makeXonoticListBox();
-#endif
+#include "listbox.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticListBox()
 {
 	entity me;
-	me = spawnXonoticListBox();
+	me = NEW(XonoticListBox);
 	me.configureXonoticListBox(me);
 	return me;
 }
@@ -34,4 +16,3 @@ void XonoticListBox_resizeNotify(entity me, vector relOrigin, vector relSize, ve
 	me.itemHeight = me.rowsPerItem * me.fontSize / absSize.y;
 	SUPER(XonoticListBox).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 }
-#endif