+ clay and associated items

[dragonfireclient.git] / src / guiTextInputMenu.cpp

diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index 0668aa7b33ac1916d993adf2eafff76f9e9aae6d..2cb8cae6295b3e5417989408d650d959986e10b3 100644 (file)
--- a/src/guiTextInputMenu.cpp
+++ b/src/guiTextInputMenu.cpp
@@ -24,11 +24,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 GUITextInputMenu::GUITextInputMenu(gui::IGUIEnvironment* env,
                gui::IGUIElement* parent, s32 id,
-               int *active_menu_count,
+               IMenuManager *menumgr,
                TextDest *dest,
                std::wstring initial_text
 ):
-       GUIModalMenu(env, parent, id, active_menu_count),
+       GUIModalMenu(env, parent, id, menumgr),
        m_dest(dest),
        m_initial_text(initial_text)
 {
@@ -37,6 +37,8 @@ GUITextInputMenu::GUITextInputMenu(gui::IGUIEnvironment* env,
 GUITextInputMenu::~GUITextInputMenu()
 {
        removeChildren();
+       if(m_dest)
+               delete m_dest;
 }
 
 void GUITextInputMenu::removeChildren()
@@ -170,7 +172,19 @@ bool GUITextInputMenu::OnEvent(const SEvent& event)
                        case 257:
                                acceptInput();
                                quitMenu();
-                               break;
+                               // quitMenu deallocates menu
+                               return true;
+                       }
+               }
+               if(event.GUIEvent.EventType==gui::EGET_EDITBOX_ENTER)
+               {
+                       switch(event.GUIEvent.Caller->getID())
+                       {
+                       case 256:
+                               acceptInput();
+                               quitMenu();
+                               // quitMenu deallocates menu
+                               return true;
                        }
                }
        }