Merge branch 'master' into terencehill/ft_autorevive_progress

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

diff --git a/qcsrc/menu/xonotic/tabcontroller.qc b/qcsrc/menu/xonotic/tabcontroller.qc
index ec30b9c2d44ea687e32248f27a0ffd14196c07bf..fe6941723a121ac93f56ca9b8af51a2176150cd0 100644 (file)
--- a/qcsrc/menu/xonotic/tabcontroller.qc
+++ b/qcsrc/menu/xonotic/tabcontroller.qc
@@ -1,17 +1,7 @@
-#ifndef TABCONTROLLER_H
-#define TABCONTROLLER_H
-#include "../item/modalcontroller.qc"
-CLASS(XonoticTabController, ModalController)
-       METHOD(XonoticTabController, configureXonoticTabController, void(entity, float));
-       METHOD(XonoticTabController, makeTabButton, entity(entity, string, entity));
-       ATTRIB(XonoticTabController, rows, float, 0)
-       ATTRIB(XonoticTabController, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticTabController, image, string, SKINGFX_BUTTON)
-ENDCLASS(XonoticTabController)
-entity makeXonoticTabController(float theRows);
-#endif
+#include "tabcontroller.qh"
+
+#include "button.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticTabController(float theRows)
 {
        entity me;
@@ -23,14 +13,17 @@ void XonoticTabController_configureXonoticTabController(entity me, float theRows
 {
        me.rows = theRows;
 }
-entity XonoticTabController_makeTabButton(entity me, string theTitle, entity tab)
+entity XonoticTabController_makeTabButton_T(entity me, string theTitle, entity tab, string theTooltip)
 {
        entity b;
        if(me.rows != tab.rows)
                error("Tab dialog height mismatch!");
-       b = makeXonoticButton(theTitle, '0 0 0');
+       b = makeXonoticButton_T(theTitle, '0 0 0', theTooltip);
                me.addTab(me, tab, b);
        // TODO make this real tab buttons (with color parameters, and different gfx)
        return b;
 }
-#endif
+entity XonoticTabController_makeTabButton(entity me, string theTitle, entity tab)
+{
+       return XonoticTabController_makeTabButton_T(me, theTitle, tab, string_null);
+}