#include base classes

diff --git a/qcsrc/menu/anim/animation.qc b/qcsrc/menu/anim/animation.qc
index 94df30b37ee686dcb113b075351c343ebcc98e11..3039d85b8daff86bcc48ccac4d5a38b64f7eb864 100644 (file)
--- a/qcsrc/menu/anim/animation.qc
+++ b/qcsrc/menu/anim/animation.qc
@@ -1,5 +1,6 @@
 #ifndef ANIM_ANIMATION_H
 #define ANIM_ANIMATION_H
 #ifndef ANIM_ANIMATION_H
 #define ANIM_ANIMATION_H

+#include "../oo/base.qh"

 void setterDummy(entity, float);
 CLASS(Animation, Object)
        METHOD(Animation, configureAnimation, void(entity, entity, void(entity, float), float, float, float, float))
 void setterDummy(entity, float);
 CLASS(Animation, Object)
        METHOD(Animation, configureAnimation, void(entity, entity, void(entity, float), float, float, float, float))

diff --git a/qcsrc/menu/anim/animhost.qc b/qcsrc/menu/anim/animhost.qc
index fb4961d86f225ce1cc84f46870938393fd3a3ebb..61a040cff96801d4345b5cd27bd12002d6d0382a 100644 (file)
--- a/qcsrc/menu/anim/animhost.qc
+++ b/qcsrc/menu/anim/animhost.qc
@@ -2,6 +2,7 @@
 
 #ifndef ANIM_ANIMHOST_H
 #define ANIM_ANIMHOST_H
 
 #ifndef ANIM_ANIMHOST_H
 #define ANIM_ANIMHOST_H

+#include "../oo/base.qh"

 CLASS(AnimHost, Object)
        METHOD(AnimHost, addAnim, void(entity, entity))
        METHOD(AnimHost, removeAnim, void(entity, entity))
 CLASS(AnimHost, Object)
        METHOD(AnimHost, addAnim, void(entity, entity))
        METHOD(AnimHost, removeAnim, void(entity, entity))

diff --git a/qcsrc/menu/anim/easing.qc b/qcsrc/menu/anim/easing.qc
index f2c3d46e9c905c770c17a322da5b01b203af5b34..fe4c0fb65a9e0cbb1134bcef1300c5069075c698 100644 (file)
--- a/qcsrc/menu/anim/easing.qc
+++ b/qcsrc/menu/anim/easing.qc
@@ -1,5 +1,6 @@
 #ifndef ANIM_EASING_H
 #define ANIM_EASING_H
 #ifndef ANIM_EASING_H
 #define ANIM_EASING_H

+#include "animation.qc"

 entity makeHostedEasing(entity, void(entity, float), float(float, float, float, float), float, float, float);
 entity makeEasing(entity, void(entity, float), float(float, float, float, float), float, float, float, float);
 float easingLinear(float, float, float, float);
 entity makeHostedEasing(entity, void(entity, float), float(float, float, float, float), float, float, float);
 entity makeEasing(entity, void(entity, float), float(float, float, float, float), float, float, float, float);
 float easingLinear(float, float, float, float);

diff --git a/qcsrc/menu/anim/keyframe.qc b/qcsrc/menu/anim/keyframe.qc
index 0e194bf6b32cf9114b328a2f6eb5f866a55c2a09..d310ef72c7093c7eabd56045b7ab7506a5731738 100644 (file)
--- a/qcsrc/menu/anim/keyframe.qc
+++ b/qcsrc/menu/anim/keyframe.qc
@@ -1,5 +1,6 @@
 #ifndef ANIM_KEYFRAME_H
 #define ANIM_KEYFRAME_H
 #ifndef ANIM_KEYFRAME_H
 #define ANIM_KEYFRAME_H

+#include "animation.qc"

 CLASS(Keyframe, Animation)
        METHOD(Keyframe, addEasing, entity(entity, float, float, float(float, float, float, float)))
        METHOD(Keyframe, addAnim, void(entity, entity))
 CLASS(Keyframe, Animation)
        METHOD(Keyframe, addEasing, entity(entity, float, float, float(float, float, float, float)))
        METHOD(Keyframe, addAnim, void(entity, entity))

diff --git a/qcsrc/menu/item.qc b/qcsrc/menu/item.qc
index 62cfa137838fdc2c7dbce4908f27efa37cf71691..cb24866d1ffbe198431b7fc414cb0adf650e2452 100644 (file)
--- a/qcsrc/menu/item.qc
+++ b/qcsrc/menu/item.qc
@@ -1,5 +1,7 @@
 #ifndef ITEM_H
 #define ITEM_H
 #ifndef ITEM_H
 #define ITEM_H

+#include "skin.qh"
+#include "oo/base.qh"

 CLASS(Item, Object)
        METHOD(Item, draw, void(entity))
        METHOD(Item, keyDown, float(entity, float, float, float))
 CLASS(Item, Object)
        METHOD(Item, draw, void(entity))
        METHOD(Item, keyDown, float(entity, float, float, float))

diff --git a/qcsrc/menu/item/button.qc b/qcsrc/menu/item/button.qc
index 8d17f98c68b1eaeb0dcb7fcfa1472c11c7cf9c3b..796ce40a3365374b2e870e2fc630a84f250a6fd6 100644 (file)
--- a/qcsrc/menu/item/button.qc
+++ b/qcsrc/menu/item/button.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_BUTTON_H
 #define ITEM_BUTTON_H
 #ifndef ITEM_BUTTON_H
 #define ITEM_BUTTON_H

+#include "label.qc"

 CLASS(Button, Label)
        METHOD(Button, configureButton, void(entity, string, float, string))
        METHOD(Button, draw, void(entity))
 CLASS(Button, Label)
        METHOD(Button, configureButton, void(entity, string, float, string))
        METHOD(Button, draw, void(entity))

diff --git a/qcsrc/menu/item/checkbox.qc b/qcsrc/menu/item/checkbox.qc
index e220b07666215b717ccf2a569fba545e5c886fdd..e8b4e15e339349ad655af6f866aefccd5eb35796 100644 (file)
--- a/qcsrc/menu/item/checkbox.qc
+++ b/qcsrc/menu/item/checkbox.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_CHECKBOX_H
 #define ITEM_CHECKBOX_H
 #ifndef ITEM_CHECKBOX_H
 #define ITEM_CHECKBOX_H

+#include "button.qc"

 void CheckBox_Click(entity me, entity other);
 CLASS(CheckBox, Button)
        METHOD(CheckBox, configureCheckBox, void(entity, string, float, string))
 void CheckBox_Click(entity me, entity other);
 CLASS(CheckBox, Button)
        METHOD(CheckBox, configureCheckBox, void(entity, string, float, string))

diff --git a/qcsrc/menu/item/container.qc b/qcsrc/menu/item/container.qc
index a5d01bf92af8e33c4d05439788e38f10c99e4462..449bb0675f773f0e683e9133c8751005d567c99a 100644 (file)
--- a/qcsrc/menu/item/container.qc
+++ b/qcsrc/menu/item/container.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_CONTAINER_H
 #define ITEM_CONTAINER_H
 #ifndef ITEM_CONTAINER_H
 #define ITEM_CONTAINER_H

+#include "../item.qc"

 CLASS(Container, Item)
        METHOD(Container, draw, void(entity))
        METHOD(Container, keyUp, float(entity, float, float, float))
 CLASS(Container, Item)
        METHOD(Container, draw, void(entity))
        METHOD(Container, keyUp, float(entity, float, float, float))

diff --git a/qcsrc/menu/item/image.qc b/qcsrc/menu/item/image.qc
index 83e5d427a4122288f4b8229801f60cb31118e146..7756b4991338ff440342a137dc362553230a9723 100644 (file)
--- a/qcsrc/menu/item/image.qc
+++ b/qcsrc/menu/item/image.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_IMAGE_H
 #define ITEM_IMAGE_H
 #ifndef ITEM_IMAGE_H
 #define ITEM_IMAGE_H

+#include "../item.qc"

 CLASS(Image, Item)
        METHOD(Image, configureImage, void(entity, string))
        METHOD(Image, draw, void(entity))
 CLASS(Image, Item)
        METHOD(Image, configureImage, void(entity, string))
        METHOD(Image, draw, void(entity))

diff --git a/qcsrc/menu/item/inputbox.qc b/qcsrc/menu/item/inputbox.qc
index fd6eab1fad459fe662b2840b282f85d4717bae94..5bcfd5f9c0491f4e2a8a36310f74e805ac5f4b72 100644 (file)
--- a/qcsrc/menu/item/inputbox.qc
+++ b/qcsrc/menu/item/inputbox.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_INPUTBOX_H
 #define ITEM_INPUTBOX_H
 #ifndef ITEM_INPUTBOX_H
 #define ITEM_INPUTBOX_H

+#include "label.qc"

 CLASS(InputBox, Label)
        METHOD(InputBox, configureInputBox, void(entity, string, float, float, string))
        METHOD(InputBox, draw, void(entity))
 CLASS(InputBox, Label)
        METHOD(InputBox, configureInputBox, void(entity, string, float, float, string))
        METHOD(InputBox, draw, void(entity))

diff --git a/qcsrc/menu/item/inputcontainer.qc b/qcsrc/menu/item/inputcontainer.qc
index b06e2556513f44d0cded72d0daeb5b0973e59388..90ca719dce9e25326e54a700df5799f7a5a83189 100644 (file)
--- a/qcsrc/menu/item/inputcontainer.qc
+++ b/qcsrc/menu/item/inputcontainer.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_INPUTCONTAINER_H
 #define ITEM_INPUTCONTAINER_H
 #ifndef ITEM_INPUTCONTAINER_H
 #define ITEM_INPUTCONTAINER_H

+#include "container.qc"

 CLASS(InputContainer, Container)
        METHOD(InputContainer, keyDown, float(entity, float, float, float))
        METHOD(InputContainer, mouseMove, float(entity, vector))
 CLASS(InputContainer, Container)
        METHOD(InputContainer, keyDown, float(entity, float, float, float))
        METHOD(InputContainer, mouseMove, float(entity, vector))

diff --git a/qcsrc/menu/item/label.qc b/qcsrc/menu/item/label.qc
index 751e5c72729030e729e1641df4b09184593ab668..75e79f0b228394e3d5da4c0c377992e9a1e12b4b 100644 (file)
--- a/qcsrc/menu/item/label.qc
+++ b/qcsrc/menu/item/label.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_LABEL_H
 #define ITEM_LABEL_H
 #ifndef ITEM_LABEL_H
 #define ITEM_LABEL_H

+#include "../item.qc"

 CLASS(Label, Item)
        METHOD(Label, configureLabel, void(entity, string, float, float))
        METHOD(Label, draw, void(entity))
 CLASS(Label, Item)
        METHOD(Label, configureLabel, void(entity, string, float, float))
        METHOD(Label, draw, void(entity))

diff --git a/qcsrc/menu/item/listbox.qc b/qcsrc/menu/item/listbox.qc
index 385ed502a8c41cfff91af0c70e1216dfbef80ee5..044c9e34a0feb71d857d9ebb4b0f48d6cb5969c2 100644 (file)
--- a/qcsrc/menu/item/listbox.qc
+++ b/qcsrc/menu/item/listbox.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_LISTBOX_H
 #define ITEM_LISTBOX_H
 #ifndef ITEM_LISTBOX_H
 #define ITEM_LISTBOX_H

+#include "../item.qc"

 CLASS(ListBox, Item)
        METHOD(ListBox, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(ListBox, configureListBox, void(entity, float, float))
 CLASS(ListBox, Item)
        METHOD(ListBox, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(ListBox, configureListBox, void(entity, float, float))

diff --git a/qcsrc/menu/item/modalcontroller.qc b/qcsrc/menu/item/modalcontroller.qc
index c1bc021f88121062426a674868297c112c338c0c..a13fcdd69f5706d663ea529072735ae0a85c4dcc 100644 (file)
--- a/qcsrc/menu/item/modalcontroller.qc
+++ b/qcsrc/menu/item/modalcontroller.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_MODALCONTROLLER_H
 #define ITEM_MODALCONTROLLER_H
 #ifndef ITEM_MODALCONTROLLER_H
 #define ITEM_MODALCONTROLLER_H

+#include "container.qc"

 CLASS(ModalController, Container)
        METHOD(ModalController, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(ModalController, draw, void(entity))
 CLASS(ModalController, Container)
        METHOD(ModalController, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(ModalController, draw, void(entity))

diff --git a/qcsrc/menu/item/radiobutton.qc b/qcsrc/menu/item/radiobutton.qc
index d8cadea3d6995267e5e5fddef4a46d29dd6a4f94..c1e034855aeaa2cc7992ddea2373ff9ae79fa06e 100644 (file)
--- a/qcsrc/menu/item/radiobutton.qc
+++ b/qcsrc/menu/item/radiobutton.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_RADIOBUTTON_H
 #define ITEM_RADIOBUTTON_H
 #ifndef ITEM_RADIOBUTTON_H
 #define ITEM_RADIOBUTTON_H

+#include "checkbox.qc"

 void RadioButton_Click(entity me, entity other);
 CLASS(RadioButton, CheckBox)
        METHOD(RadioButton, configureRadioButton, void(entity, string, float, string, float, float))
 void RadioButton_Click(entity me, entity other);
 CLASS(RadioButton, CheckBox)
        METHOD(RadioButton, configureRadioButton, void(entity, string, float, string, float, float))

diff --git a/qcsrc/menu/item/slider.qc b/qcsrc/menu/item/slider.qc
index 7ee9cefa71700b66bdf8f9e79afbb4addf29b800..e944a96aea18f010c7a6e3dd5b25ddc8ec15cfbf 100644 (file)
--- a/qcsrc/menu/item/slider.qc
+++ b/qcsrc/menu/item/slider.qc
@@ -2,6 +2,7 @@
 //   to use this, you FIRST call configureSliderVisuals, then configureSliderValues
 #ifndef ITEM_SLIDER_H
 #define ITEM_SLIDER_H
 //   to use this, you FIRST call configureSliderVisuals, then configureSliderValues
 #ifndef ITEM_SLIDER_H
 #define ITEM_SLIDER_H

+#include "label.qc"

 CLASS(Slider, Label)
        METHOD(Slider, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(Slider, configureSliderVisuals, void(entity, float, float, float, string))
 CLASS(Slider, Label)
        METHOD(Slider, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(Slider, configureSliderVisuals, void(entity, float, float, float, string))

diff --git a/qcsrc/menu/item/tab.qc b/qcsrc/menu/item/tab.qc
index 3fdcccc6896c52a71267f7a4fdb9abc7684213dc..fbbf77668750c26a27b5e1b1e018e0805d0cb822 100644 (file)
--- a/qcsrc/menu/item/tab.qc
+++ b/qcsrc/menu/item/tab.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_TAB_H
 #define ITEM_TAB_H
 #ifndef ITEM_TAB_H
 #define ITEM_TAB_H

+#include "dialog.qc"

 CLASS(Tab, Dialog)
        ATTRIB(Tab, isTabRoot, float, 0)
        ATTRIB(Tab, closable, float, 0)
 CLASS(Tab, Dialog)
        ATTRIB(Tab, isTabRoot, float, 0)
        ATTRIB(Tab, closable, float, 0)

diff --git a/qcsrc/menu/item/textslider.qc b/qcsrc/menu/item/textslider.qc
index 663f33a8f2ef949d90a659eb7cc9b7eb1360a74c..f22e632d6f03f9973b47540bbbcfe69975e8f22c 100644 (file)
--- a/qcsrc/menu/item/textslider.qc
+++ b/qcsrc/menu/item/textslider.qc
@@ -2,6 +2,7 @@
 //   to use this, you FIRST call configureSliderVisuals, then multiple times addValue, then configureTextSlider
 #ifndef ITEM_TEXTSLIDER_H
 #define ITEM_TEXTSLIDER_H
 //   to use this, you FIRST call configureSliderVisuals, then multiple times addValue, then configureTextSlider
 #ifndef ITEM_TEXTSLIDER_H
 #define ITEM_TEXTSLIDER_H

+#include "slider.qc"

 CLASS(TextSlider, Slider)
        METHOD(TextSlider, valueToText, string(entity, float))
        METHOD(TextSlider, valueToIdentifier, string(entity, float))
 CLASS(TextSlider, Slider)
        METHOD(TextSlider, valueToText, string(entity, float))
        METHOD(TextSlider, valueToIdentifier, string(entity, float))