From 05ffe20bb47bf10b96fbfc8dc7500354cbe4d2a2 Mon Sep 17 00:00:00 2001 From: Richard Allen Date: Thu, 30 Aug 2018 11:50:19 -0400 Subject: [PATCH] remove Refrens from GUI enum --- TrooperEngineDLL/TrooperEngine/GUIEngine/cButton.cpp | 4 ++-- TrooperEngineDLL/TrooperEngine/GUIEngine/cButton.hpp | 4 ++-- TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.cpp | 6 +++--- TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.hpp | 6 +++--- TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.cpp | 10 +++++----- TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.hpp | 10 +++++----- TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.cpp | 8 ++++---- TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.hpp | 8 ++++---- TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.cpp | 8 ++++---- TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.hpp | 8 ++++---- TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.cpp | 4 ++-- TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.hpp | 4 ++-- .../TrooperEngine/GUIEngine/cTextButton.cpp | 8 ++++---- .../TrooperEngine/GUIEngine/cTextButton.hpp | 8 ++++---- 14 files changed, 48 insertions(+), 48 deletions(-) diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cButton.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cButton.cpp index e33dfd7..841f330 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cButton.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cButton.cpp @@ -15,7 +15,7 @@ using MathEngine::iVector4; 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 cString& name /*= sNAME*/, VideoEngine::cImage** image /*= nullptr*/ ) { @@ -39,7 +39,7 @@ cButton::cButton( cWindow* parent, const signed int id, const GUIHelpers::eAlign } /// 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 cString& name /*= sNAME*/, VideoEngine::cImage** image /*= nullptr*/ ) { diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cButton.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cButton.hpp index faabce4..60e2c51 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cButton.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cButton.hpp @@ -30,13 +30,13 @@ namespace GUIEngine { static const cString sNAME; /*= "button";*/ 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 cString& name = sNAME, VideoEngine::cImage** image = nullptr ); virtual ~cButton(); /// 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 cString& name = sNAME, VideoEngine::cImage** image = nullptr ); diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.cpp index 230a9fc..bdfd669 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.cpp @@ -66,7 +66,7 @@ const bool cGUI::Initialize( const cString& filename, const cString& dir /*= ""* return rtn; } -void cGUI::Event( const MathEngine::iVector2& location, const eGUIEventType& type ) +void cGUI::Event( const MathEngine::iVector2& location, const eGUIEventType type ) { location; type; @@ -154,7 +154,7 @@ void cGUI::setPadding( const unsigned int top /*= 5*/, const unsigned int right 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; } @@ -196,7 +196,7 @@ void cGUI::getPadding( unsigned int& top, unsigned int& right, unsigned int& bot // left = cWindow::sPADDING.w; } -const GUIHelpers::eAlign& cGUI::getAlign() const +const GUIHelpers::eAlign cGUI::getAlign() const { /*return cWindow::sALIGN;*/ return GUIHelpers::eAlign::CENTER; diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.hpp index b1c5832..18e96f6 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.hpp @@ -43,7 +43,7 @@ namespace GUIEngine { 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; void AddObject( GUIEngine::cWindow* obj ); @@ -64,7 +64,7 @@ namespace GUIEngine { 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 setAlign( const GUIHelpers::eAlign& align = GUIHelpers::eAlign::CENTER ); + void setAlign( const GUIHelpers::eAlign align = GUIHelpers::eAlign::CENTER ); /// Gets const unsigned long int getDebugLevel() const; @@ -77,7 +77,7 @@ namespace GUIEngine { const GUIHelpers::Padding& getPadding() 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; diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.cpp index 9695bf4..7aa1555 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.cpp @@ -5,8 +5,8 @@ using GUIEngine::cLabel; /*static*/ const cString cLabel::sNAME = "label"; /*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*/, - const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, +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::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) { mp_text = new TextTypeEngine::cText(label); @@ -20,8 +20,8 @@ cLabel::cLabel( cWindow* parent, const signed int id, const cString& label /*= " } /// Functions -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*/, +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::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) { cWindow::Create(parent, id, sORIENTATION, align, layout, pos, size, padding, name); @@ -107,7 +107,7 @@ const cString& cLabel::getText() const // cWindow::RePos(); // } -/*virtual*/ void cLabel::RebuildLayout( const GUIHelpers::eLayout& layout ) +/*virtual*/ void cLabel::RebuildLayout( const GUIHelpers::eLayout layout ) { SetSize(); } diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.hpp index 4e9c1ec..ed8ff29 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.hpp @@ -19,14 +19,14 @@ namespace GUIEngine { static const cString sNAME; /*= "label";*/ static const GUIHelpers::eLayout sLAYOUT;/* = GUIHelpers::eLayout::WRAP_CONTENT;*/ - 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, + 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::Padding& padding = sPADDING, const cString& name = sNAME ); virtual ~cLabel(); /// Functions - 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, + 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::Padding& padding = sPADDING, const cString& name = sNAME ); virtual void Display(); @@ -49,7 +49,7 @@ namespace GUIEngine { //virtual void Resize(); - virtual void RebuildLayout( const GUIHelpers::eLayout& layout ); + virtual void RebuildLayout( const GUIHelpers::eLayout layout ); private: void SetSize(); diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.cpp index 3a1ba41..fbfa944 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.cpp @@ -5,8 +5,8 @@ using GUIEngine::cLayout; /*static*/ const cString cLayout::sNAME = "layout"; /*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*/, - const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, +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::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) { 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 -/*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*/, +/*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::Padding& padding/* = sPADDING*/, const cString& name /*= sNAME*/ ) { GUIHelpers::eOrientation ori = orientation; diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.hpp index c069489..4f1e0ea 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.hpp @@ -25,14 +25,14 @@ namespace GUIEngine { static const cString sNAME; /*= "layout";*/ 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, - const GUIHelpers::eLayout& layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, + 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::Padding& padding = sPADDING, const cString& name = sNAME ); virtual ~cLayout(); /// Functions - 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, + 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::Padding& padding = sPADDING, const cString& name = sNAME ); virtual void Display(); diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.cpp index a316033..fa6f6fc 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.cpp @@ -5,8 +5,8 @@ using GUIEngine::cPanel; /*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*/, - const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, +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::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) { 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 -/*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*/, +/*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::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) { padding; diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.hpp index ccce257..9efc92d 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.hpp @@ -20,14 +20,14 @@ namespace GUIEngine { static const UtilityEngine::cString sNAME; /*= "panel";*/ public: - 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, + 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::Padding& padding = sPADDING, const cString& name = sNAME ); virtual ~cPanel(); /// Functions - 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, + 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::Padding& padding = sPADDING, const cString& name = sNAME ); virtual void Display(); diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.cpp index d98113f..8d6b7f6 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.cpp @@ -5,7 +5,7 @@ using GUIEngine::cSizer; /*static*/ const cString cSizer::sNAME = "sizer"; /*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 cString& name /*= sNAME*/ ) { @@ -16,7 +16,7 @@ cSizer::cSizer( cWindow* parent, const signed int id, const GUIHelpers::eAlign& {} /// 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 cString& name /*= sNAME*/ ) { diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.hpp index 0931571..bcfefaa 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.hpp @@ -26,13 +26,13 @@ namespace GUIEngine { static const cString sNAME; /*= "sizer";*/ 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 cString& name = sNAME ); virtual ~cSizer(); /// 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 cString& name = sNAME ); diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.cpp index 930bc93..a2880a9 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.cpp @@ -4,8 +4,8 @@ using GUIEngine::cTextButton; /*static*/ const cString cTextButton::sNAME = "textButton"; -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*/, +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::Size& size /*= SIZE*/, const GUIHelpers::Padding& padding /*= PADDING*/, const cString& name /*= NAME*/ ) : m_label(this, -1, text) { @@ -16,8 +16,8 @@ cTextButton::cTextButton( cWindow* parent, const signed int id, const cString& t {} ///Functions -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*/, +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::Size& size /*= SIZE*/, const GUIHelpers::Padding& padding /*= PADDING*/, const cString& name /*= NAME*/ ) { cButton::Create(parent, id, align, layout, pos, size, padding, name); diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.hpp index 2e49ba8..c959c64 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.hpp @@ -28,14 +28,14 @@ namespace GUIEngine { public: static const cString sNAME; /*= "button";*/ - 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, + 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::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); virtual ~cTextButton(); /// Functions - 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, + 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::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); /// Sets