mirror of
https://github.com/minetest/irrlicht.git
synced 2024-11-10 09:43:52 +01:00
Add _IRR_OVERRIDE_ to cursor functions in CIrrDeviceOSX.h
Thx @ Maksym for reporting. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6153 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
parent
7c0253dd82
commit
6805226b5b
@ -131,39 +131,39 @@ namespace irr
|
|||||||
}
|
}
|
||||||
|
|
||||||
//! Changes the visible state of the mouse cursor.
|
//! Changes the visible state of the mouse cursor.
|
||||||
virtual void setVisible(bool visible)
|
virtual void setVisible(bool visible) _IRR_OVERRIDE_
|
||||||
{
|
{
|
||||||
IsVisible = visible;
|
IsVisible = visible;
|
||||||
Device->setCursorVisible(visible);
|
Device->setCursorVisible(visible);
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Returns if the cursor is currently visible.
|
//! Returns if the cursor is currently visible.
|
||||||
virtual bool isVisible() const
|
virtual bool isVisible() const _IRR_OVERRIDE_
|
||||||
{
|
{
|
||||||
return IsVisible;
|
return IsVisible;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Sets the new position of the cursor.
|
//! Sets the new position of the cursor.
|
||||||
virtual void setPosition(const core::position2d<f32> &pos)
|
virtual void setPosition(const core::position2d<f32> &pos) _IRR_OVERRIDE_
|
||||||
{
|
{
|
||||||
setPosition(pos.X, pos.Y);
|
setPosition(pos.X, pos.Y);
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Sets the new position of the cursor.
|
//! Sets the new position of the cursor.
|
||||||
virtual void setPosition(f32 x, f32 y)
|
virtual void setPosition(f32 x, f32 y) _IRR_OVERRIDE_
|
||||||
{
|
{
|
||||||
setPosition((s32)(x*WindowSize.Width), (s32)(y*WindowSize.Height));
|
setPosition((s32)(x*WindowSize.Width), (s32)(y*WindowSize.Height));
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Sets the new position of the cursor.
|
//! Sets the new position of the cursor.
|
||||||
virtual void setPosition(const core::position2d<s32> &pos)
|
virtual void setPosition(const core::position2d<s32> &pos) _IRR_OVERRIDE_
|
||||||
{
|
{
|
||||||
if (CursorPos.X != pos.X || CursorPos.Y != pos.Y)
|
if (CursorPos.X != pos.X || CursorPos.Y != pos.Y)
|
||||||
setPosition(pos.X, pos.Y);
|
setPosition(pos.X, pos.Y);
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Sets the new position of the cursor.
|
//! Sets the new position of the cursor.
|
||||||
virtual void setPosition(s32 x, s32 y)
|
virtual void setPosition(s32 x, s32 y) _IRR_OVERRIDE_
|
||||||
{
|
{
|
||||||
if (UseReferenceRect)
|
if (UseReferenceRect)
|
||||||
{
|
{
|
||||||
@ -195,7 +195,7 @@ namespace irr
|
|||||||
}
|
}
|
||||||
|
|
||||||
//! Sets an absolute reference rect for calculating the cursor position.
|
//! Sets an absolute reference rect for calculating the cursor position.
|
||||||
virtual void setReferenceRect(core::rect<s32>* rect=0)
|
virtual void setReferenceRect(core::rect<s32>* rect=0) _IRR_OVERRIDE_
|
||||||
{
|
{
|
||||||
if (rect)
|
if (rect)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user