Merge pull request #3 from JosiahWI/ui_revamp

[dragonfireclient.git] / src / gui / guiVolumeChange.cpp

diff --git a/src/gui/guiVolumeChange.cpp b/src/gui/guiVolumeChange.cpp
index 9428cde83cffcb05544cd26a0cdde7ab86bbbafd..f17cfa9867e0952c7d4918a8d2a99f536956862b 100644 (file)
--- a/src/gui/guiVolumeChange.cpp
+++ b/src/gui/guiVolumeChange.cpp
@@ -38,9 +38,10 @@ const int ID_soundMuteButton = 266;
 
 GUIVolumeChange::GUIVolumeChange(gui::IGUIEnvironment* env,
                gui::IGUIElement* parent, s32 id,
-               IMenuManager *menumgr
+               IMenuManager *menumgr, ISimpleTextureSource *tsrc
 ):
-       GUIModalMenu(env, parent, id, menumgr)
+       GUIModalMenu(env, parent, id, menumgr),
+       m_tsrc(tsrc)
 {
 }
 
@@ -104,7 +105,7 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
                core::rect<s32> rect(0, 0, 80 * s, 30 * s);
                rect = rect + v2s32(size.X / 2 - 80 * s / 2, size.Y / 2 + 55 * s);
                const wchar_t *text = wgettext("Exit");
-               GUIButton::addButton(Environment, rect, this, ID_soundExitButton, text);
+               GUIButton::addButton(Environment, rect, m_tsrc, this, ID_soundExitButton, text);
                delete[] text;
        }
        {
@@ -170,7 +171,7 @@ bool GUIVolumeChange::OnEvent(const SEvent& event)
                if (event.GUIEvent.EventType == gui::EGET_ELEMENT_FOCUS_LOST
                                && isVisible()) {
                        if (!canTakeFocus(event.GUIEvent.Element)) {
-                               dstream << "GUIMainMenu: Not allowing focus change."
+                               infostream << "GUIVolumeChange: Not allowing focus change."
                                << std::endl;
                                // Returning true disables focus change
                                return true;