Index: ps/trunk/source/gui/CButton.h =================================================================== --- ps/trunk/source/gui/CButton.h +++ ps/trunk/source/gui/CButton.h @@ -18,14 +18,10 @@ #ifndef INCLUDED_CBUTTON #define INCLUDED_CBUTTON -#include "GUI.h" +#include "gui/IGUIButtonBehavior.h" +#include "gui/IGUIObject.h" +#include "gui/IGUITextOwner.h" -/** - * Button - * - * @see IGUIObject - * @see IGUIButtonBehavior - */ class CButton : public IGUIButtonBehavior, public IGUITextOwner { GUI_OBJECT(CButton) Index: ps/trunk/source/gui/CChart.h =================================================================== --- ps/trunk/source/gui/CChart.h +++ ps/trunk/source/gui/CChart.h @@ -18,13 +18,11 @@ #ifndef INCLUDED_CCHART #define INCLUDED_CCHART -#include "gui/GUI.h" #include "gui/IGUITextOwner.h" #include "maths/Vector2D.h" #include - struct CChartData { // Avoid copying the container. @@ -38,8 +36,6 @@ /** * Chart for a data visualization as lines or points - * - * @see IGUIObject */ class CChart : public IGUITextOwner { Index: ps/trunk/source/gui/CChart.cpp =================================================================== --- ps/trunk/source/gui/CChart.cpp +++ ps/trunk/source/gui/CChart.cpp @@ -20,6 +20,8 @@ #include "CChart.h" #include "gui/CGUIColor.h" +#include "gui/CGUIList.h" +#include "gui/CGUISeries.h" #include "gui/CGUIString.h" #include "gui/GUIMatrix.h" #include "graphics/ShaderManager.h" Index: ps/trunk/source/gui/CCheckBox.h =================================================================== --- ps/trunk/source/gui/CCheckBox.h +++ ps/trunk/source/gui/CCheckBox.h @@ -18,15 +18,10 @@ #ifndef INCLUDED_CCHECKBOX #define INCLUDED_CCHECKBOX -#include "GUI.h" +#include "gui/IGUIButtonBehavior.h" +#include "gui/IGUIObject.h" +#include "gui/IGUITextOwner.h" -/** - * CheckBox - * - * @see IGUIObject - * @see IGUISettingsObject - * @see IGUIButtonBehavior - */ class CCheckBox : public IGUIButtonBehavior, public IGUITextOwner { GUI_OBJECT(CCheckBox) Index: ps/trunk/source/gui/CDropDown.h =================================================================== --- ps/trunk/source/gui/CDropDown.h +++ ps/trunk/source/gui/CDropDown.h @@ -23,18 +23,16 @@ Works just like a list-box, but it hides all the elements that aren't selected. They can be brought up by pressing the control. - ---More info-- - - Check GUI.h - */ #ifndef INCLUDED_CDROPDOWN #define INCLUDED_CDROPDOWN -#include "GUI.h" -#include "CList.h" +#include "gui/CGUIList.h" +#include "gui/CList.h" +#include "gui/IGUIScrollBar.h" + +#include /** * Drop Down Index: ps/trunk/source/gui/CGUI.h =================================================================== --- ps/trunk/source/gui/CGUI.h +++ ps/trunk/source/gui/CGUI.h @@ -32,6 +32,8 @@ #include "scriptinterface/ScriptInterface.h" #include +#include +#include ERROR_TYPE(GUI, JSOpenFailed); Index: ps/trunk/source/gui/CGUIList.h =================================================================== --- ps/trunk/source/gui/CGUIList.h +++ ps/trunk/source/gui/CGUIList.h @@ -20,6 +20,8 @@ #include "gui/CGUIString.h" +#include + class CGUIList { public: // struct:ish (but for consistency I call it _C_GUIList, and Index: ps/trunk/source/gui/CGUIScrollBarVertical.h =================================================================== --- ps/trunk/source/gui/CGUIScrollBarVertical.h +++ ps/trunk/source/gui/CGUIScrollBarVertical.h @@ -16,29 +16,15 @@ */ /* -A GUI ScrollBar - ---Overview-- - A GUI Scrollbar, this class doesn't present all functionality to the scrollbar, it just controls the drawing and a wrapper for interaction with it. - ---Usage-- - - Used in everywhere scrollbars are needed, like in a combobox for instance. - ---More info-- - - Check GUI.h - */ #ifndef INCLUDED_CGUISCROLLBARVERTICAL #define INCLUDED_CGUISCROLLBARVERTICAL #include "IGUIScrollBar.h" -#include "GUI.h" /** * Vertical implementation of IGUIScrollBar Index: ps/trunk/source/gui/CGUIScrollBarVertical.cpp =================================================================== --- ps/trunk/source/gui/CGUIScrollBarVertical.cpp +++ ps/trunk/source/gui/CGUIScrollBarVertical.cpp @@ -19,9 +19,7 @@ #include "CGUIScrollBarVertical.h" -#include "GUI.h" -#include "CGUI.h" - +#include "gui/CGUI.h" #include "ps/CLogger.h" Index: ps/trunk/source/gui/CGUISeries.h =================================================================== --- ps/trunk/source/gui/CGUISeries.h +++ ps/trunk/source/gui/CGUISeries.h @@ -21,6 +21,8 @@ #include "maths/Vector2D.h" +#include + class CGUISeries { public: Index: ps/trunk/source/gui/CGUISetting.cpp =================================================================== --- ps/trunk/source/gui/CGUISetting.cpp +++ ps/trunk/source/gui/CGUISetting.cpp @@ -20,7 +20,6 @@ #include "CGUISetting.h" #include "gui/CGUI.h" -#include "gui/GUI.h" template CGUISetting::CGUISetting(IGUIObject& pObject, const CStr& Name) Index: ps/trunk/source/gui/CGUISprite.h =================================================================== --- ps/trunk/source/gui/CGUISprite.h +++ ps/trunk/source/gui/CGUISprite.h @@ -28,7 +28,9 @@ #include "gui/GUIRenderer.h" #include "lib/res/graphics/ogl_tex.h" +#include #include +#include struct SGUIImageEffects { Index: ps/trunk/source/gui/CGUIString.cpp =================================================================== --- ps/trunk/source/gui/CGUIString.cpp +++ ps/trunk/source/gui/CGUIString.cpp @@ -21,7 +21,6 @@ #include "graphics/FontMetrics.h" #include "gui/CGUI.h" -#include "gui/GUI.h" #include "lib/utf8.h" #include "ps/CLogger.h" Index: ps/trunk/source/gui/CImage.h =================================================================== --- ps/trunk/source/gui/CImage.h +++ ps/trunk/source/gui/CImage.h @@ -18,7 +18,7 @@ #ifndef INCLUDED_CIMAGE #define INCLUDED_CIMAGE -#include "GUI.h" +#include "gui/IGUIObject.h" /** * Object just for drawing a sprite. Like CText, without the @@ -29,8 +29,6 @@ * without functionality used, and that is a lot of unnecessary * overhead. That's why I thought I'd go with an intuitive * control. - * - * @see IGUIObject */ class CImage : public IGUIObject { Index: ps/trunk/source/gui/CImage.cpp =================================================================== --- ps/trunk/source/gui/CImage.cpp +++ ps/trunk/source/gui/CImage.cpp @@ -20,7 +20,6 @@ #include "CImage.h" #include "gui/CGUI.h" -#include "gui/GUI.h" #include "lib/ogl.h" CImage::CImage(CGUI& pGUI) Index: ps/trunk/source/gui/CInput.h =================================================================== --- ps/trunk/source/gui/CInput.h +++ ps/trunk/source/gui/CInput.h @@ -18,17 +18,17 @@ #ifndef INCLUDED_CINPUT #define INCLUDED_CINPUT -#include "GUI.h" +#include "gui/IGUIScrollBarOwner.h" #include "lib/external_libraries/libsdl.h" +#include + /** * Text field where you can input and edit the text. * * It doesn't use IGUITextOwner, because we don't need * any other features than word-wrapping, and we need to be * able to rapidly change the string. - * - * @see IGUIObject */ class CInput : public IGUIScrollBarOwner { Index: ps/trunk/source/gui/CInput.cpp =================================================================== --- ps/trunk/source/gui/CInput.cpp +++ ps/trunk/source/gui/CInput.cpp @@ -21,7 +21,6 @@ #include "gui/CGUI.h" #include "gui/CGUIScrollBarVertical.h" -#include "gui/GUI.h" #include "graphics/FontMetrics.h" #include "graphics/ShaderManager.h" #include "graphics/TextRenderer.h" Index: ps/trunk/source/gui/CList.h =================================================================== --- ps/trunk/source/gui/CList.h +++ ps/trunk/source/gui/CList.h @@ -18,7 +18,10 @@ #ifndef INCLUDED_CLIST #define INCLUDED_CLIST -#include "IGUIScrollBar.h" +#include "gui/IGUIScrollBarOwner.h" +#include "gui/IGUITextOwner.h" + +#include /** * Create a list of elements, where one can be selected Index: ps/trunk/source/gui/CList.cpp =================================================================== --- ps/trunk/source/gui/CList.cpp +++ ps/trunk/source/gui/CList.cpp @@ -21,6 +21,7 @@ #include "gui/CGUI.h" #include "gui/CGUIColor.h" +#include "gui/CGUIList.h" #include "gui/CGUIScrollBarVertical.h" #include "lib/external_libraries/libsdl.h" #include "lib/timer.h" Index: ps/trunk/source/gui/COList.h =================================================================== --- ps/trunk/source/gui/COList.h +++ ps/trunk/source/gui/COList.h @@ -17,9 +17,10 @@ #ifndef INCLUDED_COLIST #define INCLUDED_COLIST -#include "GUI.h" #include "CList.h" +#include + /** * Represents a column. */ Index: ps/trunk/source/gui/COList.cpp =================================================================== --- ps/trunk/source/gui/COList.cpp +++ ps/trunk/source/gui/COList.cpp @@ -21,6 +21,8 @@ #include "gui/CGUI.h" #include "gui/CGUIColor.h" +#include "gui/CGUIList.h" +#include "gui/IGUIScrollBar.h" #include "i18n/L10n.h" #include "ps/CLogger.h" Index: ps/trunk/source/gui/CProgressBar.h =================================================================== --- ps/trunk/source/gui/CProgressBar.h +++ ps/trunk/source/gui/CProgressBar.h @@ -18,12 +18,10 @@ #ifndef INCLUDED_CPROGRESSBAR #define INCLUDED_CPROGRESSBAR -#include "GUI.h" +#include "gui/IGUIObject.h" /** * Object used to draw a value (e.g. progress) from 0 to 100 visually. - * - * @see IGUIObject */ class CProgressBar : public IGUIObject { Index: ps/trunk/source/gui/CProgressBar.cpp =================================================================== --- ps/trunk/source/gui/CProgressBar.cpp +++ ps/trunk/source/gui/CProgressBar.cpp @@ -20,7 +20,6 @@ #include "CProgressBar.h" #include "gui/CGUI.h" -#include "gui/GUI.h" #include "lib/ogl.h" CProgressBar::CProgressBar(CGUI& pGUI) Index: ps/trunk/source/gui/CRadioButton.h =================================================================== --- ps/trunk/source/gui/CRadioButton.h +++ ps/trunk/source/gui/CRadioButton.h @@ -18,7 +18,6 @@ #ifndef INCLUDED_CRADIOBUTTON #define INCLUDED_CRADIOBUTTON -#include "GUI.h" #include "CCheckBox.h" /** Index: ps/trunk/source/gui/CRadioButton.cpp =================================================================== --- ps/trunk/source/gui/CRadioButton.cpp +++ ps/trunk/source/gui/CRadioButton.cpp @@ -19,8 +19,6 @@ #include "CRadioButton.h" -#include "GUI.h" - CRadioButton::CRadioButton(CGUI& pGUI) : CCheckBox(pGUI), IGUIObject(pGUI) { Index: ps/trunk/source/gui/CSlider.h =================================================================== --- ps/trunk/source/gui/CSlider.h +++ ps/trunk/source/gui/CSlider.h @@ -18,8 +18,7 @@ #ifndef INCLUDED_CSLIDER #define INCLUDED_CSLIDER -#include "GUI.h" - +#include "gui/IGUIObject.h" class CSlider : public IGUIObject { Index: ps/trunk/source/gui/CSlider.cpp =================================================================== --- ps/trunk/source/gui/CSlider.cpp +++ ps/trunk/source/gui/CSlider.cpp @@ -20,7 +20,6 @@ #include "CSlider.h" #include "gui/CGUI.h" -#include "gui/GUI.h" #include "lib/ogl.h" CSlider::CSlider(CGUI& pGUI) Index: ps/trunk/source/gui/CText.h =================================================================== --- ps/trunk/source/gui/CText.h +++ ps/trunk/source/gui/CText.h @@ -18,12 +18,11 @@ #ifndef INCLUDED_CTEXT #define INCLUDED_CTEXT -#include "GUI.h" +#include "gui/IGUIScrollBarOwner.h" +#include "gui/IGUITextOwner.h" /** * Text field that just displays static text. - * - * @see IGUIObject */ class CText : public IGUIScrollBarOwner, public IGUITextOwner { Index: ps/trunk/source/gui/CText.cpp =================================================================== --- ps/trunk/source/gui/CText.cpp +++ ps/trunk/source/gui/CText.cpp @@ -21,7 +21,6 @@ #include "gui/CGUI.h" #include "gui/CGUIScrollBarVertical.h" -#include "gui/GUI.h" #include "lib/ogl.h" CText::CText(CGUI& pGUI) Index: ps/trunk/source/gui/CTooltip.cpp =================================================================== --- ps/trunk/source/gui/CTooltip.cpp +++ ps/trunk/source/gui/CTooltip.cpp @@ -18,7 +18,8 @@ #include "precompiled.h" #include "CTooltip.h" -#include "CGUI.h" + +#include "gui/CGUI.h" #include Index: ps/trunk/source/gui/GUI.h =================================================================== --- ps/trunk/source/gui/GUI.h +++ ps/trunk/source/gui/GUI.h @@ -1,38 +0,0 @@ -/* Copyright (C) 2019 Wildfire Games. - * This file is part of 0 A.D. - * - * 0 A.D. is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * 0 A.D. is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with 0 A.D. If not, see . - */ - -#ifndef INCLUDED_GUI -#define INCLUDED_GUI - -#include -#include -#include -#include - -#include "ps/CStr.h" - -#include "CGUIList.h" -#include "CGUISeries.h" -#include "CGUIText.h" -#include "GUIbase.h" -#include "IGUIButtonBehavior.h" -#include "IGUIObject.h" -#include "IGUIScrollBarOwner.h" // Required by IGUIScrollBar -#include "IGUIScrollBar.h" -#include "IGUITextOwner.h" - -#endif // INCLUDED_GUI Index: ps/trunk/source/gui/GUIManager.h =================================================================== --- ps/trunk/source/gui/GUIManager.h +++ ps/trunk/source/gui/GUIManager.h @@ -28,6 +28,8 @@ #include "scriptinterface/ScriptVal.h" #include "scriptinterface/ScriptInterface.h" +#include + class CGUI; class JSObject; class IGUIObject; @@ -175,7 +177,7 @@ shared_ptr m_ScriptRuntime; shared_ptr m_ScriptInterface; - typedef std::vector PageStackType; + using PageStackType = std::vector; PageStackType m_PageStack; CTemplateLoader m_TemplateLoader; Index: ps/trunk/source/gui/GUIRenderer.h =================================================================== --- ps/trunk/source/gui/GUIRenderer.h +++ ps/trunk/source/gui/GUIRenderer.h @@ -25,6 +25,7 @@ #include "ps/CStr.h" #include "ps/Shapes.h" +#include #include class CGUISprite; Index: ps/trunk/source/gui/GUITooltip.cpp =================================================================== --- ps/trunk/source/gui/GUITooltip.cpp +++ ps/trunk/source/gui/GUITooltip.cpp @@ -19,9 +19,8 @@ #include "GUITooltip.h" -#include "CGUI.h" -#include "IGUIObject.h" - +#include "gui/CGUI.h" +#include "gui/IGUIObject.h" #include "lib/timer.h" #include "ps/CLogger.h" Index: ps/trunk/source/gui/GUIbase.h =================================================================== --- ps/trunk/source/gui/GUIbase.h +++ ps/trunk/source/gui/GUIbase.h @@ -18,35 +18,24 @@ /* GUI Core, stuff that the whole GUI uses ---Overview-- - Contains defines, includes, types etc that the whole GUI should have included. - ---More info-- - - Check GUI.h - */ #ifndef INCLUDED_GUIBASE #define INCLUDED_GUIBASE -#include -#include - #include "gui/CGUIColor.h" #include "ps/CStr.h" #include "ps/Errors.h" -// I would like to just forward declare CSize, but it doesn't -// seem to be defined anywhere in the predefined header. #include "ps/Shapes.h" #include "scriptinterface/ScriptInterface.h" +#include +#include + class IGUIObject; -// Object settings setups -// Setup an object's ConstructObject function #define GUI_OBJECT(obj) \ public: \ static IGUIObject* ConstructObject(CGUI& pGUI) \ @@ -130,8 +119,8 @@ enum EVAlign { EVAlign_Top, EVAlign_Bottom, EVAlign_Center }; // Typedefs -typedef std::map map_pObjects; -typedef std::vector vector_pObjects; +using map_pObjects = std::map; +using vector_pObjects = std::vector; // Icon, you create them in the XML file with root element // you use them in text owned by different objects... Such as CText. Index: ps/trunk/source/gui/GUIbase.cpp =================================================================== --- ps/trunk/source/gui/GUIbase.cpp +++ ps/trunk/source/gui/GUIbase.cpp @@ -17,9 +17,9 @@ #include "precompiled.h" -#include "GUI.h" -#include "gui/scripting/JSInterface_GUITypes.h" +#include "GUIbase.h" +#include "gui/scripting/JSInterface_GUITypes.h" #include "ps/CLogger.h" CClientArea::CClientArea() : pixel(0.f,0.f,0.f,0.f), percent(0.f,0.f,0.f,0.f) Index: ps/trunk/source/gui/GUItypes.h =================================================================== --- ps/trunk/source/gui/GUItypes.h +++ ps/trunk/source/gui/GUItypes.h @@ -25,6 +25,9 @@ to handle every possible type. */ +#include "gui/CGUIList.h" +#include "gui/CGUISeries.h" + #ifndef GUITYPE_IGNORE_COPYABLE TYPE(bool) TYPE(i32) Index: ps/trunk/source/gui/IGUIButtonBehavior.h =================================================================== --- ps/trunk/source/gui/IGUIButtonBehavior.h +++ ps/trunk/source/gui/IGUIButtonBehavior.h @@ -16,26 +16,16 @@ */ /* -GUI Object Base - Button Behavior - ---Overview-- - Interface class that enhance the IGUIObject with buttony behavior (click and release to click a button), and the GUI message GUIM_PRESSED. When creating a class with extended settings and buttony behavior, just do a multiple inheritance. - ---More info-- - - Check GUI.h - */ #ifndef INCLUDED_IGUIBUTTONBEHAVIOR #define INCLUDED_IGUIBUTTONBEHAVIOR -#include "gui/GUI.h" #include "gui/IGUIObject.h" class CGUISpriteInstance; @@ -44,8 +34,6 @@ * Appends button behaviours to the IGUIObject. * Can be used with multiple inheritance alongside * IGUISettingsObject and such. - * - * @see IGUIObject */ class IGUIButtonBehavior : virtual public IGUIObject { Index: ps/trunk/source/gui/IGUIButtonBehavior.cpp =================================================================== --- ps/trunk/source/gui/IGUIButtonBehavior.cpp +++ ps/trunk/source/gui/IGUIButtonBehavior.cpp @@ -17,9 +17,9 @@ #include "precompiled.h" -#include "GUI.h" - #include "gui/CGUI.h" +#include "gui/CGUISprite.h" +#include "gui/IGUIButtonBehavior.h" IGUIButtonBehavior::IGUIButtonBehavior(CGUI& pGUI) : IGUIObject(pGUI), m_Pressed(false) Index: ps/trunk/source/gui/IGUIObject.h =================================================================== --- ps/trunk/source/gui/IGUIObject.h +++ ps/trunk/source/gui/IGUIObject.h @@ -30,6 +30,7 @@ #include "lib/input.h" // just for IN_PASS #include "ps/XML/Xeromyces.h" +#include #include #include Index: ps/trunk/source/gui/IGUIObject.cpp =================================================================== --- ps/trunk/source/gui/IGUIObject.cpp +++ ps/trunk/source/gui/IGUIObject.cpp @@ -17,8 +17,6 @@ #include "precompiled.h" -#include "GUI.h" - #include "gui/CGUI.h" #include "gui/CGUISetting.h" #include "gui/scripting/JSInterface_GUITypes.h" Index: ps/trunk/source/gui/IGUIScrollBar.h =================================================================== --- ps/trunk/source/gui/IGUIScrollBar.h +++ ps/trunk/source/gui/IGUIScrollBar.h @@ -16,28 +16,17 @@ */ /* -A GUI ScrollBar - ---Overview-- - A GUI Scrollbar, this class doesn't present all functionality to the scrollbar, it just controls the drawing and a wrapper for interaction with it. - ---Usage-- - - Used in everywhere scrollbars are needed, like in a combobox for instance. - ---More info-- - - Check GUI.h - */ #ifndef INCLUDED_IGUISCROLLBAR #define INCLUDED_IGUISCROLLBAR -#include "GUI.h" +#include "gui/CGUISprite.h" + +class IGUIScrollBarOwner; /** * The GUI Scroll-bar style. Tells us how scroll-bars look and feel. @@ -386,12 +375,12 @@ /** * Pointer to scroll bar style used. */ - SGUIScrollBarStyle *m_pStyle; + SGUIScrollBarStyle* m_pStyle; /** * Host object, prerequisite! */ - IGUIScrollBarOwner *m_pHostObject; + IGUIScrollBarOwner* m_pHostObject; /** * Reference to CGUI object, these cannot work stand-alone Index: ps/trunk/source/gui/IGUIScrollBar.cpp =================================================================== --- ps/trunk/source/gui/IGUIScrollBar.cpp +++ ps/trunk/source/gui/IGUIScrollBar.cpp @@ -17,24 +17,25 @@ #include "precompiled.h" -#include "GUI.h" +#include "IGUIScrollBar.h" +#include "gui/IGUIScrollBarOwner.h" #include "gui/CGUI.h" #include "maths/MathUtil.h" IGUIScrollBar::IGUIScrollBar(CGUI& pGUI) - : m_pGUI(pGUI), - m_pStyle(NULL), - m_X(300.f), m_Y(300.f), - m_ScrollRange(1.f), m_ScrollSpace(0.f), // MaxPos: not 0, due to division. - m_Length(200.f), m_Width(20.f), - m_BarSize(0.f), m_Pos(0.f), - m_ButtonPlusPressed(false), - m_ButtonMinusPressed(false), - m_ButtonPlusHovered(false), - m_ButtonMinusHovered(false), - m_BarHovered(false), - m_BarPressed(false) + : m_pGUI(pGUI), + m_pStyle(nullptr), + m_X(300.f), m_Y(300.f), + m_ScrollRange(1.f), m_ScrollSpace(0.f), // MaxPos: not 0, due to division. + m_Length(200.f), m_Width(20.f), + m_BarSize(0.f), m_Pos(0.f), + m_ButtonPlusPressed(false), + m_ButtonMinusPressed(false), + m_ButtonPlusHovered(false), + m_ButtonMinusHovered(false), + m_BarHovered(false), + m_BarPressed(false) { } Index: ps/trunk/source/gui/IGUIScrollBarOwner.h =================================================================== --- ps/trunk/source/gui/IGUIScrollBarOwner.h +++ ps/trunk/source/gui/IGUIScrollBarOwner.h @@ -18,7 +18,9 @@ #ifndef INCLUDED_IGUISCROLLBAROWNER #define INCLUDED_IGUISCROLLBAROWNER -#include "GUI.h" +#include "gui/IGUIObject.h" + +#include struct SGUIScrollBarStyle; class IGUIScrollBar; @@ -26,9 +28,6 @@ /** * Base-class this if you want an object to contain * one, or several, scroll-bars. - * - * @see IGUIObject - * @see IGUIScrollBar */ class IGUIScrollBarOwner : virtual public IGUIObject { Index: ps/trunk/source/gui/IGUIScrollBarOwner.cpp =================================================================== --- ps/trunk/source/gui/IGUIScrollBarOwner.cpp +++ ps/trunk/source/gui/IGUIScrollBarOwner.cpp @@ -17,8 +17,10 @@ #include "precompiled.h" -#include "GUI.h" +#include "IGUIScrollBarOwner.h" + #include "gui/CGUI.h" +#include "gui/IGUIScrollBar.h" IGUIScrollBarOwner::IGUIScrollBarOwner(CGUI& pGUI) : IGUIObject(pGUI) Index: ps/trunk/source/gui/IGUITextOwner.h =================================================================== --- ps/trunk/source/gui/IGUITextOwner.h +++ ps/trunk/source/gui/IGUITextOwner.h @@ -25,23 +25,19 @@ and many controls that will use CGUIStrings might not use this, but does help for regular usage such as a text-box, a button, a radio button etc. - ---More info-- - - Check GUI.h - */ #ifndef INCLUDED_IGUITEXTOWNER #define INCLUDED_IGUITEXTOWNER -#include "GUI.h" +#include "gui/CGUIText.h" +#include "gui/IGUIObject.h" #include "gui/scripting/JSInterface_IGUITextOwner.h" +#include + /** * Framework for handling Output text. - * - * @see IGUIObject */ class IGUITextOwner : virtual public IGUIObject { Index: ps/trunk/source/gui/IGUITextOwner.cpp =================================================================== --- ps/trunk/source/gui/IGUITextOwner.cpp +++ ps/trunk/source/gui/IGUITextOwner.cpp @@ -19,7 +19,6 @@ #include "IGUITextOwner.h" -#include "gui/GUI.h" #include "gui/CGUI.h" #include "gui/scripting/JSInterface_IGUITextOwner.h" Index: ps/trunk/source/gui/MiniMap.h =================================================================== --- ps/trunk/source/gui/MiniMap.h +++ ps/trunk/source/gui/MiniMap.h @@ -18,7 +18,8 @@ #ifndef INCLUDED_MINIMAP #define INCLUDED_MINIMAP -#include "gui/GUI.h" +#include "gui/IGUIObject.h" +#include "graphics/ShaderProgramPtr.h" #include "renderer/VertexArray.h" class CCamera; Index: ps/trunk/source/gui/MiniMap.cpp =================================================================== --- ps/trunk/source/gui/MiniMap.cpp +++ ps/trunk/source/gui/MiniMap.cpp @@ -29,7 +29,6 @@ #include "graphics/TerrainTextureManager.h" #include "graphics/TerritoryTexture.h" #include "gui/CGUI.h" -#include "gui/GUI.h" #include "gui/GUIManager.h" #include "gui/GUIMatrix.h" #include "lib/bits.h" Index: ps/trunk/source/gui/scripting/GuiScriptConversions.cpp =================================================================== --- ps/trunk/source/gui/scripting/GuiScriptConversions.cpp +++ ps/trunk/source/gui/scripting/GuiScriptConversions.cpp @@ -27,6 +27,8 @@ #include "ps/Hotkey.h" #include "scriptinterface/ScriptConversions.h" +#include + #define SET(obj, name, value) STMT(JS::RootedValue v_(cx); AssignOrToJSVal(cx, &v_, (value)); JS_SetProperty(cx, obj, (name), v_)) // ignore JS_SetProperty return value, because errors should be impossible // and we can't do anything useful in the case of errors anyway Index: ps/trunk/source/pch/gui/precompiled.h =================================================================== --- ps/trunk/source/pch/gui/precompiled.h +++ ps/trunk/source/pch/gui/precompiled.h @@ -24,8 +24,9 @@ #if HAVE_PCH +#include "gui/CGUI.h" +#include "gui/IGUIObject.h" #include "ps/CStr.h" -#include "gui/GUI.h" #include "scriptinterface/ScriptInterface.h" #endif // HAVE_PCH Index: ps/trunk/source/ps/GameSetup/GameSetup.cpp =================================================================== --- ps/trunk/source/ps/GameSetup/GameSetup.cpp +++ ps/trunk/source/ps/GameSetup/GameSetup.cpp @@ -36,7 +36,6 @@ #include "graphics/MaterialManager.h" #include "graphics/TerrainTextureManager.h" #include "gui/CGUI.h" -#include "gui/GUI.h" #include "gui/GUIManager.h" #include "i18n/L10n.h" #include "maths/MathUtil.h" Index: ps/trunk/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp =================================================================== --- ps/trunk/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp +++ ps/trunk/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp @@ -25,9 +25,9 @@ #include "graphics/CinemaManager.h" #include "graphics/GameView.h" #include "gui/GUIManager.h" -#include "gui/GUI.h" #include "gui/CGUI.h" #include "lib/external_libraries/libsdl.h" +#include "lib/ogl.h" #include "lib/sysdep/cpu.h" #include "maths/MathUtil.h" #include "ps/Game.h"