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

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/Irrlicht/CGUIScrollBar.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_GUI_SCROLL_BAR_H_INCLUDED__
#define __C_GUI_SCROLL_BAR_H_INCLUDED__
#ifndef IRR_C_GUI_SCROLL_BAR_H_INCLUDED
#define IRR_C_GUI_SCROLL_BAR_H_INCLUDED
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_
@@ -29,52 +29,52 @@ namespace gui
virtual ~CGUIScrollBar();
//! 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;
virtual void OnPostRender(u32 timeMs) _IRR_OVERRIDE_;
virtual void OnPostRender(u32 timeMs) IRR_OVERRIDE;
//! gets the maximum value of the scrollbar.
virtual s32 getMax() const _IRR_OVERRIDE_;
virtual s32 getMax() const IRR_OVERRIDE;
//! sets the maximum value of the scrollbar.
virtual void setMax(s32 max) _IRR_OVERRIDE_;
virtual void setMax(s32 max) IRR_OVERRIDE;
//! gets the minimum value of the scrollbar.
virtual s32 getMin() const _IRR_OVERRIDE_;
virtual s32 getMin() const IRR_OVERRIDE;
//! sets the minimum value of the scrollbar.
virtual void setMin(s32 min) _IRR_OVERRIDE_;
virtual void setMin(s32 min) IRR_OVERRIDE;
//! gets the small step value
virtual s32 getSmallStep() const _IRR_OVERRIDE_;
virtual s32 getSmallStep() const IRR_OVERRIDE;
//! sets the small step value
virtual void setSmallStep(s32 step) _IRR_OVERRIDE_;
virtual void setSmallStep(s32 step) IRR_OVERRIDE;
//! gets the large step value
virtual s32 getLargeStep() const _IRR_OVERRIDE_;
virtual s32 getLargeStep() const IRR_OVERRIDE;
//! sets the large step value
virtual void setLargeStep(s32 step) _IRR_OVERRIDE_;
virtual void setLargeStep(s32 step) IRR_OVERRIDE;
//! gets the current position of the scrollbar
virtual s32 getPos() const _IRR_OVERRIDE_;
virtual s32 getPos() const IRR_OVERRIDE;
//! sets the position of the scrollbar
virtual void setPos(s32 pos) _IRR_OVERRIDE_;
virtual void setPos(s32 pos) IRR_OVERRIDE;
//! updates the rectangle
virtual void updateAbsolutePosition() _IRR_OVERRIDE_;
virtual void updateAbsolutePosition() 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:
@@ -110,4 +110,3 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_
#endif