mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-28 14:53:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3019 from akortunov/warnfix

Browse Source 
Fix override warning with MyGUI 3.4
This commit is contained in:
Bret Curtis 2020-10-18 12:00:56 +02:00 committed by GitHub
commit 4e1ca82e47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/myguiplatform/myguirendermanager.hpp
View File

@ -106,10 +106,16 @@ public:
bool checkTexture(MyGUI::ITexture* _texture); bool checkTexture(MyGUI::ITexture* _texture);
// setViewSize() is a part of MyGUI::RenderManager interface since 3.4.0 release
#if MYGUI_VERSION < MYGUI_DEFINE_VERSION(3,4,0)
void setViewSize(int width, int height);
#else
void setViewSize(int width, int height) override;
#endif
/*internal:*/ /*internal:*/
void collectDrawCalls(); void collectDrawCalls();
void setViewSize(int width, int height);
}; };
} }