mirror of
https://github.com/minetest/irrlicht.git
synced 2025-09-05 08:05:36 +02:00
API BREAKER: Replacing defines in irrTypes.h which are conflicting with c++ reserved identifier rules.
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
@ -30,30 +30,30 @@ namespace gui
|
||||
s32 id);
|
||||
|
||||
//! draws the element and its children
|
||||
virtual void draw() _IRR_OVERRIDE_;
|
||||
virtual void draw() IRR_OVERRIDE;
|
||||
|
||||
//! sets if the tab should draw its background
|
||||
virtual void setDrawBackground(bool draw=true) _IRR_OVERRIDE_;
|
||||
virtual void setDrawBackground(bool draw=true) IRR_OVERRIDE;
|
||||
|
||||
//! sets the color of the background, if it should be drawn.
|
||||
virtual void setBackgroundColor(video::SColor c) _IRR_OVERRIDE_;
|
||||
virtual void setBackgroundColor(video::SColor c) IRR_OVERRIDE;
|
||||
|
||||
//! sets the color of the text
|
||||
virtual void setTextColor(video::SColor c) _IRR_OVERRIDE_;
|
||||
virtual void setTextColor(video::SColor c) IRR_OVERRIDE;
|
||||
|
||||
//! returns true if the tab is drawing its background, false if not
|
||||
virtual bool isDrawingBackground() const _IRR_OVERRIDE_;
|
||||
virtual bool isDrawingBackground() const IRR_OVERRIDE;
|
||||
|
||||
//! returns the color of the background
|
||||
virtual video::SColor getBackgroundColor() const _IRR_OVERRIDE_;
|
||||
virtual video::SColor getBackgroundColor() const IRR_OVERRIDE;
|
||||
|
||||
virtual video::SColor getTextColor() const _IRR_OVERRIDE_;
|
||||
virtual video::SColor getTextColor() 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:
|
||||
|
||||
@ -78,87 +78,87 @@ namespace gui
|
||||
virtual ~CGUITabControl();
|
||||
|
||||
//! Adds a tab
|
||||
virtual IGUITab* addTab(const wchar_t* caption, s32 id=-1) _IRR_OVERRIDE_;
|
||||
virtual IGUITab* addTab(const wchar_t* caption, s32 id=-1) IRR_OVERRIDE;
|
||||
|
||||
//! Adds an existing tab
|
||||
virtual s32 addTab(IGUITab* tab) _IRR_OVERRIDE_;
|
||||
virtual s32 addTab(IGUITab* tab) IRR_OVERRIDE;
|
||||
|
||||
//! Insert the tab at the given index
|
||||
virtual IGUITab* insertTab(s32 idx, const wchar_t* caption, s32 id=-1) _IRR_OVERRIDE_;
|
||||
virtual IGUITab* insertTab(s32 idx, const wchar_t* caption, s32 id=-1) IRR_OVERRIDE;
|
||||
|
||||
//! Insert an existing tab
|
||||
/** Note that it will also add the tab as a child of this TabControl.
|
||||
\return Index of added tab (should be same as the one passed) or -1 for failure*/
|
||||
virtual s32 insertTab(s32 idx, IGUITab* tab, bool serializationMode) _IRR_OVERRIDE_;
|
||||
virtual s32 insertTab(s32 idx, IGUITab* tab, bool serializationMode) IRR_OVERRIDE;
|
||||
|
||||
//! Removes a tab from the tabcontrol
|
||||
virtual void removeTab(s32 idx) _IRR_OVERRIDE_;
|
||||
virtual void removeTab(s32 idx) IRR_OVERRIDE;
|
||||
|
||||
//! Clears the tabcontrol removing all tabs
|
||||
virtual void clear() _IRR_OVERRIDE_;
|
||||
virtual void clear() IRR_OVERRIDE;
|
||||
|
||||
//! Returns amount of tabs in the tabcontrol
|
||||
virtual s32 getTabCount() const _IRR_OVERRIDE_;
|
||||
virtual s32 getTabCount() const IRR_OVERRIDE;
|
||||
|
||||
//! Returns a tab based on zero based index
|
||||
virtual IGUITab* getTab(s32 idx) const _IRR_OVERRIDE_;
|
||||
virtual IGUITab* getTab(s32 idx) const IRR_OVERRIDE;
|
||||
|
||||
//! Brings a tab to front.
|
||||
virtual bool setActiveTab(s32 idx) _IRR_OVERRIDE_;
|
||||
virtual bool setActiveTab(s32 idx) IRR_OVERRIDE;
|
||||
|
||||
//! Brings a tab to front.
|
||||
virtual bool setActiveTab(IGUITab *tab) _IRR_OVERRIDE_;
|
||||
virtual bool setActiveTab(IGUITab *tab) IRR_OVERRIDE;
|
||||
|
||||
//! For given given tab find it's zero-based index (or -1 for not found)
|
||||
virtual s32 getTabIndex(const IGUIElement *tab) const _IRR_OVERRIDE_;
|
||||
virtual s32 getTabIndex(const IGUIElement *tab) const IRR_OVERRIDE;
|
||||
|
||||
//! Returns which tab is currently active
|
||||
virtual s32 getActiveTab() const _IRR_OVERRIDE_;
|
||||
virtual s32 getActiveTab() const IRR_OVERRIDE;
|
||||
|
||||
//! get the the id of the tab at the given absolute coordinates
|
||||
virtual s32 getTabAt(s32 xpos, s32 ypos) const _IRR_OVERRIDE_;
|
||||
virtual s32 getTabAt(s32 xpos, s32 ypos) const IRR_OVERRIDE;
|
||||
|
||||
//! called if an event happened.
|
||||
virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_;
|
||||
virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE;
|
||||
|
||||
//! draws the element and its children
|
||||
virtual void draw() _IRR_OVERRIDE_;
|
||||
virtual void draw() IRR_OVERRIDE;
|
||||
|
||||
//! Removes a child.
|
||||
virtual void removeChild(IGUIElement* child) _IRR_OVERRIDE_;
|
||||
virtual void removeChild(IGUIElement* child) 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;
|
||||
//! Set the height of the tabs
|
||||
virtual void setTabHeight( s32 height ) _IRR_OVERRIDE_;
|
||||
virtual void setTabHeight( s32 height ) 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;
|
||||
|
||||
//! Get the height of the tabs
|
||||
virtual s32 getTabHeight() const _IRR_OVERRIDE_;
|
||||
virtual s32 getTabHeight() const IRR_OVERRIDE;
|
||||
|
||||
//! set the maximal width of a tab. Per default width is 0 which means "no width restriction".
|
||||
virtual void setTabMaxWidth(s32 width ) _IRR_OVERRIDE_;
|
||||
virtual void setTabMaxWidth(s32 width ) IRR_OVERRIDE;
|
||||
|
||||
//! get the maximal width of a tab
|
||||
virtual s32 getTabMaxWidth() const _IRR_OVERRIDE_;
|
||||
virtual s32 getTabMaxWidth() const IRR_OVERRIDE;
|
||||
|
||||
//! Set the alignment of the tabs
|
||||
//! note: EGUIA_CENTER is not an option
|
||||
virtual void setTabVerticalAlignment( gui::EGUI_ALIGNMENT alignment ) _IRR_OVERRIDE_;
|
||||
virtual void setTabVerticalAlignment( gui::EGUI_ALIGNMENT alignment ) IRR_OVERRIDE;
|
||||
|
||||
//! Get the alignment of the tabs
|
||||
virtual gui::EGUI_ALIGNMENT getTabVerticalAlignment() const _IRR_OVERRIDE_;
|
||||
virtual gui::EGUI_ALIGNMENT getTabVerticalAlignment() const IRR_OVERRIDE;
|
||||
|
||||
//! Set the extra width added to tabs on each side of the text
|
||||
virtual void setTabExtraWidth( s32 extraWidth ) _IRR_OVERRIDE_;
|
||||
virtual void setTabExtraWidth( s32 extraWidth ) IRR_OVERRIDE;
|
||||
|
||||
//! Get the extra width added to tabs on each side of the text
|
||||
virtual s32 getTabExtraWidth() const _IRR_OVERRIDE_;
|
||||
virtual s32 getTabExtraWidth() const IRR_OVERRIDE;
|
||||
|
||||
//! Update the position of the element, decides scroll button status
|
||||
virtual void updateAbsolutePosition() _IRR_OVERRIDE_;
|
||||
virtual void updateAbsolutePosition() IRR_OVERRIDE;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user