Merge branch 'terencehill/obsolete_cvars_removal' into 'master'

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

diff --git a/qcsrc/menu/item/nexposee.qc b/qcsrc/menu/item/nexposee.qc
index 1413039851ee7fcde86e3869d8778c9d2fc72614..06616e68f597f2b4a82f444dbab0f1b291596354 100644 (file)
--- a/qcsrc/menu/item/nexposee.qc
+++ b/qcsrc/menu/item/nexposee.qc
@@ -1,29 +1,30 @@
-#ifdef INTERFACE
-CLASS(Nexposee) EXTENDS(Container)
-       METHOD(Nexposee, draw, void(entity))
-       METHOD(Nexposee, keyDown, float(entity, float, float, float))
-       METHOD(Nexposee, keyUp, float(entity, float, float, float))
-       METHOD(Nexposee, mousePress, float(entity, vector))
-       METHOD(Nexposee, mouseMove, float(entity, vector))
-       METHOD(Nexposee, mouseRelease, float(entity, vector))
-       METHOD(Nexposee, mouseDrag, float(entity, vector))
-       METHOD(Nexposee, resizeNotify, void(entity, vector, vector, vector, vector))
-       METHOD(Nexposee, focusEnter, void(entity))
-       METHOD(Nexposee, close, void(entity))
+#ifndef ITEM_NEXPOSEE_H
+#define ITEM_NEXPOSEE_H
+#include "container.qc"
+CLASS(Nexposee, Container)
+       METHOD(Nexposee, draw, void(entity));
+       METHOD(Nexposee, keyDown, float(entity, float, float, float));
+       METHOD(Nexposee, keyUp, float(entity, float, float, float));
+       METHOD(Nexposee, mousePress, float(entity, vector));
+       METHOD(Nexposee, mouseMove, float(entity, vector));
+       METHOD(Nexposee, mouseRelease, float(entity, vector));
+       METHOD(Nexposee, mouseDrag, float(entity, vector));
+       METHOD(Nexposee, resizeNotify, void(entity, vector, vector, vector, vector));
+       METHOD(Nexposee, focusEnter, void(entity));
+       METHOD(Nexposee, close, void(entity));
 
        ATTRIB(Nexposee, animationState, float, -1)
        ATTRIB(Nexposee, animationFactor, float, 0)
        ATTRIB(Nexposee, selectedChild, entity, NULL)
        ATTRIB(Nexposee, mouseFocusedChild, entity, NULL)
-       METHOD(Nexposee, addItem, void(entity, entity, vector, vector, float))
-       METHOD(Nexposee, calc, void(entity))
-       METHOD(Nexposee, setNexposee, void(entity, entity, vector, float, float))
+       METHOD(Nexposee, addItem, void(entity, entity, vector, vector, float));
+       METHOD(Nexposee, calc, void(entity));
+       METHOD(Nexposee, setNexposee, void(entity, entity, vector, float, float));
        ATTRIB(Nexposee, mousePosition, vector, '0 0 0')
-       METHOD(Nexposee, pullNexposee, void(entity, entity, vector))
+       METHOD(Nexposee, pullNexposee, void(entity, entity, vector));
 ENDCLASS(Nexposee)
 
 void ExposeeCloseButton_Click(entity button, entity other); // un-exposees the current state
-#endif
 
 // animation states:
 //   0 = thumbnails seen
@@ -31,9 +32,6 @@ void ExposeeCloseButton_Click(entity button, entity other); // un-exposees the c
 //   2 = zoomed in
 //   3 = zooming out
 // animation factor: 0 = minimum theSize, 1 = maximum theSize
-
-#ifdef IMPLEMENTATION
-
 .vector Nexposee_initialSize;
 .vector Nexposee_initialFontScale;
 .vector Nexposee_initialOrigin;
@@ -47,6 +45,9 @@ void ExposeeCloseButton_Click(entity button, entity other); // un-exposees the c
 .vector Nexposee_align;
 .float Nexposee_animationFactor;
 
+#endif
+
+#ifdef IMPLEMENTATION
 void Nexposee_close(entity me)
 {
        // user must override this