SumGuyV5/SDLPongCPP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove Refrens from GUI enum

Browse Source
This commit is contained in:
Richard Allen
2018-08-30 11:50:19 -04:00
parent 2c41974460
commit 05ffe20bb4
14 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TrooperEngineDLL/TrooperEngine/GUIEngine/cButton.cpp
+2 -2
View File
@@ -15,7 +15,7 @@ using MathEngine::iVector4;
cButton::cButton() cButton::cButton()
{} {}
cButton::cButton( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, cButton::cButton( cWindow* parent, const signed int id, const GUIHelpers::eAlign align /*= sALIGN*/, const GUIHelpers::eLayout layout /*= sLAYOUT*/,
const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::Padding& padding/* = sPADDING*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::Padding& padding/* = sPADDING*/,
const cString& name /*= sNAME*/, VideoEngine::cImage** image /*= nullptr*/ ) const cString& name /*= sNAME*/, VideoEngine::cImage** image /*= nullptr*/ )
{ {
@@ -39,7 +39,7 @@ cButton::cButton( cWindow* parent, const signed int id, const GUIHelpers::eAlign
} }
/// Functions /// Functions
void cButton::Create( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, void cButton::Create( cWindow* parent, const signed int id, const GUIHelpers::eAlign align /*= sALIGN*/, const GUIHelpers::eLayout layout /*= sLAYOUT*/,
const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::Padding& padding /*= sPADDING*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::Padding& padding /*= sPADDING*/,
const cString& name /*= sNAME*/, VideoEngine::cImage** image /*= nullptr*/ ) const cString& name /*= sNAME*/, VideoEngine::cImage** image /*= nullptr*/ )
{ {
TrooperEngineDLL/TrooperEngine/GUIEngine/cButton.hpp
+2 -2
View File
@@ -30,13 +30,13 @@ namespace GUIEngine {
static const cString sNAME; /*= "button";*/ static const cString sNAME; /*= "button";*/
cButton(); cButton();
cButton( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align = sALIGN, const GUIHelpers::eLayout& layout = sLAYOUT, cButton( cWindow* parent, const signed int id, const GUIHelpers::eAlign align = sALIGN, const GUIHelpers::eLayout layout = sLAYOUT,
const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING,
const cString& name = sNAME, VideoEngine::cImage** image = nullptr ); const cString& name = sNAME, VideoEngine::cImage** image = nullptr );
virtual ~cButton(); virtual ~cButton();
/// Functions /// Functions
void Create( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align = sALIGN, const GUIHelpers::eLayout& layout = sLAYOUT, void Create( cWindow* parent, const signed int id, const GUIHelpers::eAlign align = sALIGN, const GUIHelpers::eLayout layout = sLAYOUT,
const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING,
const cString& name = sNAME, VideoEngine::cImage** image = nullptr ); const cString& name = sNAME, VideoEngine::cImage** image = nullptr );
TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.cpp
+3 -3
View File
@@ -66,7 +66,7 @@ const bool cGUI::Initialize( const cString& filename, const cString& dir /*= ""*
return rtn; return rtn;
} }
void cGUI::Event( const MathEngine::iVector2& location, const eGUIEventType& type ) void cGUI::Event( const MathEngine::iVector2& location, const eGUIEventType type )
{ {
location; location;
type; type;
@@ -154,7 +154,7 @@ void cGUI::setPadding( const unsigned int top /*= 5*/, const unsigned int right
setPadding(GUIHelpers::Padding(top, right, bottom, left)); setPadding(GUIHelpers::Padding(top, right, bottom, left));
} }
void cGUI::setAlign( const GUIHelpers::eAlign& align /*= GUIHelpers::eAlign::CENTER*/ ) void cGUI::setAlign( const GUIHelpers::eAlign align /*= GUIHelpers::eAlign::CENTER*/ )
{ {
//cWindow::sALIGN = align; //cWindow::sALIGN = align;
} }
@@ -196,7 +196,7 @@ void cGUI::getPadding( unsigned int& top, unsigned int& right, unsigned int& bot
// left = cWindow::sPADDING.w; // left = cWindow::sPADDING.w;
} }
const GUIHelpers::eAlign& cGUI::getAlign() const const GUIHelpers::eAlign cGUI::getAlign() const
{ {
/*return cWindow::sALIGN;*/ /*return cWindow::sALIGN;*/
return GUIHelpers::eAlign::CENTER; return GUIHelpers::eAlign::CENTER;
TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.hpp
+3 -3
View File
@@ -43,7 +43,7 @@ namespace GUIEngine {
const bool Initialize( const cString& filename, const cString& dir = "", const unsigned long int size = 16 ); const bool Initialize( const cString& filename, const cString& dir = "", const unsigned long int size = 16 );
void Event( const MathEngine::iVector2& location, const eGUIEventType& type ); void Event( const MathEngine::iVector2& location, const eGUIEventType type );
const MathEngine::iVector2 DisplayArea() const; const MathEngine::iVector2 DisplayArea() const;
void AddObject( GUIEngine::cWindow* obj ); void AddObject( GUIEngine::cWindow* obj );
@@ -64,7 +64,7 @@ namespace GUIEngine {
void setPadding( const GUIHelpers::Padding& padding ); void setPadding( const GUIHelpers::Padding& padding );
void setPadding( const unsigned int top = 5, const unsigned int right = 5, const unsigned int bottom = 5, const unsigned int left = 5 ); void setPadding( const unsigned int top = 5, const unsigned int right = 5, const unsigned int bottom = 5, const unsigned int left = 5 );
void setAlign( const GUIHelpers::eAlign& align = GUIHelpers::eAlign::CENTER ); void setAlign( const GUIHelpers::eAlign align = GUIHelpers::eAlign::CENTER );
/// Gets /// Gets
const unsigned long int getDebugLevel() const; const unsigned long int getDebugLevel() const;
@@ -77,7 +77,7 @@ namespace GUIEngine {
const GUIHelpers::Padding& getPadding() const; const GUIHelpers::Padding& getPadding() const;
void getPadding( unsigned int& top, unsigned int& right, unsigned int& bottom, unsigned int& left ) const; void getPadding( unsigned int& top, unsigned int& right, unsigned int& bottom, unsigned int& left ) const;
const GUIHelpers::eAlign& getAlign() const; const GUIHelpers::eAlign getAlign() const;
const bool IsInit() const; const bool IsInit() const;
TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.cpp
+5 -5
View File
@@ -5,8 +5,8 @@ using GUIEngine::cLabel;
/*static*/ const cString cLabel::sNAME = "label"; /*static*/ const cString cLabel::sNAME = "label";
/*static*/ const GUIHelpers::eLayout cLabel::sLAYOUT = GUIHelpers::eLayout::WRAP_CONTENT; /*static*/ const GUIHelpers::eLayout cLabel::sLAYOUT = GUIHelpers::eLayout::WRAP_CONTENT;
cLabel::cLabel( cWindow* parent, const signed int id, const cString& label /*= ""*/, const GUIHelpers::eAlign& align /*= sALIGN*/, cLabel::cLabel( cWindow* parent, const signed int id, const cString& label /*= ""*/, const GUIHelpers::eAlign align /*= sALIGN*/,
const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::eLayout layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/,
const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ )
{ {
mp_text = new TextTypeEngine::cText(label); mp_text = new TextTypeEngine::cText(label);
@@ -20,8 +20,8 @@ cLabel::cLabel( cWindow* parent, const signed int id, const cString& label /*= "
} }
/// Functions /// Functions
void cLabel::Create( cWindow* parent, const signed int id, const cString& label /*= ""*/, const GUIHelpers::eAlign& align /*= sALIGN*/, void cLabel::Create( cWindow* parent, const signed int id, const cString& label /*= ""*/, const GUIHelpers::eAlign align /*= sALIGN*/,
const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::eLayout layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/,
const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ )
{ {
cWindow::Create(parent, id, sORIENTATION, align, layout, pos, size, padding, name); cWindow::Create(parent, id, sORIENTATION, align, layout, pos, size, padding, name);
@@ -107,7 +107,7 @@ const cString& cLabel::getText() const
// cWindow::RePos(); // cWindow::RePos();
// } // }
/*virtual*/ void cLabel::RebuildLayout( const GUIHelpers::eLayout& layout ) /*virtual*/ void cLabel::RebuildLayout( const GUIHelpers::eLayout layout )
{ {
SetSize(); SetSize();
} }
TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.hpp
+5 -5
View File
@@ -19,14 +19,14 @@ namespace GUIEngine {
static const cString sNAME; /*= "label";*/ static const cString sNAME; /*= "label";*/
static const GUIHelpers::eLayout sLAYOUT;/* = GUIHelpers::eLayout::WRAP_CONTENT;*/ static const GUIHelpers::eLayout sLAYOUT;/* = GUIHelpers::eLayout::WRAP_CONTENT;*/
cLabel( cWindow* parent, const signed int id, const cString& label = "", const GUIHelpers::eAlign& align = sALIGN, cLabel( cWindow* parent, const signed int id, const cString& label = "", const GUIHelpers::eAlign align = sALIGN,
const GUIHelpers::eLayout& layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::eLayout layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE,
const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME );
virtual ~cLabel(); virtual ~cLabel();
/// Functions /// Functions
void Create( cWindow* parent, const signed int id, const cString& label = "", const GUIHelpers::eAlign& align = sALIGN, void Create( cWindow* parent, const signed int id, const cString& label = "", const GUIHelpers::eAlign align = sALIGN,
const GUIHelpers::eLayout& layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::eLayout layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE,
const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME );
virtual void Display(); virtual void Display();
@@ -49,7 +49,7 @@ namespace GUIEngine {
//virtual void Resize(); //virtual void Resize();
virtual void RebuildLayout( const GUIHelpers::eLayout& layout ); virtual void RebuildLayout( const GUIHelpers::eLayout layout );
private: private:
void SetSize(); void SetSize();
TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.cpp
+4 -4
View File
@@ -5,8 +5,8 @@ using GUIEngine::cLayout;
/*static*/ const cString cLayout::sNAME = "layout"; /*static*/ const cString cLayout::sNAME = "layout";
/*static*/ const GUIHelpers::eOrientation cLayout::sORIENTATION = GUIHelpers::eOrientation::VERTICAL; /*static*/ const GUIHelpers::eOrientation cLayout::sORIENTATION = GUIHelpers::eOrientation::VERTICAL;
cLayout::cLayout( cWindow* parent, const signed int id, const GUIHelpers::eOrientation& orientation /*= sORIENTATION*/, const GUIHelpers::eAlign& align /*= sALIGN*/, cLayout::cLayout( cWindow* parent, const signed int id, const GUIHelpers::eOrientation orientation /*= sORIENTATION*/, const GUIHelpers::eAlign align /*= sALIGN*/,
const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::eLayout layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/,
const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ )
{ {
Create(parent, id, orientation, align, layout, pos, size, padding, name); Create(parent, id, orientation, align, layout, pos, size, padding, name);
@@ -16,8 +16,8 @@ cLayout::cLayout( cWindow* parent, const signed int id, const GUIHelpers::eOrien
{} {}
/// Functions /// Functions
/*virtual*/ void cLayout::Create( cWindow* parent, const signed int id, const GUIHelpers::eOrientation& orientation /*= sORIENTATION*/, const GUIHelpers::eAlign& align /*= sALIGN*/, /*virtual*/ void cLayout::Create( cWindow* parent, const signed int id, const GUIHelpers::eOrientation orientation /*= sORIENTATION*/, const GUIHelpers::eAlign align /*= sALIGN*/,
const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::eLayout layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/,
const GUIHelpers::Padding& padding/* = sPADDING*/, const cString& name /*= sNAME*/ ) const GUIHelpers::Padding& padding/* = sPADDING*/, const cString& name /*= sNAME*/ )
{ {
GUIHelpers::eOrientation ori = orientation; GUIHelpers::eOrientation ori = orientation;
TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.hpp
+4 -4
View File
@@ -25,14 +25,14 @@ namespace GUIEngine {
static const cString sNAME; /*= "layout";*/ static const cString sNAME; /*= "layout";*/
static const GUIHelpers::eOrientation sORIENTATION; /*= GUIHelpers::eOrientation::VERTICAL;*/ static const GUIHelpers::eOrientation sORIENTATION; /*= GUIHelpers::eOrientation::VERTICAL;*/
cLayout( cWindow* parent = nullptr, const signed int id = -1, const GUIHelpers::eOrientation& orientation = sORIENTATION, const GUIHelpers::eAlign& align = sALIGN, cLayout( cWindow* parent = nullptr, const signed int id = -1, const GUIHelpers::eOrientation orientation = sORIENTATION, const GUIHelpers::eAlign align = sALIGN,
const GUIHelpers::eLayout& layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::eLayout layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE,
const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME );
virtual ~cLayout(); virtual ~cLayout();
/// Functions /// Functions
virtual void Create( cWindow* parent, const signed int id, const GUIHelpers::eOrientation& orientation = sORIENTATION, const GUIHelpers::eAlign& align = sALIGN, virtual void Create( cWindow* parent, const signed int id, const GUIHelpers::eOrientation orientation = sORIENTATION, const GUIHelpers::eAlign align = sALIGN,
const GUIHelpers::eLayout& layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::eLayout layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE,
const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME );
virtual void Display(); virtual void Display();
TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.cpp
+4 -4
View File
@@ -5,8 +5,8 @@ using GUIEngine::cPanel;
/*static*/ const UtilityEngine::cString cPanel::sNAME = "panel"; /*static*/ const UtilityEngine::cString cPanel::sNAME = "panel";
cPanel::cPanel( cWindow* parent /*= nullptr*/, const signed int id /*= -1*/, const GUIHelpers::eOrientation& orientation /*= sORIENTATION*/, const GUIHelpers::eAlign& align /*= sALIGN*/, cPanel::cPanel( cWindow* parent /*= nullptr*/, const signed int id /*= -1*/, const GUIHelpers::eOrientation orientation /*= sORIENTATION*/, const GUIHelpers::eAlign align /*= sALIGN*/,
const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::eLayout layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/,
const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ )
{ {
Create( parent, id, orientation, align, layout, pos, size, padding, name ); Create( parent, id, orientation, align, layout, pos, size, padding, name );
@@ -16,8 +16,8 @@ cPanel::cPanel( cWindow* parent /*= nullptr*/, const signed int id /*= -1*/, con
{} {}
/// Functions /// Functions
/*virtual*/ void cPanel::Create( cWindow* parent /*= nullptr*/, const signed int id /*= -1*/, const GUIHelpers::eOrientation& orientation /*= sORIENTATION*/, const GUIHelpers::eAlign& align /*= sALIGN*/, /*virtual*/ void cPanel::Create( cWindow* parent /*= nullptr*/, const signed int id /*= -1*/, const GUIHelpers::eOrientation orientation /*= sORIENTATION*/, const GUIHelpers::eAlign align /*= sALIGN*/,
const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::eLayout layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/,
const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ )
{ {
padding; padding;
TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.hpp
+4 -4
View File
@@ -20,14 +20,14 @@ namespace GUIEngine {
static const UtilityEngine::cString sNAME; /*= "panel";*/ static const UtilityEngine::cString sNAME; /*= "panel";*/
public: public:
cPanel( cWindow* parent = nullptr, const signed int id = -1, const GUIHelpers::eOrientation& orientation = sORIENTATION, const GUIHelpers::eAlign& align = sALIGN, cPanel( cWindow* parent = nullptr, const signed int id = -1, const GUIHelpers::eOrientation orientation = sORIENTATION, const GUIHelpers::eAlign align = sALIGN,
const GUIHelpers::eLayout& layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::eLayout layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE,
const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME );
virtual ~cPanel(); virtual ~cPanel();
/// Functions /// Functions
virtual void Create( cWindow* parent = nullptr, const signed int id = -1, const GUIHelpers::eOrientation& orientation = sORIENTATION, const GUIHelpers::eAlign& align = sALIGN, virtual void Create( cWindow* parent = nullptr, const signed int id = -1, const GUIHelpers::eOrientation orientation = sORIENTATION, const GUIHelpers::eAlign align = sALIGN,
const GUIHelpers::eLayout& layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::eLayout layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE,
const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME );
virtual void Display(); virtual void Display();
TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.cpp
+2 -2
View File
@@ -5,7 +5,7 @@ using GUIEngine::cSizer;
/*static*/ const cString cSizer::sNAME = "sizer"; /*static*/ const cString cSizer::sNAME = "sizer";
/*static*/ GUIHelpers::Size cSizer::sSIZE = { 5, 5 }; /*static*/ GUIHelpers::Size cSizer::sSIZE = { 5, 5 };
cSizer::cSizer( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, cSizer::cSizer( cWindow* parent, const signed int id, const GUIHelpers::eAlign align /*= sALIGN*/, const GUIHelpers::eLayout layout /*= sLAYOUT*/,
const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::Padding& padding /*= sPADDING*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::Padding& padding /*= sPADDING*/,
const cString& name /*= sNAME*/ ) const cString& name /*= sNAME*/ )
{ {
@@ -16,7 +16,7 @@ cSizer::cSizer( cWindow* parent, const signed int id, const GUIHelpers::eAlign&
{} {}
/// Functions /// Functions
void cSizer::Create( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, void cSizer::Create( cWindow* parent, const signed int id, const GUIHelpers::eAlign align /*= sALIGN*/, const GUIHelpers::eLayout layout /*= sLAYOUT*/,
const GUIHelpers::Position& pos/* = sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::Padding& padding /*= sPADDING*/, const GUIHelpers::Position& pos/* = sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::Padding& padding /*= sPADDING*/,
const cString& name /*= sNAME*/ ) const cString& name /*= sNAME*/ )
{ {
TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.hpp
+2 -2
View File
@@ -26,13 +26,13 @@ namespace GUIEngine {
static const cString sNAME; /*= "sizer";*/ static const cString sNAME; /*= "sizer";*/
static GUIHelpers::Size sSIZE; /*= { 5, 5 }*/ static GUIHelpers::Size sSIZE; /*= { 5, 5 }*/
cSizer( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align = sALIGN, const GUIHelpers::eLayout& layout = sLAYOUT, cSizer( cWindow* parent, const signed int id, const GUIHelpers::eAlign align = sALIGN, const GUIHelpers::eLayout layout = sLAYOUT,
const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING,
const cString& name = sNAME ); const cString& name = sNAME );
virtual ~cSizer(); virtual ~cSizer();
/// Functions /// Functions
void Create( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align = sALIGN, const GUIHelpers::eLayout& layout = sLAYOUT, void Create( cWindow* parent, const signed int id, const GUIHelpers::eAlign align = sALIGN, const GUIHelpers::eLayout layout = sLAYOUT,
const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING,
const cString& name = sNAME ); const cString& name = sNAME );
TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.cpp
+4 -4
View File
@@ -4,8 +4,8 @@ using GUIEngine::cTextButton;
/*static*/ const cString cTextButton::sNAME = "textButton"; /*static*/ const cString cTextButton::sNAME = "textButton";
cTextButton::cTextButton( cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign& align /*= GUIHelpers::eAlign::CENTER*/, cTextButton::cTextButton( cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign align /*= GUIHelpers::eAlign::CENTER*/,
const GUIHelpers::eLayout& layout /*= GUIHelpers::eLayout::FILL_PARENT*/, const GUIHelpers::Position& pos /*= POSITION*/, const GUIHelpers::eLayout layout /*= GUIHelpers::eLayout::FILL_PARENT*/, const GUIHelpers::Position& pos /*= POSITION*/,
const GUIHelpers::Size& size /*= SIZE*/, const GUIHelpers::Padding& padding /*= PADDING*/, const cString& name /*= NAME*/ ) const GUIHelpers::Size& size /*= SIZE*/, const GUIHelpers::Padding& padding /*= PADDING*/, const cString& name /*= NAME*/ )
: m_label(this, -1, text) : m_label(this, -1, text)
{ {
@@ -16,8 +16,8 @@ cTextButton::cTextButton( cWindow* parent, const signed int id, const cString& t
{} {}
///Functions ///Functions
void cTextButton::Create( cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign& align /*= GUIHelpers::eAlign::CENTER*/, void cTextButton::Create( cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign align /*= GUIHelpers::eAlign::CENTER*/,
const GUIHelpers::eLayout& layout /*= GUIHelpers::eLayout::FILL_PARENT*/, const GUIHelpers::Position& pos /*= POSITION*/, const GUIHelpers::eLayout layout /*= GUIHelpers::eLayout::FILL_PARENT*/, const GUIHelpers::Position& pos /*= POSITION*/,
const GUIHelpers::Size& size /*= SIZE*/, const GUIHelpers::Padding& padding /*= PADDING*/, const cString& name /*= NAME*/ ) const GUIHelpers::Size& size /*= SIZE*/, const GUIHelpers::Padding& padding /*= PADDING*/, const cString& name /*= NAME*/ )
{ {
cButton::Create(parent, id, align, layout, pos, size, padding, name); cButton::Create(parent, id, align, layout, pos, size, padding, name);
TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.hpp
+4 -4
View File
@@ -28,14 +28,14 @@ namespace GUIEngine {
public: public:
static const cString sNAME; /*= "button";*/ static const cString sNAME; /*= "button";*/
cTextButton( cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign& align = GUIHelpers::eAlign::CENTER, cTextButton( cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign align = GUIHelpers::eAlign::CENTER,
const GUIHelpers::eLayout& layout = GUIHelpers::eLayout::FILL_PARENT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::eLayout layout = GUIHelpers::eLayout::FILL_PARENT, const GUIHelpers::Position& pos = sPOSITION,
const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME );
virtual ~cTextButton(); virtual ~cTextButton();
/// Functions /// Functions
void Create( cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign& align = GUIHelpers::eAlign::CENTER, void Create( cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign align = GUIHelpers::eAlign::CENTER,
const GUIHelpers::eLayout& layout = GUIHelpers::eLayout::FILL_PARENT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::eLayout layout = GUIHelpers::eLayout::FILL_PARENT, const GUIHelpers::Position& pos = sPOSITION,
const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME );
/// Sets /// Sets