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

30
source/Irrlicht/CGUIWindow.h
View File

@@ -27,50 +27,50 @@ namespace gui
virtual ~CGUIWindow();
//! called if an event happened.
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_;
virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
//! update absolute position
virtual void updateAbsolutePosition() _IRR_OVERRIDE_;
virtual void updateAbsolutePosition() IRR_OVERRIDE;
//! draws the element and its children
virtual void draw() _IRR_OVERRIDE_;
virtual void draw() IRR_OVERRIDE;
//! Returns pointer to the close button
virtual IGUIButton* getCloseButton() const _IRR_OVERRIDE_;
virtual IGUIButton* getCloseButton() const IRR_OVERRIDE;
//! Returns pointer to the minimize button
virtual IGUIButton* getMinimizeButton() const _IRR_OVERRIDE_;
virtual IGUIButton* getMinimizeButton() const IRR_OVERRIDE;
//! Returns pointer to the maximize button
virtual IGUIButton* getMaximizeButton() const _IRR_OVERRIDE_;
virtual IGUIButton* getMaximizeButton() const IRR_OVERRIDE;
//! Returns true if the window is draggable, false if not
virtual bool isDraggable() const _IRR_OVERRIDE_;
virtual bool isDraggable() const IRR_OVERRIDE;
//! Sets whether the window is draggable
virtual void setDraggable(bool draggable) _IRR_OVERRIDE_;
virtual void setDraggable(bool draggable) IRR_OVERRIDE;
//! Set if the window background will be drawn
virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_;
virtual void setDrawBackground(bool draw) IRR_OVERRIDE;
//! Get if the window background will be drawn
virtual bool getDrawBackground() const _IRR_OVERRIDE_;
virtual bool getDrawBackground() const IRR_OVERRIDE;
//! Set if the window titlebar will be drawn
//! Note: If the background is not drawn, then the titlebar is automatically also not drawn
virtual void setDrawTitlebar(bool draw) _IRR_OVERRIDE_;
virtual void setDrawTitlebar(bool draw) IRR_OVERRIDE;
//! Get if the window titlebar will be drawn
virtual bool getDrawTitlebar() const _IRR_OVERRIDE_;
virtual bool getDrawTitlebar() const IRR_OVERRIDE;
//! Returns the rectangle of the drawable area (without border and without titlebar)
virtual core::rect<s32> getClientRect() const _IRR_OVERRIDE_;
virtual core::rect<s32> getClientRect() 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;
protected: