forked from 0ad/0ad
Delete GUI.h umbrella include following 8d0cb1b954
.
Differential Revision: https://code.wildfiregames.com/D2304 Tested on: clang 8.0.1., VS2015, Jenkins Comments By: Vladislav, Angen, Stan Tested by: Angen This was SVN commit r22941.
This commit is contained in:
parent
8f7729bfdb
commit
1bc6d778bb
@ -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)
|
||||
|
@ -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"
|
||||
|
@ -18,13 +18,11 @@
|
||||
#ifndef INCLUDED_CCHART
|
||||
#define INCLUDED_CCHART
|
||||
|
||||
#include "gui/GUI.h"
|
||||
#include "gui/IGUITextOwner.h"
|
||||
#include "maths/Vector2D.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
||||
struct CChartData
|
||||
{
|
||||
// Avoid copying the container.
|
||||
@ -38,8 +36,6 @@ struct CChartData
|
||||
|
||||
/**
|
||||
* Chart for a data visualization as lines or points
|
||||
*
|
||||
* @see IGUIObject
|
||||
*/
|
||||
class CChart : public IGUITextOwner
|
||||
{
|
||||
|
@ -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)
|
||||
|
@ -23,18 +23,16 @@ GUI Object - Drop Down (list)
|
||||
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 <string>
|
||||
|
||||
/**
|
||||
* Drop Down
|
||||
|
@ -32,6 +32,8 @@
|
||||
#include "scriptinterface/ScriptInterface.h"
|
||||
|
||||
#include <boost/unordered_set.hpp>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
ERROR_TYPE(GUI, JSOpenFailed);
|
||||
|
||||
|
@ -20,6 +20,8 @@
|
||||
|
||||
#include "gui/CGUIString.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
class CGUIList
|
||||
{
|
||||
public: // struct:ish (but for consistency I call it _C_GUIList, and
|
||||
|
@ -19,9 +19,7 @@
|
||||
|
||||
#include "CGUIScrollBarVertical.h"
|
||||
|
||||
#include "GUI.h"
|
||||
#include "CGUI.h"
|
||||
|
||||
#include "gui/CGUI.h"
|
||||
#include "ps/CLogger.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
|
||||
|
@ -21,6 +21,8 @@
|
||||
|
||||
#include "maths/Vector2D.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
class CGUISeries
|
||||
{
|
||||
public:
|
||||
|
@ -20,7 +20,6 @@
|
||||
#include "CGUISetting.h"
|
||||
|
||||
#include "gui/CGUI.h"
|
||||
#include "gui/GUI.h"
|
||||
|
||||
template<typename T>
|
||||
CGUISetting<T>::CGUISetting(IGUIObject& pObject, const CStr& Name)
|
||||
|
@ -28,7 +28,9 @@
|
||||
#include "gui/GUIRenderer.h"
|
||||
#include "lib/res/graphics/ogl_tex.h"
|
||||
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
struct SGUIImageEffects
|
||||
{
|
||||
|
@ -21,7 +21,6 @@
|
||||
|
||||
#include "graphics/FontMetrics.h"
|
||||
#include "gui/CGUI.h"
|
||||
#include "gui/GUI.h"
|
||||
#include "lib/utf8.h"
|
||||
#include "ps/CLogger.h"
|
||||
|
||||
|
@ -20,7 +20,6 @@
|
||||
#include "CImage.h"
|
||||
|
||||
#include "gui/CGUI.h"
|
||||
#include "gui/GUI.h"
|
||||
#include "lib/ogl.h"
|
||||
|
||||
CImage::CImage(CGUI& pGUI)
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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"
|
||||
|
@ -18,17 +18,17 @@
|
||||
#ifndef INCLUDED_CINPUT
|
||||
#define INCLUDED_CINPUT
|
||||
|
||||
#include "GUI.h"
|
||||
#include "gui/IGUIScrollBarOwner.h"
|
||||
#include "lib/external_libraries/libsdl.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
/**
|
||||
* 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
|
||||
{
|
||||
|
@ -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"
|
||||
|
@ -18,7 +18,10 @@
|
||||
#ifndef INCLUDED_CLIST
|
||||
#define INCLUDED_CLIST
|
||||
|
||||
#include "IGUIScrollBar.h"
|
||||
#include "gui/IGUIScrollBarOwner.h"
|
||||
#include "gui/IGUITextOwner.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
/**
|
||||
* Create a list of elements, where one can be selected
|
||||
|
@ -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"
|
||||
|
||||
|
@ -17,9 +17,10 @@
|
||||
#ifndef INCLUDED_COLIST
|
||||
#define INCLUDED_COLIST
|
||||
|
||||
#include "GUI.h"
|
||||
#include "CList.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
/**
|
||||
* Represents a column.
|
||||
*/
|
||||
|
@ -20,7 +20,6 @@
|
||||
#include "CProgressBar.h"
|
||||
|
||||
#include "gui/CGUI.h"
|
||||
#include "gui/GUI.h"
|
||||
#include "lib/ogl.h"
|
||||
|
||||
CProgressBar::CProgressBar(CGUI& pGUI)
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -19,8 +19,6 @@
|
||||
|
||||
#include "CRadioButton.h"
|
||||
|
||||
#include "GUI.h"
|
||||
|
||||
CRadioButton::CRadioButton(CGUI& pGUI)
|
||||
: CCheckBox(pGUI), IGUIObject(pGUI)
|
||||
{
|
||||
|
@ -18,7 +18,6 @@
|
||||
#ifndef INCLUDED_CRADIOBUTTON
|
||||
#define INCLUDED_CRADIOBUTTON
|
||||
|
||||
#include "GUI.h"
|
||||
#include "CCheckBox.h"
|
||||
|
||||
/**
|
||||
|
@ -20,7 +20,6 @@
|
||||
#include "CSlider.h"
|
||||
|
||||
#include "gui/CGUI.h"
|
||||
#include "gui/GUI.h"
|
||||
#include "lib/ogl.h"
|
||||
|
||||
CSlider::CSlider(CGUI& pGUI)
|
||||
|
@ -18,8 +18,7 @@
|
||||
#ifndef INCLUDED_CSLIDER
|
||||
#define INCLUDED_CSLIDER
|
||||
|
||||
#include "GUI.h"
|
||||
|
||||
#include "gui/IGUIObject.h"
|
||||
|
||||
class CSlider : public IGUIObject
|
||||
{
|
||||
|
@ -21,7 +21,6 @@
|
||||
|
||||
#include "gui/CGUI.h"
|
||||
#include "gui/CGUIScrollBarVertical.h"
|
||||
#include "gui/GUI.h"
|
||||
#include "lib/ogl.h"
|
||||
|
||||
CText::CText(CGUI& pGUI)
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -18,7 +18,8 @@
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "CTooltip.h"
|
||||
#include "CGUI.h"
|
||||
|
||||
#include "gui/CGUI.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_GUI
|
||||
#define INCLUDED_GUI
|
||||
|
||||
#include <map>
|
||||
#include <stddef.h>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#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
|
@ -28,6 +28,8 @@
|
||||
#include "scriptinterface/ScriptVal.h"
|
||||
#include "scriptinterface/ScriptInterface.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
class CGUI;
|
||||
class JSObject;
|
||||
class IGUIObject;
|
||||
@ -175,7 +177,7 @@ private:
|
||||
shared_ptr<ScriptRuntime> m_ScriptRuntime;
|
||||
shared_ptr<ScriptInterface> m_ScriptInterface;
|
||||
|
||||
typedef std::vector<SGUIPage> PageStackType;
|
||||
using PageStackType = std::vector<SGUIPage>;
|
||||
PageStackType m_PageStack;
|
||||
|
||||
CTemplateLoader m_TemplateLoader;
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include "ps/CStr.h"
|
||||
#include "ps/Shapes.h"
|
||||
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
class CGUISprite;
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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 <map>
|
||||
#include <vector>
|
||||
|
||||
#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 <map>
|
||||
#include <vector>
|
||||
|
||||
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 EAlign { EAlign_Left, EAlign_Right, EAlign_Center };
|
||||
enum EVAlign { EVAlign_Top, EVAlign_Bottom, EVAlign_Center };
|
||||
|
||||
// Typedefs
|
||||
typedef std::map<CStr, IGUIObject*> map_pObjects;
|
||||
typedef std::vector<IGUIObject*> vector_pObjects;
|
||||
using map_pObjects = std::map<CStr, IGUIObject*>;
|
||||
using vector_pObjects = std::vector<IGUIObject*>;
|
||||
|
||||
// Icon, you create them in the XML file with root element <setup>
|
||||
// you use them in text owned by different objects... Such as CText.
|
||||
|
@ -25,6 +25,9 @@ places, and to make it much easier to add a new type). Just do
|
||||
to handle every possible type.
|
||||
*/
|
||||
|
||||
#include "gui/CGUIList.h"
|
||||
#include "gui/CGUISeries.h"
|
||||
|
||||
#ifndef GUITYPE_IGNORE_COPYABLE
|
||||
TYPE(bool)
|
||||
TYPE(i32)
|
||||
|
@ -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)
|
||||
|
@ -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 @@ class CGUISpriteInstance;
|
||||
* Appends button behaviours to the IGUIObject.
|
||||
* Can be used with multiple inheritance alongside
|
||||
* IGUISettingsObject and such.
|
||||
*
|
||||
* @see IGUIObject
|
||||
*/
|
||||
class IGUIButtonBehavior : virtual public IGUIObject
|
||||
{
|
||||
|
@ -17,8 +17,6 @@
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "GUI.h"
|
||||
|
||||
#include "gui/CGUI.h"
|
||||
#include "gui/CGUISetting.h"
|
||||
#include "gui/scripting/JSInterface_GUITypes.h"
|
||||
|
@ -30,6 +30,7 @@
|
||||
#include "lib/input.h" // just for IN_PASS
|
||||
#include "ps/XML/Xeromyces.h"
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
|
@ -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)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -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 @@ protected:
|
||||
/**
|
||||
* 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
|
||||
|
@ -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)
|
||||
|
@ -18,7 +18,9 @@
|
||||
#ifndef INCLUDED_IGUISCROLLBAROWNER
|
||||
#define INCLUDED_IGUISCROLLBAROWNER
|
||||
|
||||
#include "GUI.h"
|
||||
#include "gui/IGUIObject.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
struct SGUIScrollBarStyle;
|
||||
class IGUIScrollBar;
|
||||
@ -26,9 +28,6 @@ class IGUIScrollBar;
|
||||
/**
|
||||
* Base-class this if you want an object to contain
|
||||
* one, or several, scroll-bars.
|
||||
*
|
||||
* @see IGUIObject
|
||||
* @see IGUIScrollBar
|
||||
*/
|
||||
class IGUIScrollBarOwner : virtual public IGUIObject
|
||||
{
|
||||
|
@ -19,7 +19,6 @@
|
||||
|
||||
#include "IGUITextOwner.h"
|
||||
|
||||
#include "gui/GUI.h"
|
||||
#include "gui/CGUI.h"
|
||||
#include "gui/scripting/JSInterface_IGUITextOwner.h"
|
||||
|
||||
|
@ -25,23 +25,19 @@ GUI Object Base - Text Owner
|
||||
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 <vector>
|
||||
|
||||
/**
|
||||
* Framework for handling Output text.
|
||||
*
|
||||
* @see IGUIObject
|
||||
*/
|
||||
class IGUITextOwner : virtual public IGUIObject
|
||||
{
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
|
@ -27,6 +27,8 @@
|
||||
#include "ps/Hotkey.h"
|
||||
#include "scriptinterface/ScriptConversions.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
#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
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user