Commented out debug statements again

[oweals/minetest.git] / src / guiTextInputMenu.cpp

diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index 787680bc51f00c00b5d4dd38f60a642f63aad614..208ced803cd21ee6e750f7755c339c545817610a 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)
 {
@@ -101,12 +103,21 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
                gui::IGUIElement *e = 
                Environment->addEditBox(text.c_str(), rect, true, this, 256);
                Environment->setFocus(e);
+
+               irr::SEvent evt;
+               evt.EventType = EET_KEY_INPUT_EVENT;
+               evt.KeyInput.Key = KEY_END;
+               evt.KeyInput.PressedDown = true;
+               e->OnEvent(evt);
        }
+       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,
+                       wgettext("Proceed"));
        }
+       changeCtype("C");
 }
 
 void GUITextInputMenu::drawMenu()
@@ -172,7 +183,8 @@ bool GUITextInputMenu::OnEvent(const SEvent& event)
                        case 257:
                                acceptInput();
                                quitMenu();
-                               break;
+                               // quitMenu deallocates menu
+                               return true;
                        }
                }
                if(event.GUIEvent.EventType==gui::EGET_EDITBOX_ENTER)
@@ -182,7 +194,8 @@ bool GUITextInputMenu::OnEvent(const SEvent& event)
                        case 256:
                                acceptInput();
                                quitMenu();
-                               break;
+                               // quitMenu deallocates menu
+                               return true;
                        }
                }
        }