luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

API BREAKER: Replacing defines in irrTypes.h which are conflicting with c++ reserved identifier rules.

Browse Source 
C++ has undefined behavior for identifiers starting with __ or with _ followed by an uppercase letter.
We still have many more (in IrrCompileConfig.h and in all header-guards), will likely replace those later as well.
As a workaround for users which might use irrlicht defines in their code, I've added the header irrLegacyDefines.h
Including that allows to continue using old defines for a while - or make it easier to have code which compiles 
with old and new Irrlicht library versions.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6251 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 12:55:10 +00:00
parent ee180dbd24
commit ffd7b63af0
289 changed files with 3401 additions and 3379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
source/Irrlicht/CGUIStaticText.h
View File

@@ -28,78 +28,78 @@ namespace gui
virtual ~CGUIStaticText();
//! draws the element and its children
virtual void draw() _IRR_OVERRIDE_;
virtual void draw() IRR_OVERRIDE;
//! Sets another skin independent font.
virtual void setOverrideFont(IGUIFont* font=0) _IRR_OVERRIDE_;
virtual void setOverrideFont(IGUIFont* font=0) IRR_OVERRIDE;
//! Gets the override font (if any)
virtual IGUIFont* getOverrideFont() const _IRR_OVERRIDE_;
virtual IGUIFont* getOverrideFont() const IRR_OVERRIDE;
//! Get the font which is used right now for drawing
virtual IGUIFont* getActiveFont() const _IRR_OVERRIDE_;
virtual IGUIFont* getActiveFont() const IRR_OVERRIDE;
//! Sets another color for the text.
virtual void setOverrideColor(video::SColor color) _IRR_OVERRIDE_;
virtual void setOverrideColor(video::SColor color) IRR_OVERRIDE;
//! Sets another color for the background.
virtual void setBackgroundColor(video::SColor color) _IRR_OVERRIDE_;
virtual void setBackgroundColor(video::SColor color) IRR_OVERRIDE;
//! Sets whether to draw the background
virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_;
virtual void setDrawBackground(bool draw) IRR_OVERRIDE;
//! Gets the background color
virtual video::SColor getBackgroundColor() const _IRR_OVERRIDE_;
virtual video::SColor getBackgroundColor() const IRR_OVERRIDE;
//! Checks if background drawing is enabled
virtual bool isDrawBackgroundEnabled() const _IRR_OVERRIDE_;
virtual bool isDrawBackgroundEnabled() const IRR_OVERRIDE;
//! Sets whether to draw the border
virtual void setDrawBorder(bool draw) _IRR_OVERRIDE_;
virtual void setDrawBorder(bool draw) IRR_OVERRIDE;
//! Checks if border drawing is enabled
virtual bool isDrawBorderEnabled() const _IRR_OVERRIDE_;
virtual bool isDrawBorderEnabled() const IRR_OVERRIDE;
//! Sets alignment mode for text
virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) _IRR_OVERRIDE_;
virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) IRR_OVERRIDE;
//! Gets the override color
virtual video::SColor getOverrideColor() const _IRR_OVERRIDE_;
virtual video::SColor getOverrideColor() const IRR_OVERRIDE;
//! Gets the currently used text color
virtual video::SColor getActiveColor() const _IRR_OVERRIDE_;
virtual video::SColor getActiveColor() const IRR_OVERRIDE;
//! Sets if the static text should use the override color or the
//! color in the gui skin.
virtual void enableOverrideColor(bool enable) _IRR_OVERRIDE_;
virtual void enableOverrideColor(bool enable) IRR_OVERRIDE;
//! Checks if an override color is enabled
virtual bool isOverrideColorEnabled() const _IRR_OVERRIDE_;
virtual bool isOverrideColorEnabled() const IRR_OVERRIDE;
//! Set whether the text in this label should be clipped if it goes outside bounds
virtual void setTextRestrainedInside(bool restrainedInside) _IRR_OVERRIDE_;
virtual void setTextRestrainedInside(bool restrainedInside) IRR_OVERRIDE;
//! Checks if the text in this label should be clipped if it goes outside bounds
virtual bool isTextRestrainedInside() const _IRR_OVERRIDE_;
virtual bool isTextRestrainedInside() const IRR_OVERRIDE;
//! Enables or disables word wrap for using the static text as
//! multiline text control.
virtual void setWordWrap(bool enable) _IRR_OVERRIDE_;
virtual void setWordWrap(bool enable) IRR_OVERRIDE;
//! Checks if word wrap is enabled
virtual bool isWordWrapEnabled() const _IRR_OVERRIDE_;
virtual bool isWordWrapEnabled() const IRR_OVERRIDE;
//! Sets the new caption of this element.
virtual void setText(const wchar_t* text) _IRR_OVERRIDE_;
virtual void setText(const wchar_t* text) IRR_OVERRIDE;
//! Returns the height of the text in pixels when it is drawn.
virtual s32 getTextHeight() const _IRR_OVERRIDE_;
virtual s32 getTextHeight() const IRR_OVERRIDE;
//! Returns the width of the current text, in the current font
virtual s32 getTextWidth() const _IRR_OVERRIDE_;
virtual s32 getTextWidth() const IRR_OVERRIDE;
//! Updates the absolute position, splits text if word wrap is enabled
virtual void updateAbsolutePosition() _IRR_OVERRIDE_;
virtual void updateAbsolutePosition() IRR_OVERRIDE;
//! Set whether the string should be interpreted as right-to-left (RTL) text
/** \note This component does not implement the Unicode bidi standard, the
@@ -107,16 +107,16 @@ namespace gui
main difference when RTL is enabled is that the linebreaks for multiline
elements are performed starting from the end.
*/
virtual void setRightToLeft(bool rtl) _IRR_OVERRIDE_;
virtual void setRightToLeft(bool rtl) IRR_OVERRIDE;
//! Checks if the text should be interpreted as right-to-left text
virtual bool isRightToLeft() const _IRR_OVERRIDE_;
virtual bool isRightToLeft() const IRR_OVERRIDE;
//! Writes attributes of the element.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_;
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
//! Reads attributes of the element
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_;
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
private: