cWindows removed Ref from enum gets and sets
This commit is contained in:
@@ -32,16 +32,16 @@ namespace GUIEngine {
|
||||
static GUIHelpers::eOrientation sORIENTATION; /*= GUIHelpers::eOrientation::NONE;*/
|
||||
|
||||
protected:
|
||||
cWindow( 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,
|
||||
cWindow( 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 );
|
||||
|
||||
public:
|
||||
virtual ~cWindow();
|
||||
|
||||
protected:
|
||||
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 );
|
||||
|
||||
public:
|
||||
@@ -58,13 +58,13 @@ namespace GUIEngine {
|
||||
static void PositionDefault( const GUIHelpers::Position& pos );
|
||||
static void SizeDefault( const GUIHelpers::Size& size );
|
||||
static void PaddingDefault( const GUIHelpers::Padding& pad );
|
||||
static void AlignDefault( const GUIHelpers::eAlign& align );
|
||||
static void LayoutDefault( const GUIHelpers::eLayout& layout );
|
||||
static void OrientationDefault( const GUIHelpers::eOrientation& orientation );
|
||||
static void AlignDefault( const GUIHelpers::eAlign align );
|
||||
static void LayoutDefault( const GUIHelpers::eLayout layout );
|
||||
static void OrientationDefault( const GUIHelpers::eOrientation orientation );
|
||||
|
||||
void setOrientation( const GUIHelpers::eOrientation& orientation = sORIENTATION );
|
||||
void setAlign( const GUIHelpers::eAlign& align = sALIGN );
|
||||
void setLayout( const GUIHelpers::eLayout& layout = sLAYOUT );
|
||||
void setOrientation( const GUIHelpers::eOrientation orientation = sORIENTATION );
|
||||
void setAlign( const GUIHelpers::eAlign align = sALIGN );
|
||||
void setLayout( const GUIHelpers::eLayout layout = sLAYOUT );
|
||||
void setPosition( const GUIHelpers::Position& pos = sPOSITION );
|
||||
void setSize( const GUIHelpers::Size& size = sSIZE );
|
||||
void setPadding( const GUIHelpers::Padding& padding = sPADDING );
|
||||
@@ -76,9 +76,9 @@ namespace GUIEngine {
|
||||
/// Gets
|
||||
const GUIHelpers::Position getCenter( const bool pad = true ) const;
|
||||
|
||||
const GUIHelpers::eOrientation& getOrientation() const;
|
||||
const GUIHelpers::eAlign& getAlign() const;
|
||||
const GUIHelpers::eLayout& getLayout() const;
|
||||
const GUIHelpers::eOrientation getOrientation() const;
|
||||
const GUIHelpers::eAlign getAlign() const;
|
||||
const GUIHelpers::eLayout getLayout() const;
|
||||
const GUIHelpers::Position getPosition( const bool pad = true ) const;
|
||||
const GUIHelpers::Size getSize( const bool pad = true ) const;
|
||||
const GUIHelpers::Padding& getPadding() const;
|
||||
@@ -94,7 +94,7 @@ namespace GUIEngine {
|
||||
virtual const GUIHelpers::eType getType() const;
|
||||
|
||||
virtual void Resize();
|
||||
virtual void RebuildLayout( const GUIHelpers::eLayout& layout );
|
||||
virtual void RebuildLayout( const GUIHelpers::eLayout layout );
|
||||
|
||||
virtual void RePos();
|
||||
virtual void RebuildPos();
|
||||
@@ -105,7 +105,7 @@ namespace GUIEngine {
|
||||
std::vector<cWindow*>& getChildren();
|
||||
|
||||
private:
|
||||
void Rebuild( cWindow* const parent, const GUIHelpers::eLayout& layout );
|
||||
void Rebuild( cWindow* const parent, const GUIHelpers::eLayout layout );
|
||||
|
||||
void AddSize( const int x, const int y, GUIHelpers::Size& mySize ) const;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user