|
|
@@ -35,47 +35,47 @@ namespace BansheeEngine
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::setFullscreen(UINT32, UINT32, float, UINT32)
|
|
|
*/
|
|
|
- void setFullscreen(UINT32 width, UINT32 height, float refreshRate = 60.0f, UINT32 monitorIdx = 0);
|
|
|
+ void setFullscreen(UINT32 width, UINT32 height, float refreshRate = 60.0f, UINT32 monitorIdx = 0) override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::setFullscreen(const VideoMode&)
|
|
|
*/
|
|
|
- void setFullscreen(const VideoMode& mode);
|
|
|
+ void setFullscreen(const VideoMode& mode) override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::setWindowed
|
|
|
*/
|
|
|
- void setWindowed(UINT32 width, UINT32 height);
|
|
|
+ void setWindowed(UINT32 width, UINT32 height) override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::setHidden
|
|
|
*/
|
|
|
- void setHidden(bool hidden);
|
|
|
+ void setHidden(bool hidden) override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::minimize
|
|
|
*/
|
|
|
- void minimize();
|
|
|
+ void minimize() override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::maximize
|
|
|
*/
|
|
|
- void maximize();
|
|
|
+ void maximize() override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::restore
|
|
|
*/
|
|
|
- void restore();
|
|
|
+ void restore() override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::move
|
|
|
*/
|
|
|
- void move(INT32 left, INT32 top);
|
|
|
+ void move(INT32 left, INT32 top) override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::resize
|
|
|
*/
|
|
|
- void resize(UINT32 width, UINT32 height);
|
|
|
+ void resize(UINT32 width, UINT32 height) override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::copyContentsToMemory
|
|
|
@@ -85,22 +85,22 @@ namespace BansheeEngine
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::swapBuffers
|
|
|
*/
|
|
|
- void swapBuffers();
|
|
|
+ void swapBuffers() override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::getCustomAttribute
|
|
|
*/
|
|
|
- void getCustomAttribute(const String& name, void* pData) const;
|
|
|
+ void getCustomAttribute(const String& name, void* pData) const override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::setActive
|
|
|
*/
|
|
|
- virtual void setActive(bool state);
|
|
|
+ virtual void setActive(bool state) override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::_windowMovedOrResized
|
|
|
*/
|
|
|
- void _windowMovedOrResized();
|
|
|
+ void _windowMovedOrResized() override;
|
|
|
|
|
|
/**
|
|
|
* @brief Returns handle to device context associated with the window.
|
|
|
@@ -118,7 +118,7 @@ namespace BansheeEngine
|
|
|
/**
|
|
|
* @copydoc CoreObjectCore::initialize
|
|
|
*/
|
|
|
- virtual void initialize();
|
|
|
+ virtual void initialize() override;
|
|
|
|
|
|
/**
|
|
|
* @brief Calculates window size based on provided client area size and currently set window style.
|
|
|
@@ -128,7 +128,7 @@ namespace BansheeEngine
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::getProperties
|
|
|
*/
|
|
|
- const RenderTargetProperties& getPropertiesInternal() const { return mProperties; }
|
|
|
+ const RenderTargetProperties& getPropertiesInternal() const override { return mProperties; }
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindowCore::getSyncedProperties
|
|
|
@@ -172,17 +172,17 @@ namespace BansheeEngine
|
|
|
/**
|
|
|
* @copydoc RenderWindow::screenToWindowPos
|
|
|
*/
|
|
|
- void getCustomAttribute(const String& name, void* pData) const;
|
|
|
+ void getCustomAttribute(const String& name, void* pData) const override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindow::screenToWindowPos
|
|
|
*/
|
|
|
- Vector2I screenToWindowPos(const Vector2I& screenPos) const;
|
|
|
+ Vector2I screenToWindowPos(const Vector2I& screenPos) const override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindow::windowToScreenPos
|
|
|
*/
|
|
|
- Vector2I windowToScreenPos(const Vector2I& windowPos) const;
|
|
|
+ Vector2I windowToScreenPos(const Vector2I& windowPos) const override;
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindow::getCore
|
|
|
@@ -199,7 +199,7 @@ namespace BansheeEngine
|
|
|
/**
|
|
|
* @copydoc RenderWindow::getProperties
|
|
|
*/
|
|
|
- const RenderTargetProperties& getPropertiesInternal() const { return mProperties; }
|
|
|
+ const RenderTargetProperties& getPropertiesInternal() const override { return mProperties; }
|
|
|
|
|
|
/**
|
|
|
* @copydoc RenderWindow::syncProperties
|