diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2017-04-22 00:51:13 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2017-04-22 00:51:56 +0200 |
| commit | 3e71c8f482131da59642b0175160eb2bc714d439 (patch) | |
| tree | fa80424f0f98ca093d3bc82304f266dd5cb01b9c /src/modalMenu.h | |
| parent | 4f4e2e3e838fc640e45714d4666bc5d6b0aa8a25 (diff) | |
| download | minetest-3e71c8f482131da59642b0175160eb2bc714d439.tar.gz minetest-3e71c8f482131da59642b0175160eb2bc714d439.tar.bz2 minetest-3e71c8f482131da59642b0175160eb2bc714d439.zip | |
Fixing warning pointed by @sfan5 and clang and cleanup guiFileSelectMenu
* Also pass clang-format on guiFileSelectMenu.h and remove it from whitelist
Diffstat (limited to 'src/modalMenu.h')
| -rw-r--r-- | src/modalMenu.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modalMenu.h b/src/modalMenu.h index 43bb8e1b8..38a26535e 100644 --- a/src/modalMenu.h +++ b/src/modalMenu.h @@ -43,14 +43,13 @@ public: class GUIModalMenu : public gui::IGUIElement { public: - GUIModalMenu(gui::IGUIEnvironment* env, - gui::IGUIElement* parent, s32 id, + GUIModalMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent, s32 id, IMenuManager *menumgr): IGUIElement(gui::EGUIET_ELEMENT, env, parent, id, core::rect<s32>(0,0,100,100)) { //m_force_regenerate_gui = false; - + m_menumgr = menumgr; m_allow_focus_removal = false; m_screensize_old = v2u32(0,0); @@ -59,6 +58,7 @@ public: Environment->setFocus(this); m_menumgr->createdMenu(this); } + virtual ~GUIModalMenu() { m_menumgr->deletingMenu(this); @@ -78,7 +78,7 @@ public: { if(!IsVisible) return; - + video::IVideoDriver* driver = Environment->getVideoDriver(); v2u32 screensize = driver->getScreenSize(); if(screensize != m_screensize_old /*|| m_force_regenerate_gui*/) @@ -90,7 +90,7 @@ public: drawMenu(); } - + /* This should be called when the menu wants to quit. |