Fix itemdef drop on NULL texture

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

diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index b15f8bc07354dc922ce448dc10fda9afec77393d..c15eeedc5fae607c4463351c985c377fdcd48237 100644 (file)
--- a/src/guiTextInputMenu.cpp
+++ b/src/guiTextInputMenu.cpp
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -21,9 +21,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "debug.h"
 #include "serialization.h"
 #include <string>
+#include <IGUICheckBox.h>
+#include <IGUIEditBox.h>
+#include <IGUIButton.h>
+#include <IGUIStaticText.h>
+#include <IGUIFont.h>
 
 #include "gettext.h"
 
+#if USE_FREETYPE
+#include "intlGUIEditBox.h"
+#endif
+
 GUITextInputMenu::GUITextInputMenu(gui::IGUIEnvironment* env,
                gui::IGUIElement* parent, s32 id,
                IMenuManager *menumgr,
@@ -100,15 +109,30 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 300, 30);
                rect = rect + v2s32(size.X/2-300/2, size.Y/2-30/2-25);
-               gui::IGUIElement *e = 
-               Environment->addEditBox(text.c_str(), rect, true, this, 256);
+               #if USE_FREETYPE
+               gui::IGUIElement *e = (gui::IGUIElement *) new gui::intlGUIEditBox(text.c_str(), true, Environment, this, 256, rect);
+               e->drop();
+               #else
+               gui::IGUIElement *e = Environment->addEditBox(text.c_str(), rect, true, this, 256);
+               #endif
                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, chartowchar_t(gettext("Proceed")));
+               wchar_t* text = wgettext("Proceed");
+               Environment->addButton(rect, this, 257,
+                       text);
+               delete[] text;
        }
+       changeCtype("C");
 }
 
 void GUITextInputMenu::drawMenu()