X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Flabel.qh;h=2439d1d5beafbfa72c206bfe422a25c9135517e3;hb=a4d83c6badb407551c89dfdda9c0f048d0419a2b;hp=428958c20107c0fbf52dfbabe7304ee9b45765bf;hpb=f72821fdcebe3ca01181a99727a06198de65ea08;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item/label.qh b/qcsrc/menu/item/label.qh
index 428958c20..2439d1d5b 100644
--- a/qcsrc/menu/item/label.qh
+++ b/qcsrc/menu/item/label.qh
@@ -1,34 +1,34 @@
 #pragma once
 
 #include "../item.qh"
-CLASS(Label, Item)
+CLASS(Label, MenuItem)
 	METHOD(Label, configureLabel, void(entity, string, float, float));
 	METHOD(Label, draw, void(entity));
 	METHOD(Label, resizeNotify, void(entity, vector, vector, vector, vector));
 	METHOD(Label, setText, void(entity, string));
 	METHOD(Label, toString, string(entity));
 	METHOD(Label, recalcPositionWithText, void(entity, string));
-	ATTRIB(Label, isBold, float, 0)
-	ATTRIB(Label, text, string, string_null)
-	ATTRIB(Label, currentText, string, string_null)
-	ATTRIB(Label, fontSize, float, 8)
-	ATTRIB(Label, align, float, 0.5)
-	ATTRIB(Label, allowCut, float, 0)
-	ATTRIB(Label, allowColors, float, 0)
-	ATTRIB(Label, keepspaceLeft, float, 0) // for use by subclasses (radiobuttons for example)
-	ATTRIB(Label, keepspaceRight, float, 0)
-	ATTRIB(Label, marginLeft, float, 0)    // alternate way to specify keepspace* (in characters from the font)
-	ATTRIB(Label, marginRight, float, 0)
-	ATTRIB(Label, realFontSize, vector, '0 0 0')
-	ATTRIB(Label, realOrigin, vector, '0 0 0')
-	ATTRIB(Label, alpha, float, 0.7)
-	ATTRIB(Label, colorL, vector, SKINCOLOR_TEXT)
-	ATTRIB(Label, disabled, float, 0)
-	ATTRIB(Label, disabledAlpha, float, 0.3)
-	ATTRIB(Label, textEntity, entity, NULL)
-	ATTRIB(Label, allowWrap, float, 0)
-	ATTRIB(Label, recalcPos, float, 0)
-	ATTRIB(Label, condenseFactor, float, 1)
-	ATTRIB(Label, overrideRealOrigin, vector, '0 0 0')
-	ATTRIB(Label, overrideCondenseFactor, float, 0)
+	ATTRIB(Label, isBold, float, 0);
+	ATTRIB(Label, text, string);
+	ATTRIB(Label, currentText, string);
+	ATTRIB(Label, fontSize, float, 8);
+	ATTRIB(Label, align, float, 0.5);
+	ATTRIB(Label, allowCut, float, 0);
+	ATTRIB(Label, allowColors, float, 0);
+	ATTRIB(Label, keepspaceLeft, float, 0); // for use by subclasses (radiobuttons for example);
+	ATTRIB(Label, keepspaceRight, float, 0);
+	ATTRIB(Label, marginLeft, float, 0);    // alternate way to specify keepspace* (in characters from the font);
+	ATTRIB(Label, marginRight, float, 0);
+	ATTRIB(Label, realFontSize, vector, '0 0 0');
+	ATTRIB(Label, realOrigin, vector, '0 0 0');
+	ATTRIB(Label, alpha, float, 0.7);
+	ATTRIB(Label, colorL, vector, SKINCOLOR_TEXT);
+	ATTRIB(Label, disabled, float, 0);
+	ATTRIB(Label, disabledAlpha, float, 0.3);
+	ATTRIB(Label, textEntity, entity);
+	ATTRIB(Label, allowWrap, float, 0);
+	ATTRIB(Label, recalcPos, float, 0);
+	ATTRIB(Label, condenseFactor, float, 1);
+	ATTRIB(Label, overrideRealOrigin, vector, '0 0 0');
+	ATTRIB(Label, overrideCondenseFactor, float, 0);
 ENDCLASS(Label)