Revert all commits up to (including) a704c04f

src/guiFormSpecMenu.cpp

@@ -37,8 +37,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IGUITabControl.h>
 #include <IGUIComboBox.h>
 #include "log.h"
-#include "client/tile.h" // ITextureSource
+#include "tile.h" // ITextureSource
 #include "hud.h" // drawItemStack
+#include "hex.h"
+#include "util/string.h"
+#include "util/numeric.h"
 #include "filesys.h"
 #include "gettime.h"
 #include "gettext.h"
@@ -47,10 +50,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "main.h"
 #include "settings.h"
 #include "client.h"
-#include "fontengine.h"
-#include "util/hex.h"
-#include "util/numeric.h"
 #include "util/string.h" // for parseColorString()
+#include "fontengine.h"
 
 #define MY_CHECKPOS(a,b)													\
 	if (v_pos.size() != 2) {												\
@@ -96,7 +97,6 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
 	m_form_src(fsrc),
 	m_text_dst(tdst),
 	m_formspec_version(0),
-	m_focused_element(L""),
 	m_font(NULL)
 #ifdef __ANDROID__
 	,m_JavaDialogFieldName(L"")
@@ -1757,6 +1757,8 @@ void GUIFormSpecMenu::parseElement(parserData* data, std::string element)
 		<<std::endl;
 }
 
+
+
 void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 {
 	/* useless to regenerate without a screensize */
@@ -1773,10 +1775,6 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 		mydata.table_dyndata[tablename] = table->getDynamicData();
 	}
 
-	//set focus
-	if (!m_focused_element.empty())
-		mydata.focused_fieldname = m_focused_element;
-
 	//preserve focus
 	gui::IGUIElement *focused_element = Environment->getFocus();
 	if (focused_element && focused_element->getParent() == this) {