Merge branch 'master' of github.com:erlehmann/minetest-delta

[dragonfireclient.git] / src / guiTextInputMenu.cpp

diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index 0668aa7b33ac1916d993adf2eafff76f9e9aae6d..a596025541eaea084aaa3ffcfa4f4c721576d987 100644 (file)
--- a/src/guiTextInputMenu.cpp
+++ b/src/guiTextInputMenu.cpp
@@ -22,13 +22,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"
 #include <string>
 
+#include "gettext.h"
+
 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 +39,8 @@ GUITextInputMenu::GUITextInputMenu(gui::IGUIEnvironment* env,
 GUITextInputMenu::~GUITextInputMenu()
 {
        removeChildren();
+       if(m_dest)
+               delete m_dest;
 }
 
 void GUITextInputMenu::removeChildren()
@@ -100,11 +104,14 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
                Environment->addEditBox(text.c_str(), rect, true, this, 256);
                Environment->setFocus(e);
        }
+       changeCtype("");
        {
                core::rect<s32> rect(0, 0, 140, 30);
                rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
-               Environment->addButton(rect, this, 257, L"Proceed");
+               Environment->addButton(rect, this, 257,
+                       chartowchar_t(gettext("Proceed")));
        }
+       changeCtype("C");
 }
 
 void GUITextInputMenu::drawMenu()
@@ -170,7 +177,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;
                        }
                }
        }