diff --git a/CMakeLists.txt b/CMakeLists.txt
index a454f211b2..3e97b58588 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,7 +177,6 @@ include_directories(${UUID_INCLUDE_DIR})
 endif (WIN32)
 if (MSVC10)
     set(PLATFORM_INCLUDE_DIR "")
-    add_definitions(-DMYGUI_DONT_REPLACE_NULLPTR)
 endif()
 
 if (APPLE)
@@ -192,6 +191,7 @@ find_package (Threads)
 endif()
 
 find_package(OGRE REQUIRED)
+find_package(MyGUI REQUIRED)
 find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread)
 find_package(OIS REQUIRED)
 find_package(OpenAL REQUIRED)
@@ -208,14 +208,14 @@ include_directories("."
     ${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}/Ogre ${OGRE_INCLUDE_DIR}/OGRE ${OGRE_PLUGIN_INCLUDE_DIRS}
     ${OIS_INCLUDE_DIRS} ${Boost_INCLUDE_DIR}
     ${PLATFORM_INCLUDE_DIR}
-    ${CMAKE_HOME_DIRECTORY}/extern/mygui_3.0.1/MyGUIEngine/include
-    ${CMAKE_HOME_DIRECTORY}/extern/mygui_3.0.1/OgrePlatform/include
+    ${MYGUI_INCLUDE_DIRS}
+    ${MYGUI_PLATFORM_INCLUDE_DIRS}
     ${OPENAL_INCLUDE_DIR}
     ${UUID_INCLUDE_DIR}
     ${LIBDIR}
 )
 
-link_directories(${Boost_LIBRARY_DIRS} ${OGRE_LIB_DIR})
+link_directories(${Boost_LIBRARY_DIRS} ${OGRE_LIB_DIR} ${MYGUI_LIB_DIR})
 
 if(APPLE)
     # List used Ogre plugins
@@ -225,14 +225,7 @@ if(APPLE)
                           "Plugin_ParticleFX")
 endif(APPLE)
 
-add_subdirectory( extern/mygui_3.0.1 )
-
-# Make sure that certain libraries are used as static libraries
-# This is in effect turns off __declspec (dllexport) for windows
-# Each library will also need to be configured to build as a static lib
-
-# MyGUI: extern/mygui_3.0.0/
-add_definitions(-DMYGUI_STATIC)
+add_subdirectory( files/mygui )
 
 # Specify build paths
 
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 726d5705c5..5de64061a6 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -87,9 +87,9 @@ target_link_libraries(openmw
     ${OPENAL_LIBRARY}
     ${SOUND_INPUT_LIBRARY}
     ${BULLET_LIBRARIES}
+    ${MYGUI_LIBRARIES}
+    MyGUI.OgrePlatform #TODO MyGUI ogre platform is not added by the find script
     components
-    MyGUIEngine
-    MyGUIOgrePlatform
 )
 
 # Fix for not visible pthreads functions for linker with glibc 2.15
diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp
index 93dde9f1bf..e9c15fab4a 100644
--- a/apps/openmw/mwgui/birth.cpp
+++ b/apps/openmw/mwgui/birth.cpp
@@ -21,18 +21,18 @@ BirthDialog::BirthDialog(WindowManager& parWindowManager)
 
     getWidget(birthList, "BirthsignList");
     birthList->setScrollVisible(true);
-    birthList->eventListSelectAccept = MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
-    birthList->eventListMouseItemActivate = MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
-    birthList->eventListChangePosition = MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
+    birthList->eventListSelectAccept += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
+    birthList->eventListMouseItemActivate += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
+    birthList->eventListChangePosition += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
 
     // TODO: These buttons should be managed by a Dialog class
     MyGUI::ButtonPtr backButton;
     getWidget(backButton, "BackButton");
-    backButton->eventMouseButtonClick = MyGUI::newDelegate(this, &BirthDialog::onBackClicked);
+    backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &BirthDialog::onBackClicked);
 
     MyGUI::ButtonPtr okButton;
     getWidget(okButton, "OKButton");
-    okButton->eventMouseButtonClick = MyGUI::newDelegate(this, &BirthDialog::onOkClicked);
+    okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &BirthDialog::onOkClicked);
 
     updateBirths();
     updateSpells();
@@ -100,7 +100,7 @@ void BirthDialog::onBackClicked(MyGUI::Widget* _sender)
     eventBack();
 }
 
-void BirthDialog::onSelectBirth(MyGUI::List* _sender, size_t _index)
+void BirthDialog::onSelectBirth(MyGUI::ListBox* _sender, size_t _index)
 {
     if (_index == MyGUI::ITEM_NONE)
         return;
@@ -188,7 +188,7 @@ void BirthDialog::updateSpells()
     {
         if (!categories[category].spells.empty())
         {
-            MyGUI::StaticTextPtr label = spellArea->createWidget<MyGUI::StaticText>("SandBrightText", coord, MyGUI::Align::Default, std::string("Label"));
+            MyGUI::TextBox* label = spellArea->createWidget<MyGUI::TextBox>("SandBrightText", coord, MyGUI::Align::Default, std::string("Label"));
             label->setCaption(mWindowManager.getGameSettingString(categories[category].label, ""));
             spellItems.push_back(label);
             coord.top += lineHeight;
diff --git a/apps/openmw/mwgui/birth.hpp b/apps/openmw/mwgui/birth.hpp
index a55a774a5b..b5f7db7749 100644
--- a/apps/openmw/mwgui/birth.hpp
+++ b/apps/openmw/mwgui/birth.hpp
@@ -32,7 +32,7 @@ namespace MWGui
         void open();
 
         // Events
-        typedef delegates::CDelegate0 EventHandle_Void;
+        typedef delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n
@@ -40,7 +40,7 @@ namespace MWGui
         EventHandle_Void eventBack;
 
     protected:
-        void onSelectBirth(MyGUI::List* _sender, size_t _index);
+        void onSelectBirth(MyGUI::ListBox* _sender, size_t _index);
 
         void onOkClicked(MyGUI::Widget* _sender);
         void onBackClicked(MyGUI::Widget* _sender);
@@ -49,9 +49,9 @@ namespace MWGui
         void updateBirths();
         void updateSpells();
 
-        MyGUI::ListPtr    birthList;
+        MyGUI::ListBox*    birthList;
         MyGUI::WidgetPtr  spellArea;
-        MyGUI::StaticImagePtr birthImage;
+        MyGUI::ImageBox* birthImage;
         std::vector<MyGUI::WidgetPtr> spellItems;
 
         std::string currentBirthId;
diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index 1cb0593e73..ce5e744ccb 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -121,7 +121,7 @@ void CharacterCreation::spawnDialog(const char id)
             mNameDialog->setTextLabel(mWM->getGameSettingString("sName", "Name"));
             mNameDialog->setTextInput(mPlayerName);
             mNameDialog->setNextButtonShow(mCreationStage >= CSE_NameChosen);
-            mNameDialog->eventDone = MyGUI::newDelegate(this, &CharacterCreation::onNameDialogDone);
+            mNameDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onNameDialogDone);
             mNameDialog->open();
             break;
 
@@ -131,8 +131,8 @@ void CharacterCreation::spawnDialog(const char id)
             mRaceDialog = new RaceDialog(*mWM);
             mRaceDialog->setNextButtonShow(mCreationStage >= CSE_RaceChosen);
             mRaceDialog->setRaceId(mPlayerRaceId);
-            mRaceDialog->eventDone = MyGUI::newDelegate(this, &CharacterCreation::onRaceDialogDone);
-            mRaceDialog->eventBack = MyGUI::newDelegate(this, &CharacterCreation::onRaceDialogBack);
+            mRaceDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onRaceDialogDone);
+            mRaceDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onRaceDialogBack);
             mRaceDialog->open();
             break;
 
@@ -140,7 +140,7 @@ void CharacterCreation::spawnDialog(const char id)
             if (mClassChoiceDialog)
                 mWM->removeDialog(mClassChoiceDialog);
             mClassChoiceDialog = new ClassChoiceDialog(*mWM);
-            mClassChoiceDialog->eventButtonSelected = MyGUI::newDelegate(this, &CharacterCreation::onClassChoice);
+            mClassChoiceDialog->eventButtonSelected += MyGUI::newDelegate(this, &CharacterCreation::onClassChoice);
             mClassChoiceDialog->open();
             break;
 
@@ -150,8 +150,8 @@ void CharacterCreation::spawnDialog(const char id)
             mPickClassDialog = new PickClassDialog(*mWM);
             mPickClassDialog->setNextButtonShow(mCreationStage >= CSE_ClassChosen);
             mPickClassDialog->setClassId(mPlayerClass.name);
-            mPickClassDialog->eventDone = MyGUI::newDelegate(this, &CharacterCreation::onPickClassDialogDone);
-            mPickClassDialog->eventBack = MyGUI::newDelegate(this, &CharacterCreation::onPickClassDialogBack);
+            mPickClassDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onPickClassDialogDone);
+            mPickClassDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onPickClassDialogBack);
             mPickClassDialog->open();
             break;
 
@@ -161,8 +161,8 @@ void CharacterCreation::spawnDialog(const char id)
             mBirthSignDialog = new BirthDialog(*mWM);
             mBirthSignDialog->setNextButtonShow(mCreationStage >= CSE_BirthSignChosen);
             mBirthSignDialog->setBirthId(mPlayerBirthSignId);
-            mBirthSignDialog->eventDone = MyGUI::newDelegate(this, &CharacterCreation::onBirthSignDialogDone);
-            mBirthSignDialog->eventBack = MyGUI::newDelegate(this, &CharacterCreation::onBirthSignDialogBack);
+            mBirthSignDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onBirthSignDialogDone);
+            mBirthSignDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onBirthSignDialogBack);
             mBirthSignDialog->open();
             break;
 
@@ -170,8 +170,8 @@ void CharacterCreation::spawnDialog(const char id)
             if (mCreateClassDialog)
                 mWM->removeDialog(mCreateClassDialog);
             mCreateClassDialog = new CreateClassDialog(*mWM);
-            mCreateClassDialog->eventDone = MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogDone);
-            mCreateClassDialog->eventBack = MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogBack);
+            mCreateClassDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogDone);
+            mCreateClassDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogBack);
             mCreateClassDialog->open();
             break;
         case GM_ClassGenerate:
@@ -212,9 +212,9 @@ void CharacterCreation::spawnDialog(const char id)
                 mReviewDialog->configureSkills(mPlayerMajorSkills, mPlayerMinorSkills);
             }
 
-            mReviewDialog->eventDone = MyGUI::newDelegate(this, &CharacterCreation::onReviewDialogDone);
-            mReviewDialog->eventBack = MyGUI::newDelegate(this, &CharacterCreation::onReviewDialogBack);
-            mReviewDialog->eventActivateDialog = MyGUI::newDelegate(this, &CharacterCreation::onReviewActivateDialog);
+            mReviewDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onReviewDialogDone);
+            mReviewDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onReviewDialogBack);
+            mReviewDialog->eventActivateDialog += MyGUI::newDelegate(this, &CharacterCreation::onReviewActivateDialog);
             mReviewDialog->open();
             break;
     }
@@ -559,8 +559,8 @@ void CharacterCreation::showClassQuestionDialog()
             mWM->removeDialog(mGenerateClassResultDialog);
         mGenerateClassResultDialog = new GenerateClassResultDialog(*mWM);
         mGenerateClassResultDialog->setClassId(mGenerateClass);
-        mGenerateClassResultDialog->eventBack = MyGUI::newDelegate(this, &CharacterCreation::onGenerateClassBack);
-        mGenerateClassResultDialog->eventDone = MyGUI::newDelegate(this, &CharacterCreation::onGenerateClassDone);
+        mGenerateClassResultDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onGenerateClassBack);
+        mGenerateClassResultDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onGenerateClassDone);
         mGenerateClassResultDialog->open();
         return;
     }
@@ -581,7 +581,7 @@ void CharacterCreation::showClassQuestionDialog()
     buttons.push_back(sGenerateClassSteps[mGenerateClassStep].mButtons[1]);
     buttons.push_back(sGenerateClassSteps[mGenerateClassStep].mButtons[2]);
     mGenerateClassQuestionDialog->setButtons(buttons);
-    mGenerateClassQuestionDialog->eventButtonSelected = MyGUI::newDelegate(this, &CharacterCreation::onClassQuestionChosen);
+    mGenerateClassQuestionDialog->eventButtonSelected += MyGUI::newDelegate(this, &CharacterCreation::onClassQuestionChosen);
     mGenerateClassQuestionDialog->open();
 }
 
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index ad94f30b1e..75e534b42a 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -29,11 +29,11 @@ GenerateClassResultDialog::GenerateClassResultDialog(WindowManager& parWindowMan
     // TODO: These buttons should be managed by a Dialog class
     MyGUI::ButtonPtr backButton;
     getWidget(backButton, "BackButton");
-    backButton->eventMouseButtonClick = MyGUI::newDelegate(this, &GenerateClassResultDialog::onBackClicked);
+    backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &GenerateClassResultDialog::onBackClicked);
 
     MyGUI::ButtonPtr okButton;
     getWidget(okButton, "OKButton");
-    okButton->eventMouseButtonClick = MyGUI::newDelegate(this, &GenerateClassResultDialog::onOkClicked);
+    okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &GenerateClassResultDialog::onOkClicked);
 }
 
 void GenerateClassResultDialog::open()
@@ -96,20 +96,20 @@ PickClassDialog::PickClassDialog(WindowManager& parWindowManager)
 
     getWidget(classList, "ClassList");
     classList->setScrollVisible(true);
-    classList->eventListSelectAccept = MyGUI::newDelegate(this, &PickClassDialog::onSelectClass);
-    classList->eventListMouseItemActivate = MyGUI::newDelegate(this, &PickClassDialog::onSelectClass);
-    classList->eventListChangePosition = MyGUI::newDelegate(this, &PickClassDialog::onSelectClass);
+    classList->eventListSelectAccept += MyGUI::newDelegate(this, &PickClassDialog::onSelectClass);
+    classList->eventListMouseItemActivate += MyGUI::newDelegate(this, &PickClassDialog::onSelectClass);
+    classList->eventListChangePosition += MyGUI::newDelegate(this, &PickClassDialog::onSelectClass);
 
     getWidget(classImage, "ClassImage");
 
     // TODO: These buttons should be managed by a Dialog class
     MyGUI::ButtonPtr backButton;
     getWidget(backButton, "BackButton");
-    backButton->eventMouseButtonClick = MyGUI::newDelegate(this, &PickClassDialog::onBackClicked);
+    backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &PickClassDialog::onBackClicked);
 
     MyGUI::ButtonPtr okButton;
     getWidget(okButton, "OKButton");
-    okButton->eventMouseButtonClick = MyGUI::newDelegate(this, &PickClassDialog::onOkClicked);
+    okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &PickClassDialog::onOkClicked);
 
     updateClasses();
     updateStats();
@@ -177,7 +177,7 @@ void PickClassDialog::onBackClicked(MyGUI::Widget* _sender)
     eventBack();
 }
 
-void PickClassDialog::onSelectClass(MyGUI::List* _sender, size_t _index)
+void PickClassDialog::onSelectClass(MyGUI::ListBox* _sender, size_t _index)
 {
     if (_index == MyGUI::ITEM_NONE)
         return;
@@ -248,7 +248,7 @@ void PickClassDialog::updateStats()
 
 /* InfoBoxDialog */
 
-void InfoBoxDialog::fitToText(MyGUI::StaticTextPtr widget)
+void InfoBoxDialog::fitToText(MyGUI::TextBox* widget)
 {
     MyGUI::IntCoord inner = widget->getTextRegion();
     MyGUI::IntCoord outer = widget->getCoord();
@@ -267,7 +267,7 @@ void InfoBoxDialog::layoutVertically(MyGUI::WidgetPtr widget, int margin)
     for (unsigned i = 0; i < count; ++i)
     {
         MyGUI::WidgetPtr child = widget->getChildAt(i);
-        if (!child->isVisible())
+        if (!child->getVisible())
             continue;
 
         child->setPosition(child->getLeft(), pos);
@@ -322,7 +322,7 @@ void InfoBoxDialog::setButtons(ButtonList &buttons)
         button->getSubWidgetText()->setWordWrap(true);
         button->setCaption(text);
         fitToText(button);
-        button->eventMouseButtonClick = MyGUI::newDelegate(this, &InfoBoxDialog::onButtonClicked);
+        button->eventMouseButtonClick += MyGUI::newDelegate(this, &InfoBoxDialog::onButtonClicked);
         coord.top += button->getHeight();
         this->buttons.push_back(button);
     }
@@ -389,15 +389,15 @@ CreateClassDialog::CreateClassDialog(WindowManager& parWindowManager)
     setText("SpecializationT", mWindowManager.getGameSettingString("sChooseClassMenu1", "Specialization"));
     getWidget(specializationName, "SpecializationName");
     specializationName->setCaption(mWindowManager.getGameSettingString(ESM::Class::gmstSpecializationIds[ESM::Class::Combat], ""));
-    specializationName->eventMouseButtonClick = MyGUI::newDelegate(this, &CreateClassDialog::onSpecializationClicked);
+    specializationName->eventMouseButtonClick += MyGUI::newDelegate(this, &CreateClassDialog::onSpecializationClicked);
 
     setText("FavoriteAttributesT", mWindowManager.getGameSettingString("sChooseClassMenu2", "Favorite Attributes:"));
     getWidget(favoriteAttribute0, "FavoriteAttribute0");
     getWidget(favoriteAttribute1, "FavoriteAttribute1");
     favoriteAttribute0->setWindowManager(&mWindowManager);
     favoriteAttribute1->setWindowManager(&mWindowManager);
-    favoriteAttribute0->eventClicked = MyGUI::newDelegate(this, &CreateClassDialog::onAttributeClicked);
-    favoriteAttribute1->eventClicked = MyGUI::newDelegate(this, &CreateClassDialog::onAttributeClicked);
+    favoriteAttribute0->eventClicked += MyGUI::newDelegate(this, &CreateClassDialog::onAttributeClicked);
+    favoriteAttribute1->eventClicked += MyGUI::newDelegate(this, &CreateClassDialog::onAttributeClicked);
 
     setText("MajorSkillT", mWindowManager.getGameSettingString("sSkillClassMajor", ""));
     setText("MinorSkillT", mWindowManager.getGameSettingString("sSkillClassMinor", ""));
@@ -414,7 +414,7 @@ CreateClassDialog::CreateClassDialog(WindowManager& parWindowManager)
     for (std::vector<Widgets::MWSkillPtr>::const_iterator it = skills.begin(); it != end; ++it)
     {
         (*it)->setWindowManager(&mWindowManager);
-        (*it)->eventClicked = MyGUI::newDelegate(this, &CreateClassDialog::onSkillClicked);
+        (*it)->eventClicked += MyGUI::newDelegate(this, &CreateClassDialog::onSkillClicked);
     }
 
     setText("LabelT", mWindowManager.getGameSettingString("sName", ""));
@@ -426,15 +426,15 @@ CreateClassDialog::CreateClassDialog(WindowManager& parWindowManager)
     // TODO: These buttons should be managed by a Dialog class
     MyGUI::ButtonPtr descriptionButton;
     getWidget(descriptionButton, "DescriptionButton");
-    descriptionButton->eventMouseButtonClick = MyGUI::newDelegate(this, &CreateClassDialog::onDescriptionClicked);
+    descriptionButton->eventMouseButtonClick += MyGUI::newDelegate(this, &CreateClassDialog::onDescriptionClicked);
 
     MyGUI::ButtonPtr backButton;
     getWidget(backButton, "BackButton");
-    backButton->eventMouseButtonClick = MyGUI::newDelegate(this, &CreateClassDialog::onBackClicked);
+    backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &CreateClassDialog::onBackClicked);
 
     MyGUI::ButtonPtr okButton;
     getWidget(okButton, "OKButton");
-    okButton->eventMouseButtonClick = MyGUI::newDelegate(this, &CreateClassDialog::onOkClicked);
+    okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &CreateClassDialog::onOkClicked);
 
     // Set default skills, attributes
 
@@ -560,8 +560,8 @@ void CreateClassDialog::onSpecializationClicked(MyGUI::WidgetPtr _sender)
     if (specDialog)
         delete specDialog;
     specDialog = new SelectSpecializationDialog(mWindowManager);
-    specDialog->eventCancel = MyGUI::newDelegate(this, &CreateClassDialog::onDialogCancel);
-    specDialog->eventItemSelected = MyGUI::newDelegate(this, &CreateClassDialog::onSpecializationSelected);
+    specDialog->eventCancel += MyGUI::newDelegate(this, &CreateClassDialog::onDialogCancel);
+    specDialog->eventItemSelected += MyGUI::newDelegate(this, &CreateClassDialog::onSpecializationSelected);
     specDialog->setVisible(true);
 }
 
@@ -578,8 +578,8 @@ void CreateClassDialog::onAttributeClicked(Widgets::MWAttributePtr _sender)
         delete attribDialog;
     attribDialog = new SelectAttributeDialog(mWindowManager);
     attribDialog->setAffectedWidget(_sender);
-    attribDialog->eventCancel = MyGUI::newDelegate(this, &CreateClassDialog::onDialogCancel);
-    attribDialog->eventItemSelected = MyGUI::newDelegate(this, &CreateClassDialog::onAttributeSelected);
+    attribDialog->eventCancel += MyGUI::newDelegate(this, &CreateClassDialog::onDialogCancel);
+    attribDialog->eventItemSelected += MyGUI::newDelegate(this, &CreateClassDialog::onAttributeSelected);
     attribDialog->setVisible(true);
 }
 
@@ -607,8 +607,8 @@ void CreateClassDialog::onSkillClicked(Widgets::MWSkillPtr _sender)
         delete skillDialog;
     skillDialog = new SelectSkillDialog(mWindowManager);
     skillDialog->setAffectedWidget(_sender);
-    skillDialog->eventCancel = MyGUI::newDelegate(this, &CreateClassDialog::onDialogCancel);
-    skillDialog->eventItemSelected = MyGUI::newDelegate(this, &CreateClassDialog::onSkillSelected);
+    skillDialog->eventCancel += MyGUI::newDelegate(this, &CreateClassDialog::onDialogCancel);
+    skillDialog->eventItemSelected += MyGUI::newDelegate(this, &CreateClassDialog::onSkillSelected);
     skillDialog->setVisible(true);
 }
 
@@ -638,7 +638,7 @@ void CreateClassDialog::onDescriptionClicked(MyGUI::Widget* _sender)
 {
     descDialog = new DescriptionDialog(mWindowManager);
     descDialog->setTextInput(description);
-    descDialog->eventDone = MyGUI::newDelegate(this, &CreateClassDialog::onDescriptionEntered);
+    descDialog->eventDone += MyGUI::newDelegate(this, &CreateClassDialog::onDescriptionEntered);
     descDialog->setVisible(true);
 }
 
@@ -672,18 +672,18 @@ SelectSpecializationDialog::SelectSpecializationDialog(WindowManager& parWindowM
     getWidget(specialization1, "Specialization1");
     getWidget(specialization2, "Specialization2");
     specialization0->setCaption(mWindowManager.getGameSettingString(ESM::Class::gmstSpecializationIds[ESM::Class::Combat], ""));
-    specialization0->eventMouseButtonClick = MyGUI::newDelegate(this, &SelectSpecializationDialog::onSpecializationClicked);
+    specialization0->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onSpecializationClicked);
     specialization1->setCaption(mWindowManager.getGameSettingString(ESM::Class::gmstSpecializationIds[ESM::Class::Magic], ""));
-    specialization1->eventMouseButtonClick = MyGUI::newDelegate(this, &SelectSpecializationDialog::onSpecializationClicked);
+    specialization1->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onSpecializationClicked);
     specialization2->setCaption(mWindowManager.getGameSettingString(ESM::Class::gmstSpecializationIds[ESM::Class::Stealth], ""));
-    specialization2->eventMouseButtonClick = MyGUI::newDelegate(this, &SelectSpecializationDialog::onSpecializationClicked);
+    specialization2->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onSpecializationClicked);
     specializationId = ESM::Class::Combat;
 
     // TODO: These buttons should be managed by a Dialog class
     MyGUI::ButtonPtr cancelButton;
     getWidget(cancelButton, "CancelButton");
     cancelButton->setCaption(mWindowManager.getGameSettingString("sCancel", ""));
-    cancelButton->eventMouseButtonClick = MyGUI::newDelegate(this, &SelectSpecializationDialog::onCancelClicked);
+    cancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onCancelClicked);
 }
 
 // widget controls
@@ -725,14 +725,14 @@ SelectAttributeDialog::SelectAttributeDialog(WindowManager& parWindowManager)
         getWidget(attribute,  std::string("Attribute").append(1, theIndex));
         attribute->setWindowManager(&parWindowManager);
         attribute->setAttributeId(ESM::Attribute::attributeIds[i]);
-        attribute->eventClicked = MyGUI::newDelegate(this, &SelectAttributeDialog::onAttributeClicked);
+        attribute->eventClicked += MyGUI::newDelegate(this, &SelectAttributeDialog::onAttributeClicked);
     }
 
     // TODO: These buttons should be managed by a Dialog class
     MyGUI::ButtonPtr cancelButton;
     getWidget(cancelButton, "CancelButton");
     cancelButton->setCaption(mWindowManager.getGameSettingString("sCancel", ""));
-    cancelButton->eventMouseButtonClick = MyGUI::newDelegate(this, &SelectAttributeDialog::onCancelClicked);
+    cancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectAttributeDialog::onCancelClicked);
 }
 
 // widget controls
@@ -813,7 +813,7 @@ SelectSkillDialog::SelectSkillDialog(WindowManager& parWindowManager)
         {
             skills[spec][i].widget->setWindowManager(&mWindowManager);
             skills[spec][i].widget->setSkillId(skills[spec][i].skillId);
-            skills[spec][i].widget->eventClicked = MyGUI::newDelegate(this, &SelectSkillDialog::onSkillClicked);
+            skills[spec][i].widget->eventClicked += MyGUI::newDelegate(this, &SelectSkillDialog::onSkillClicked);
         }
     }
 
@@ -821,7 +821,7 @@ SelectSkillDialog::SelectSkillDialog(WindowManager& parWindowManager)
     MyGUI::ButtonPtr cancelButton;
     getWidget(cancelButton, "CancelButton");
     cancelButton->setCaption(mWindowManager.getGameSettingString("sCancel", ""));
-    cancelButton->eventMouseButtonClick = MyGUI::newDelegate(this, &SelectSkillDialog::onCancelClicked);
+    cancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSkillDialog::onCancelClicked);
 }
 
 // widget controls
@@ -850,7 +850,7 @@ DescriptionDialog::DescriptionDialog(WindowManager& parWindowManager)
     // TODO: These buttons should be managed by a Dialog class
     MyGUI::ButtonPtr okButton;
     getWidget(okButton, "OKButton");
-    okButton->eventMouseButtonClick = MyGUI::newDelegate(this, &DescriptionDialog::onOkClicked);
+    okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &DescriptionDialog::onOkClicked);
     okButton->setCaption(mWindowManager.getGameSettingString("sInputMenu1", ""));
 
     // Make sure the edit box has focus
diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp
index 5f1734b195..0e3348086d 100644
--- a/apps/openmw/mwgui/class.hpp
+++ b/apps/openmw/mwgui/class.hpp
@@ -31,7 +31,7 @@ namespace MWGui
         int getChosenButton() const;
 
         // Events
-        typedef delegates::CDelegate1<int> EventHandle_Int;
+        typedef delegates::CMultiDelegate1<int> EventHandle_Int;
 
         /** Event : Button was clicked.\n
             signature : void method(MyGUI::WidgetPtr widget, int index)\n
@@ -43,11 +43,11 @@ namespace MWGui
 
     private:
 
-        void fitToText(MyGUI::StaticTextPtr widget);
+        void fitToText(MyGUI::TextBox* widget);
         void layoutVertically(MyGUI::WidgetPtr widget, int margin);
         int currentButton;
         MyGUI::WidgetPtr textBox;
-        MyGUI::StaticTextPtr text;
+        MyGUI::TextBox* text;
         MyGUI::WidgetPtr buttonBar;
         std::vector<MyGUI::ButtonPtr> buttons;
     };
@@ -78,7 +78,7 @@ namespace MWGui
         void open();
 
         // Events
-        typedef delegates::CDelegate0 EventHandle_Void;
+        typedef delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n
@@ -90,8 +90,8 @@ namespace MWGui
         void onBackClicked(MyGUI::Widget* _sender);
 
     private:
-        MyGUI::StaticImagePtr classImage;
-        MyGUI::StaticTextPtr  className;
+        MyGUI::ImageBox* classImage;
+        MyGUI::TextBox*  className;
 
         std::string currentClassId;
     };
@@ -108,7 +108,7 @@ namespace MWGui
         void open();
 
         // Events
-        typedef delegates::CDelegate0 EventHandle_Void;
+        typedef delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n
@@ -116,7 +116,7 @@ namespace MWGui
         EventHandle_Void eventBack;
 
     protected:
-        void onSelectClass(MyGUI::List* _sender, size_t _index);
+        void onSelectClass(MyGUI::ListBox* _sender, size_t _index);
 
         void onOkClicked(MyGUI::Widget* _sender);
         void onBackClicked(MyGUI::Widget* _sender);
@@ -125,9 +125,9 @@ namespace MWGui
         void updateClasses();
         void updateStats();
 
-        MyGUI::StaticImagePtr classImage;
-        MyGUI::ListPtr        classList;
-        MyGUI::StaticTextPtr  specializationName;
+        MyGUI::ImageBox* classImage;
+        MyGUI::ListBox*        classList;
+        MyGUI::TextBox*  specializationName;
         Widgets::MWAttributePtr favoriteAttribute[2];
         Widgets::MWSkillPtr   majorSkill[5];
         Widgets::MWSkillPtr   minorSkill[5];
@@ -143,7 +143,7 @@ namespace MWGui
         ESM::Class::Specialization getSpecializationId() const { return specializationId; }
 
         // Events
-        typedef delegates::CDelegate0 EventHandle_Void;
+        typedef delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Cancel button clicked.\n
             signature : void method()\n
@@ -160,7 +160,7 @@ namespace MWGui
         void onCancelClicked(MyGUI::Widget* _sender);
 
     private:
-        MyGUI::WidgetPtr      specialization0, specialization1, specialization2;
+        MyGUI::TextBox      *specialization0, *specialization1, *specialization2;
 
         ESM::Class::Specialization specializationId;
     };
@@ -175,7 +175,7 @@ namespace MWGui
         void setAffectedWidget(Widgets::MWAttributePtr widget) { affectedWidget = widget; }
 
         // Events
-        typedef delegates::CDelegate0 EventHandle_Void;
+        typedef delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Cancel button clicked.\n
             signature : void method()\n
@@ -207,7 +207,7 @@ namespace MWGui
         void setAffectedWidget(Widgets::MWSkillPtr widget) { affectedWidget = widget; }
 
         // Events
-        typedef delegates::CDelegate0 EventHandle_Void;
+        typedef delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Cancel button clicked.\n
             signature : void method()\n
@@ -264,7 +264,7 @@ namespace MWGui
         void open();
 
         // Events
-        typedef delegates::CDelegate0 EventHandle_Void;
+        typedef delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n
@@ -287,7 +287,7 @@ namespace MWGui
 
     private:
         MyGUI::EditPtr          editName;
-        MyGUI::WidgetPtr        specializationName;
+        MyGUI::TextBox*    specializationName;
         Widgets::MWAttributePtr favoriteAttribute0, favoriteAttribute1;
         Widgets::MWSkillPtr     majorSkill[5];
         Widgets::MWSkillPtr     minorSkill[5];
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index 0a5197c608..ac4f4a82a9 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -113,9 +113,9 @@ namespace MWGui
         getWidget(history, "list_History");
 
         // Set up the command line box
-        command->eventEditSelectAccept =
+        command->eventEditSelectAccept +=
             newDelegate(this, &Console::acceptCommand);
-        command->eventKeyButtonPressed =
+        command->eventKeyButtonPressed +=
             newDelegate(this, &Console::keyPress);
 
         // Set up the log window
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index cef47d074e..d6c4ce4e57 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -49,18 +49,25 @@ DialogueWindow::DialogueWindow(WindowManager& parWindowManager,MWWorld::Environm
     //History view
     getWidget(history, "History");
     history->setOverflowToTheLeft(true);
-    history->getClient()->eventMouseButtonClick = MyGUI::newDelegate(this, &DialogueWindow::onHistoryClicked);
     history->setMaxTextLength(1000000);
+    Widget* eventbox;
+
+    //An EditBox cannot receive mouse click events, so we use an
+    //invisible widget on top of the editbox to receive them
+    /// \todo scrolling the dialogue history with the mouse wheel doesn't work using this solution
+    getWidget(eventbox, "EventBox");
+    eventbox->eventMouseButtonClick += MyGUI::newDelegate(this, &DialogueWindow::onHistoryClicked);
+    
     //Topics list
     getWidget(topicsList, "TopicsList");
     topicsList->setScrollVisible(true);
-    //topicsList->eventListSelectAccept      = MyGUI::newDelegate(this, &DialogueWindow::onSelectTopic);
-    topicsList->eventListMouseItemActivate = MyGUI::newDelegate(this, &DialogueWindow::onSelectTopic);
-    //topicsList->eventListChangePosition    = MyGUI::newDelegate(this, &DialogueWindow::onSelectTopic);
+    //topicsList->eventListSelectAccept      += MyGUI::newDelegate(this, &DialogueWindow::onSelectTopic);
+    topicsList->eventListMouseItemActivate += MyGUI::newDelegate(this, &DialogueWindow::onSelectTopic);
+    //topicsList->eventListChangePosition    += MyGUI::newDelegate(this, &DialogueWindow::onSelectTopic);
 
     MyGUI::ButtonPtr byeButton;
     getWidget(byeButton, "ByeButton");
-    byeButton->eventMouseButtonClick = MyGUI::newDelegate(this, &DialogueWindow::onByeClicked);
+    byeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &DialogueWindow::onByeClicked);
 
     getWidget(pDispositionBar, "Disposition");
     getWidget(pDispositionText,"DispositionText");
@@ -68,11 +75,11 @@ DialogueWindow::DialogueWindow(WindowManager& parWindowManager,MWWorld::Environm
 
 void DialogueWindow::onHistoryClicked(MyGUI::Widget* _sender)
 {
-    ISubWidgetText* t = history->getSubWidgetText();
+    ISubWidgetText* t = history->getClient()->getSubWidgetText();
     if(t == nullptr)
         return;
 
-    const IntPoint& lastPressed = InputManager::getInstance().getLastLeftPressed();
+    const IntPoint& lastPressed = InputManager::getInstance().getLastPressedPosition(MyGUI::MouseButton::Left);
 
     size_t cursorPosition = t->getCursorPosition(lastPressed);
     MyGUI::UString color = history->getColorAtPos(cursorPosition);
@@ -99,7 +106,7 @@ void DialogueWindow::onByeClicked(MyGUI::Widget* _sender)
     mEnvironment.mDialogueManager->goodbyeSelected();
 }
 
-void DialogueWindow::onSelectTopic(MyGUI::List* _sender, size_t _index)
+void DialogueWindow::onSelectTopic(MyGUI::ListBox* _sender, size_t _index)
 {
     if (_index == MyGUI::ITEM_NONE)
         return;
diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
index 7dfd7bb7f4..b80a016cbe 100644
--- a/apps/openmw/mwgui/dialogue.hpp
+++ b/apps/openmw/mwgui/dialogue.hpp
@@ -21,7 +21,7 @@ namespace MWWorld
 
 namespace MWGui
 {
-    class DialogeHistory;
+    class DialogueHistory;
 
     using namespace MyGUI;
 
@@ -33,7 +33,7 @@ namespace MWGui
         void open();
 
         // Events
-        typedef delegates::CDelegate0 EventHandle_Void;
+        typedef delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Dialog finished, OK button clicked.\n
             signature : void method()\n
@@ -49,7 +49,7 @@ namespace MWGui
         void askQuestion(std::string question);
 
     protected:
-        void onSelectTopic(MyGUI::List* _sender, size_t _index);
+        void onSelectTopic(MyGUI::ListBox* _sender, size_t _index);
         void onByeClicked(MyGUI::Widget* _sender);
         void onHistoryClicked(MyGUI::Widget* _sender);
 
@@ -60,8 +60,8 @@ namespace MWGui
         */
         std::string parseText(std::string text);
 
-        DialogeHistory*     history;
-        MyGUI::ListPtr      topicsList;
+        DialogueHistory*     history;
+        MyGUI::ListBox*      topicsList;
         MyGUI::ProgressPtr pDispositionBar;
         MyGUI::EditPtr pDispositionText;
         std::map<std::string,std::string> pTopicsText;// this map links keyword and "real" text.
diff --git a/apps/openmw/mwgui/dialogue_history.cpp b/apps/openmw/mwgui/dialogue_history.cpp
index ceb9045281..cd34ee119d 100644
--- a/apps/openmw/mwgui/dialogue_history.cpp
+++ b/apps/openmw/mwgui/dialogue_history.cpp
@@ -13,10 +13,10 @@
 using namespace MWGui;
 using namespace Widgets;
 
-UString DialogeHistory::getColorAtPos(size_t _pos)
+UString DialogueHistory::getColorAtPos(size_t _pos)
 {
-    UString colour = TextIterator::convertTagColour(mText->getTextColour());
-    TextIterator iterator(mText->getCaption());
+    UString colour = TextIterator::convertTagColour(getTextColour());
+    TextIterator iterator(getCaption());
     while(iterator.moveNext())
     {
         size_t pos = iterator.getPosition();
@@ -29,12 +29,12 @@ UString DialogeHistory::getColorAtPos(size_t _pos)
     return colour;
 }
 
-UString DialogeHistory::getColorTextAt(size_t _pos)
+UString DialogueHistory::getColorTextAt(size_t _pos)
 {
     bool breakOnNext = false;
-    UString colour = TextIterator::convertTagColour(mText->getTextColour());
+    UString colour = TextIterator::convertTagColour(getTextColour());
     UString colour2 = colour;
-    TextIterator iterator(mText->getCaption());
+    TextIterator iterator(getCaption());
     TextIterator col_start = iterator;
     while(iterator.moveNext())
     {
@@ -59,7 +59,7 @@ UString DialogeHistory::getColorTextAt(size_t _pos)
     return "";
 }
 
-void DialogeHistory::addDialogHeading(const UString& parText)
+void DialogueHistory::addDialogHeading(const UString& parText)
 {
     UString head("\n#D8C09A");
     head.append(parText);
@@ -67,7 +67,7 @@ void DialogeHistory::addDialogHeading(const UString& parText)
     addText(head);
 }
 
-void DialogeHistory::addDialogText(const UString& parText)
+void DialogueHistory::addDialogText(const UString& parText)
 {
     addText(parText);
     addText("\n");
diff --git a/apps/openmw/mwgui/dialogue_history.hpp b/apps/openmw/mwgui/dialogue_history.hpp
index ec41678e60..12a9c53e74 100644
--- a/apps/openmw/mwgui/dialogue_history.hpp
+++ b/apps/openmw/mwgui/dialogue_history.hpp
@@ -5,9 +5,9 @@
 namespace MWGui
 {
     using namespace MyGUI;
-    class DialogeHistory : public MyGUI::Edit
+    class DialogueHistory : public MyGUI::EditBox
     {
-        MYGUI_RTTI_DERIVED( DialogeHistory )
+        MYGUI_RTTI_DERIVED( DialogueHistory )
         public:
             Widget* getClient() { return mClient; }
             UString getColorAtPos(size_t _pos);
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 5c9ef1f9b2..644bcbc04f 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -89,9 +89,9 @@ MWGui::JournalWindow::JournalWindow (WindowManager& parWindowManager)
     getWidget(mLeftTextWidget, "LeftText");
     getWidget(mRightTextWidget, "RightText");
     getWidget(mPrevBtn, "PrevPageBTN");
-    mPrevBtn->eventMouseButtonClick = MyGUI::newDelegate(this,&MWGui::JournalWindow::notifyPrevPage);
+    mPrevBtn->eventMouseButtonClick += MyGUI::newDelegate(this,&MWGui::JournalWindow::notifyPrevPage);
     getWidget(mNextBtn, "NextPageBTN");
-    mNextBtn->eventMouseButtonClick = MyGUI::newDelegate(this,&MWGui::JournalWindow::notifyNextPage);
+    mNextBtn->eventMouseButtonClick += MyGUI::newDelegate(this,&MWGui::JournalWindow::notifyNextPage);
     //MyGUI::ItemBox* list = new MyGUI::ItemBox();
     //list->addItem("qaq","aqzazaz");
     //mScrollerWidget->addChildItem(list);
@@ -111,7 +111,7 @@ MWGui::JournalWindow::JournalWindow (WindowManager& parWindowManager)
     //displayLeftText(list.front());
 
     MyGUI::WindowPtr t = static_cast<MyGUI::WindowPtr>(mMainWidget);
-    t->eventWindowChangeCoord = MyGUI::newDelegate(this, &JournalWindow::onWindowResize);
+    t->eventWindowChangeCoord += MyGUI::newDelegate(this, &JournalWindow::onWindowResize);
 }
 
 void MWGui::JournalWindow::open()
diff --git a/apps/openmw/mwgui/journalwindow.hpp b/apps/openmw/mwgui/journalwindow.hpp
index e664487634..4656c7a482 100644
--- a/apps/openmw/mwgui/journalwindow.hpp
+++ b/apps/openmw/mwgui/journalwindow.hpp
@@ -41,7 +41,7 @@ namespace MWGui
             static const int lineHeight;
 
             MyGUI::WidgetPtr skillAreaWidget, skillClientWidget;
-            MyGUI::VScrollPtr skillScrollerWidget;
+            MyGUI::ScrollBar* skillScrollerWidget;
             int lastPos, clientHeight;
             MyGUI::EditPtr mLeftTextWidget;
             MyGUI::EditPtr mRightTextWidget;
@@ -54,4 +54,4 @@ namespace MWGui
 
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/apps/openmw/mwgui/layouts.hpp b/apps/openmw/mwgui/layouts.hpp
index 9917dcdccc..71181e48d4 100644
--- a/apps/openmw/mwgui/layouts.hpp
+++ b/apps/openmw/mwgui/layouts.hpp
@@ -45,18 +45,18 @@ namespace MWGui
     void setBatchCount(size_t count);
 
     MyGUI::ProgressPtr health, magicka, stamina;
-    MyGUI::StaticImagePtr weapImage, spellImage;
+    MyGUI::ImageBox *weapImage, *spellImage;
     MyGUI::ProgressPtr weapStatus, spellStatus;
     MyGUI::WidgetPtr effectBox;
-    MyGUI::StaticImagePtr effect1;
-    MyGUI::StaticImagePtr minimap;
-    MyGUI::StaticImagePtr compass;
-    MyGUI::StaticImagePtr crosshair;
+    MyGUI::ImageBox* effect1;
+    MyGUI::ImageBox* minimap;
+    MyGUI::ImageBox* compass;
+    MyGUI::ImageBox* crosshair;
 
     MyGUI::WidgetPtr fpsbox;
-    MyGUI::StaticTextPtr fpscounter;
-    MyGUI::StaticTextPtr trianglecounter;
-    MyGUI::StaticTextPtr batchcounter;
+    MyGUI::TextBox* fpscounter;
+    MyGUI::TextBox* trianglecounter;
+    MyGUI::TextBox* batchcounter;
   };
 
   class MapWindow : public OEngine::GUI::Layout
@@ -75,7 +75,7 @@ namespace MWGui
 
     void setCellName(const std::string& cellName)
     {
-      mMainWidget->setCaption(cellName);
+      static_cast<MyGUI::Window*>(mMainWidget)->setCaption(cellName);
     }
   };
 
@@ -127,7 +127,7 @@ namespace MWGui
       getWidget(avatar, "Avatar");
 
       // Adjust armor rating text to bottom of avatar widget
-      MyGUI::StaticTextPtr armor_rating;
+      MyGUI::TextBox* armor_rating;
       getWidget(armor_rating, "ArmorRating");
       armor_rating->setCaption("Armor: 11");
       MyGUI::IntCoord coord = armor_rating->getCoord();
@@ -165,7 +165,7 @@ namespace MWGui
           last_x += coord.width + margin;
           button_pt->setCoord(coord);
 
-          button_pt->eventMouseButtonClick = MyGUI::newDelegate(this, &InventoryWindow::onCategorySelected);
+          button_pt->eventMouseButtonClick += MyGUI::newDelegate(this, &InventoryWindow::onCategorySelected);
       }
     }
 
diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index cd32fc40f8..c103bcb8b8 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -166,7 +166,8 @@ MessageBox::MessageBox(MessageBoxManager& parMessageBoxManager, const std::strin
 
     mMessageWidget->setSize(size);
 
-    MyGUI::IntSize textSize = mMessageWidget->_getTextSize();
+    MyGUI::IntSize textSize = mMessageWidget->getTextSize();
+
     size.height = mHeight = textSize.height + 20; // this is the padding between the text and the box
 
     mMainWidget->setSize(size);
@@ -176,7 +177,7 @@ MessageBox::MessageBox(MessageBoxManager& parMessageBoxManager, const std::strin
 
 void MessageBox::update (int height)
 {
-    MyGUI::IntSize gameWindowSize = mMessageBoxManager.mWindowManager->getGui()->getViewSize();
+    MyGUI::IntSize gameWindowSize = MyGUI::RenderManager::getInstance().getViewSize();
     MyGUI::IntCoord coord;
     coord.left = (gameWindowSize.width - mFixedWidth)/2;
     coord.top = (gameWindowSize.height - mHeight - height - mBottomPadding);
@@ -219,9 +220,9 @@ InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxMan
     mMessageWidget->setOverflowToTheLeft(true);
     mMessageWidget->addText(message);
 
-    MyGUI::IntSize textSize = mMessageWidget->_getTextSize();
+    MyGUI::IntSize textSize = mMessageWidget->getTextSize();
 
-    MyGUI::IntSize gameWindowSize = mMessageBoxManager.mWindowManager->getGui()->getViewSize();
+    MyGUI::IntSize gameWindowSize = MyGUI::RenderManager::getInstance().getViewSize();
 
     int biggestButtonWidth = 0;
     int buttonWidth = 0;
@@ -239,13 +240,13 @@ InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxMan
             MyGUI::Align::Default);
         button->setCaption(*it);
 
-        button->eventMouseButtonClick = MyGUI::newDelegate(this, &InteractiveMessageBox::mousePressed);
+        button->eventMouseButtonClick += MyGUI::newDelegate(this, &InteractiveMessageBox::mousePressed);
 
         mButtons.push_back(button);
 
-        buttonWidth = button->_getTextSize().width + 2*buttonPadding + buttonLeftPadding;
+        buttonWidth = button->getTextSize().width + 2*buttonPadding + buttonLeftPadding;
         buttonsWidth += buttonWidth;
-        buttonHeight = button->_getTextSize().height + 2*buttonPadding + buttonTopPadding;
+        buttonHeight = button->getTextSize().height + 2*buttonPadding + buttonTopPadding;
 
         if(buttonWidth > biggestButtonWidth)
         {
@@ -299,8 +300,8 @@ InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxMan
             buttonCord.left = left;
             buttonCord.top = textSize.height + textButtonPadding;
 
-            buttonSize.width = (*button)->_getTextSize().width + 2*buttonPadding;
-            buttonSize.height = (*button)->_getTextSize().height + 2*buttonPadding;
+            buttonSize.width = (*button)->getTextSize().width + 2*buttonPadding;
+            buttonSize.height = (*button)->getTextSize().height + 2*buttonPadding;
 
             (*button)->setCoord(buttonCord);
             (*button)->setSize(buttonSize);
@@ -347,8 +348,8 @@ InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxMan
         std::vector<MyGUI::ButtonPtr>::const_iterator button;
         for(button = mButtons.begin(); button != mButtons.end(); ++button)
         {
-            buttonSize.width = (*button)->_getTextSize().width + buttonPadding*2;
-            buttonSize.height = (*button)->_getTextSize().height + buttonPadding*2;
+            buttonSize.width = (*button)->getTextSize().width + buttonPadding*2;
+            buttonSize.height = (*button)->getTextSize().height + buttonPadding*2;
 
             buttonCord.top = top;
             buttonCord.left = (mainWidgetSize.width - buttonSize.width)/2 - 5; // FIXME: -5 is not so nice :/
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 037f97fc36..880c0bc520 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -34,7 +34,7 @@ RaceDialog::RaceDialog(WindowManager& parWindowManager)
     headRotate->setScrollRange(50);
     headRotate->setScrollPosition(20);
     headRotate->setScrollViewPage(10);
-    headRotate->eventScrollChangePosition = MyGUI::newDelegate(this, &RaceDialog::onHeadRotate);
+    headRotate->eventScrollChangePosition += MyGUI::newDelegate(this, &RaceDialog::onHeadRotate);
 
     // Set up next/previous buttons
     MyGUI::ButtonPtr prevButton, nextButton;
@@ -42,27 +42,27 @@ RaceDialog::RaceDialog(WindowManager& parWindowManager)
     setText("GenderChoiceT", mWindowManager.getGameSettingString("sRaceMenu2", "Change Sex"));
     getWidget(prevButton, "PrevGenderButton");
     getWidget(nextButton, "NextGenderButton");
-    prevButton->eventMouseButtonClick = MyGUI::newDelegate(this, &RaceDialog::onSelectPreviousGender);
-    nextButton->eventMouseButtonClick = MyGUI::newDelegate(this, &RaceDialog::onSelectNextGender);
+    prevButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onSelectPreviousGender);
+    nextButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onSelectNextGender);
 
     setText("FaceChoiceT", mWindowManager.getGameSettingString("sRaceMenu3", "Change Face"));
     getWidget(prevButton, "PrevFaceButton");
     getWidget(nextButton, "NextFaceButton");
-    prevButton->eventMouseButtonClick = MyGUI::newDelegate(this, &RaceDialog::onSelectPreviousFace);
-    nextButton->eventMouseButtonClick = MyGUI::newDelegate(this, &RaceDialog::onSelectNextFace);
+    prevButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onSelectPreviousFace);
+    nextButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onSelectNextFace);
 
     setText("HairChoiceT", mWindowManager.getGameSettingString("sRaceMenu3", "Change Hair"));
     getWidget(prevButton, "PrevHairButton");
     getWidget(nextButton, "NextHairButton");
-    prevButton->eventMouseButtonClick = MyGUI::newDelegate(this, &RaceDialog::onSelectPreviousHair);
-    nextButton->eventMouseButtonClick = MyGUI::newDelegate(this, &RaceDialog::onSelectNextHair);
+    prevButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onSelectPreviousHair);
+    nextButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onSelectNextHair);
 
     setText("RaceT", mWindowManager.getGameSettingString("sRaceMenu4", "Race"));
     getWidget(raceList, "RaceList");
     raceList->setScrollVisible(true);
-    raceList->eventListSelectAccept = MyGUI::newDelegate(this, &RaceDialog::onSelectRace);
-    raceList->eventListMouseItemActivate = MyGUI::newDelegate(this, &RaceDialog::onSelectRace);
-    raceList->eventListChangePosition = MyGUI::newDelegate(this, &RaceDialog::onSelectRace);
+    raceList->eventListSelectAccept += MyGUI::newDelegate(this, &RaceDialog::onSelectRace);
+    raceList->eventListMouseItemActivate += MyGUI::newDelegate(this, &RaceDialog::onSelectRace);
+    raceList->eventListChangePosition += MyGUI::newDelegate(this, &RaceDialog::onSelectRace);
 
     setText("SkillsT", mWindowManager.getGameSettingString("sBonusSkillTitle", "Skill Bonus"));
     getWidget(skillList, "SkillList");
@@ -72,11 +72,11 @@ RaceDialog::RaceDialog(WindowManager& parWindowManager)
     // TODO: These buttons should be managed by a Dialog class
     MyGUI::ButtonPtr backButton;
     getWidget(backButton, "BackButton");
-    backButton->eventMouseButtonClick = MyGUI::newDelegate(this, &RaceDialog::onBackClicked);
+    backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onBackClicked);
 
     MyGUI::ButtonPtr okButton;
     getWidget(okButton, "OKButton");
-    okButton->eventMouseButtonClick = MyGUI::newDelegate(this, &RaceDialog::onOkClicked);
+    okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onOkClicked);
 
     updateRaces();
     updateSkills();
@@ -157,7 +157,7 @@ void RaceDialog::onBackClicked(MyGUI::Widget* _sender)
     eventBack();
 }
 
-void RaceDialog::onHeadRotate(MyGUI::VScroll*, size_t _position)
+void RaceDialog::onHeadRotate(MyGUI::ScrollBar*, size_t _position)
 {
     // TODO: Rotate head
 }
@@ -192,7 +192,7 @@ void RaceDialog::onSelectNextHair(MyGUI::Widget*)
     hairIndex = wrap(hairIndex - 1, hairCount);
 }
 
-void RaceDialog::onSelectRace(MyGUI::List* _sender, size_t _index)
+void RaceDialog::onSelectRace(MyGUI::ListBox* _sender, size_t _index)
 {
     if (_index == MyGUI::ITEM_NONE)
         return;
diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp
index f2aac3a18c..bcd3b5185f 100644
--- a/apps/openmw/mwgui/race.hpp
+++ b/apps/openmw/mwgui/race.hpp
@@ -46,7 +46,7 @@ namespace MWGui
         void open();
 
         // Events
-        typedef delegates::CDelegate0 EventHandle_Void;
+        typedef delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n
@@ -54,7 +54,7 @@ namespace MWGui
         EventHandle_Void eventBack;
 
     protected:
-        void onHeadRotate(MyGUI::VScroll* _sender, size_t _position);
+        void onHeadRotate(MyGUI::ScrollBar* _sender, size_t _position);
 
         void onSelectPreviousGender(MyGUI::Widget* _sender);
         void onSelectNextGender(MyGUI::Widget* _sender);
@@ -65,7 +65,7 @@ namespace MWGui
         void onSelectPreviousHair(MyGUI::Widget* _sender);
         void onSelectNextHair(MyGUI::Widget* _sender);
 
-        void onSelectRace(MyGUI::List* _sender, size_t _index);
+        void onSelectRace(MyGUI::ListBox* _sender, size_t _index);
 
         void onOkClicked(MyGUI::Widget* _sender);
         void onBackClicked(MyGUI::Widget* _sender);
@@ -76,8 +76,8 @@ namespace MWGui
         void updateSpellPowers();
 
         MyGUI::CanvasPtr  appearanceBox;
-        MyGUI::ListPtr    raceList;
-        MyGUI::HScrollPtr headRotate;
+        MyGUI::ListBox*    raceList;
+        MyGUI::ScrollBar* headRotate;
 
         MyGUI::WidgetPtr skillList;
         std::vector<MyGUI::WidgetPtr> skillItems;
diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp
index e770ec2351..cb0d9969c6 100644
--- a/apps/openmw/mwgui/review.cpp
+++ b/apps/openmw/mwgui/review.cpp
@@ -28,22 +28,22 @@ ReviewDialog::ReviewDialog(WindowManager& parWindowManager)
     getWidget(nameWidget, "NameText");
     getWidget(button, "NameButton");
     button->setCaption(mWindowManager.getGameSettingString("sName", ""));
-    button->eventMouseButtonClick = MyGUI::newDelegate(this, &ReviewDialog::onNameClicked);;
+    button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onNameClicked);;
 
     getWidget(raceWidget, "RaceText");
     getWidget(button, "RaceButton");
     button->setCaption(mWindowManager.getGameSettingString("sRace", ""));
-    button->eventMouseButtonClick = MyGUI::newDelegate(this, &ReviewDialog::onRaceClicked);;
+    button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onRaceClicked);;
 
     getWidget(classWidget, "ClassText");
     getWidget(button, "ClassButton");
     button->setCaption(mWindowManager.getGameSettingString("sClass", ""));
-    button->eventMouseButtonClick = MyGUI::newDelegate(this, &ReviewDialog::onClassClicked);;
+    button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onClassClicked);;
 
     getWidget(birthSignWidget, "SignText");
     getWidget(button, "SignButton");
     button->setCaption(mWindowManager.getGameSettingString("sBirthSign", ""));
-    button->eventMouseButtonClick = MyGUI::newDelegate(this, &ReviewDialog::onBirthSignClicked);;
+    button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onBirthSignClicked);;
 
     // Setup dynamic stats
     getWidget(health, "Health");
@@ -75,25 +75,25 @@ ReviewDialog::ReviewDialog(WindowManager& parWindowManager)
     getWidget(skillClientWidget, "SkillClient");
     getWidget(skillScrollerWidget, "SkillScroller");
 
-    skillScrollerWidget->eventScrollChangePosition = MyGUI::newDelegate(this, &ReviewDialog::onScrollChangePosition);
+    skillScrollerWidget->eventScrollChangePosition += MyGUI::newDelegate(this, &ReviewDialog::onScrollChangePosition);
     updateScroller();
 
     for (int i = 0; i < ESM::Skill::Length; ++i)
     {
         skillValues.insert(std::make_pair(i, MWMechanics::Stat<float>()));
-        skillWidgetMap.insert(std::make_pair(i, static_cast<MyGUI::StaticText*> (0)));
+        skillWidgetMap.insert(std::make_pair(i, static_cast<MyGUI::TextBox*> (0)));
     }
 
-    static_cast<MyGUI::WindowPtr>(mMainWidget)->eventWindowChangeCoord = MyGUI::newDelegate(this, &ReviewDialog::onWindowResize);
+    static_cast<MyGUI::WindowPtr>(mMainWidget)->eventWindowChangeCoord += MyGUI::newDelegate(this, &ReviewDialog::onWindowResize);
 
     // TODO: These buttons should be managed by a Dialog class
     MyGUI::ButtonPtr backButton;
     getWidget(backButton, "BackButton");
-    backButton->eventMouseButtonClick = MyGUI::newDelegate(this, &ReviewDialog::onBackClicked);
+    backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onBackClicked);
 
     MyGUI::ButtonPtr okButton;
     getWidget(okButton, "OKButton");
-    okButton->eventMouseButtonClick = MyGUI::newDelegate(this, &ReviewDialog::onOkClicked);
+    okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onOkClicked);
 }
 
 void ReviewDialog::open()
@@ -102,7 +102,7 @@ void ReviewDialog::open()
     setVisible(true);
 }
 
-void ReviewDialog::onScrollChangePosition(MyGUI::VScrollPtr scroller, size_t pos)
+void ReviewDialog::onScrollChangePosition(MyGUI::ScrollBar* scroller, size_t pos)
 {
     int diff = lastPos - pos;
     // Adjust position of all widget according to difference
@@ -176,7 +176,7 @@ void ReviewDialog::setAttribute(ESM::Attribute::AttributeID attributeId, const M
 void ReviewDialog::setSkillValue(ESM::Skill::SkillEnum skillId, const MWMechanics::Stat<float>& value)
 {
     skillValues[skillId] = value;
-    MyGUI::StaticTextPtr widget = skillWidgetMap[skillId];
+    MyGUI::TextBox* widget = skillWidgetMap[skillId];
     if (widget)
     {
         float modified = value.getModified(), base = value.getBase();
@@ -210,7 +210,7 @@ void ReviewDialog::configureSkills(const std::vector<int>& major, const std::vec
     }
 }
 
-void ReviewDialog::setStyledText(MyGUI::StaticTextPtr widget, ColorStyle style, const std::string &value)
+void ReviewDialog::setStyledText(MyGUI::TextBox* widget, ColorStyle style, const std::string &value)
 {
     widget->setCaption(value);
     if (style == CS_Super)
@@ -223,7 +223,7 @@ void ReviewDialog::setStyledText(MyGUI::StaticTextPtr widget, ColorStyle style,
 
 void ReviewDialog::addSeparator(MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
 {
-    MyGUI::StaticImagePtr separator = skillClientWidget->createWidget<MyGUI::StaticImage>("MW_HLine", MyGUI::IntCoord(10, coord1.top, coord1.width + coord2.width - 4, 18), MyGUI::Align::Default);
+    MyGUI::ImageBox* separator = skillClientWidget->createWidget<MyGUI::ImageBox>("MW_HLine", MyGUI::IntCoord(10, coord1.top, coord1.width + coord2.width - 4, 18), MyGUI::Align::Default);
     skillWidgets.push_back(separator);
 
     coord1.top += separator->getHeight();
@@ -232,7 +232,7 @@ void ReviewDialog::addSeparator(MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2
 
 void ReviewDialog::addGroup(const std::string &label, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
 {
-    MyGUI::StaticTextPtr groupWidget = skillClientWidget->createWidget<MyGUI::StaticText>("SandBrightText", MyGUI::IntCoord(0, coord1.top, coord1.width + coord2.width, coord1.height), MyGUI::Align::Default);
+    MyGUI::TextBox* groupWidget = skillClientWidget->createWidget<MyGUI::TextBox>("SandBrightText", MyGUI::IntCoord(0, coord1.top, coord1.width + coord2.width, coord1.height), MyGUI::Align::Default);
     groupWidget->setCaption(label);
     skillWidgets.push_back(groupWidget);
 
@@ -240,14 +240,15 @@ void ReviewDialog::addGroup(const std::string &label, MyGUI::IntCoord &coord1, M
     coord2.top += lineHeight;
 }
 
-MyGUI::StaticTextPtr ReviewDialog::addValueItem(const std::string text, const std::string &value, ColorStyle style, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
+MyGUI::TextBox* ReviewDialog::addValueItem(const std::string text, const std::string &value, ColorStyle style, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
 {
-    MyGUI::StaticTextPtr skillNameWidget, skillValueWidget;
+    MyGUI::TextBox* skillNameWidget;
+    MyGUI::TextBox* skillValueWidget;
 
-    skillNameWidget = skillClientWidget->createWidget<MyGUI::StaticText>("SandText", coord1, MyGUI::Align::Default);
+    skillNameWidget = skillClientWidget->createWidget<MyGUI::TextBox>("SandText", coord1, MyGUI::Align::Default);
     skillNameWidget->setCaption(text);
 
-    skillValueWidget = skillClientWidget->createWidget<MyGUI::StaticText>("SandTextRight", coord2, MyGUI::Align::Default);
+    skillValueWidget = skillClientWidget->createWidget<MyGUI::TextBox>("SandTextRight", coord2, MyGUI::Align::Default);
     setStyledText(skillValueWidget, style, value);
 
     skillWidgets.push_back(skillNameWidget);
@@ -261,9 +262,9 @@ MyGUI::StaticTextPtr ReviewDialog::addValueItem(const std::string text, const st
 
 void ReviewDialog::addItem(const std::string text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
 {
-    MyGUI::StaticTextPtr skillNameWidget;
+    MyGUI::TextBox* skillNameWidget;
 
-    skillNameWidget = skillClientWidget->createWidget<MyGUI::StaticText>("SandText", coord1 + MyGUI::IntSize(coord2.width, 0), MyGUI::Align::Default);
+    skillNameWidget = skillClientWidget->createWidget<MyGUI::TextBox>("SandText", coord1 + MyGUI::IntSize(coord2.width, 0), MyGUI::Align::Default);
     skillNameWidget->setCaption(text);
 
     skillWidgets.push_back(skillNameWidget);
@@ -299,7 +300,7 @@ void ReviewDialog::addSkills(const SkillList &skills, const std::string &titleId
             style = CS_Super;
         else if (modified < base)
             style = CS_Sub;
-        MyGUI::StaticTextPtr widget = addValueItem(mWindowManager.getGameSettingString(skillNameId, skillNameId), boost::lexical_cast<std::string>(static_cast<int>(modified)), style, coord1, coord2);
+        MyGUI::TextBox* widget = addValueItem(mWindowManager.getGameSettingString(skillNameId, skillNameId), boost::lexical_cast<std::string>(static_cast<int>(modified)), style, coord1, coord2);
         skillWidgetMap[skillId] = widget;
     }
 }
diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp
index 5846804f7f..588c1b6b5d 100644
--- a/apps/openmw/mwgui/review.hpp
+++ b/apps/openmw/mwgui/review.hpp
@@ -49,8 +49,8 @@ namespace MWGui
         void open();
 
         // Events
-        typedef delegates::CDelegate0 EventHandle_Void;
-        typedef delegates::CDelegate1<int> EventHandle_Int;
+        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef delegates::CMultiDelegate1<int> EventHandle_Int;
 
         /** Event : Back button clicked.\n
         signature : void method()\n
@@ -75,23 +75,23 @@ namespace MWGui
             CS_Normal,
             CS_Super
         };
-        void setStyledText(MyGUI::StaticTextPtr widget, ColorStyle style, const std::string &value);
+        void setStyledText(MyGUI::TextBox* widget, ColorStyle style, const std::string &value);
         void addSkills(const SkillList &skills, const std::string &titleId, const std::string &titleDefault, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
         void addSeparator(MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
         void addGroup(const std::string &label, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
-        MyGUI::StaticTextPtr addValueItem(const std::string text, const std::string &value, ColorStyle style, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
+        MyGUI::TextBox* addValueItem(const std::string text, const std::string &value, ColorStyle style, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
         void addItem(const std::string text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
         void updateScroller();
         void updateSkillArea();
 
-        void onScrollChangePosition(MyGUI::VScrollPtr scroller, size_t pos);
+        void onScrollChangePosition(MyGUI::ScrollBar* scroller, size_t pos);
         void onWindowResize(MyGUI::Window* window);
 
         static const int lineHeight;
 
-        MyGUI::StaticTextPtr nameWidget, raceWidget, classWidget, birthSignWidget;
+        MyGUI::TextBox *nameWidget, *raceWidget, *classWidget, *birthSignWidget;
         MyGUI::WidgetPtr skillAreaWidget, skillClientWidget;
-        MyGUI::VScrollPtr skillScrollerWidget;
+        MyGUI::ScrollBar* skillScrollerWidget;
         int lastPos, clientHeight;
 
         Widgets::MWDynamicStatPtr health, magicka, fatigue;
@@ -100,7 +100,7 @@ namespace MWGui
 
         SkillList majorSkills, minorSkills, miscSkills;
         std::map<int, MWMechanics::Stat<float> > skillValues;
-        std::map<int, MyGUI::StaticTextPtr> skillWidgetMap;
+        std::map<int, MyGUI::TextBox*> skillWidgetMap;
         std::string name, raceId, birthSignId;
         ESM::Class klass;
         std::vector<MyGUI::WidgetPtr> skillWidgets; //< Skills and other information
diff --git a/apps/openmw/mwgui/stats_window.cpp b/apps/openmw/mwgui/stats_window.cpp
index 30a4015e33..243b6272a5 100644
--- a/apps/openmw/mwgui/stats_window.cpp
+++ b/apps/openmw/mwgui/stats_window.cpp
@@ -48,20 +48,20 @@ StatsWindow::StatsWindow (WindowManager& parWindowManager)
     getWidget(skillClientWidget, "SkillClient");
     getWidget(skillScrollerWidget, "SkillScroller");
 
-    skillScrollerWidget->eventScrollChangePosition = MyGUI::newDelegate(this, &StatsWindow::onScrollChangePosition);
+    skillScrollerWidget->eventScrollChangePosition += MyGUI::newDelegate(this, &StatsWindow::onScrollChangePosition);
     updateScroller();
 
     for (int i = 0; i < ESM::Skill::Length; ++i)
     {
         skillValues.insert(std::pair<int, MWMechanics::Stat<float> >(i, MWMechanics::Stat<float>()));
-        skillWidgetMap.insert(std::pair<int, MyGUI::StaticTextPtr>(i, nullptr));
+        skillWidgetMap.insert(std::pair<int, MyGUI::TextBox*>(i, nullptr));
     }
 
     MyGUI::WindowPtr t = static_cast<MyGUI::WindowPtr>(mMainWidget);
-    t->eventWindowChangeCoord = MyGUI::newDelegate(this, &StatsWindow::onWindowResize);
+    t->eventWindowChangeCoord += MyGUI::newDelegate(this, &StatsWindow::onWindowResize);
 }
 
-void StatsWindow::onScrollChangePosition(MyGUI::VScrollPtr scroller, size_t pos)
+void StatsWindow::onScrollChangePosition(MyGUI::ScrollBar* scroller, size_t pos)
 {
     int diff = lastPos - pos;
     // Adjust position of all widget according to difference
@@ -95,10 +95,10 @@ void StatsWindow::setBar(const std::string& name, const std::string& tname, int
 
 void StatsWindow::setPlayerName(const std::string& playerName)
 {
-    mMainWidget->setCaption(playerName);
+    static_cast<MyGUI::Window*>(mMainWidget)->setCaption(playerName);
 }
 
-void StatsWindow::setStyledText(MyGUI::StaticTextPtr widget, ColorStyle style, const std::string &value)
+void StatsWindow::setStyledText(MyGUI::TextBox* widget, ColorStyle style, const std::string &value)
 {
     widget->setCaption(value);
     if (style == CS_Super)
@@ -175,7 +175,7 @@ void StatsWindow::setValue (const std::string& id, int value)
 void StatsWindow::setValue(const ESM::Skill::SkillEnum parSkill, const MWMechanics::Stat<float>& value)
 {
     skillValues[parSkill] = value;
-    MyGUI::StaticTextPtr widget = skillWidgetMap[(int)parSkill];
+    MyGUI::TextBox* widget = skillWidgetMap[(int)parSkill];
     if (widget)
     {
         float modified = value.getModified(), base = value.getBase();
@@ -221,7 +221,7 @@ void StatsWindow::setBirthSign (const std::string& signId)
 
 void StatsWindow::addSeparator(MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
 {
-    MyGUI::StaticImagePtr separator = skillClientWidget->createWidget<MyGUI::StaticImage>("MW_HLine", MyGUI::IntCoord(10, coord1.top, coord1.width + coord2.width - 4, 18), MyGUI::Align::Default);
+    MyGUI::ImageBox* separator = skillClientWidget->createWidget<MyGUI::ImageBox>("MW_HLine", MyGUI::IntCoord(10, coord1.top, coord1.width + coord2.width - 4, 18), MyGUI::Align::Default);
     skillWidgets.push_back(separator);
 
     coord1.top += separator->getHeight();
@@ -230,7 +230,7 @@ void StatsWindow::addSeparator(MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
 
 void StatsWindow::addGroup(const std::string &label, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
 {
-    MyGUI::StaticTextPtr groupWidget = skillClientWidget->createWidget<MyGUI::StaticText>("SandBrightText", MyGUI::IntCoord(0, coord1.top, coord1.width + coord2.width, coord1.height), MyGUI::Align::Default);
+    MyGUI::TextBox* groupWidget = skillClientWidget->createWidget<MyGUI::TextBox>("SandBrightText", MyGUI::IntCoord(0, coord1.top, coord1.width + coord2.width, coord1.height), MyGUI::Align::Default);
     groupWidget->setCaption(label);
     skillWidgets.push_back(groupWidget);
 
@@ -238,14 +238,14 @@ void StatsWindow::addGroup(const std::string &label, MyGUI::IntCoord &coord1, My
     coord2.top += lineHeight;
 }
 
-MyGUI::StaticTextPtr StatsWindow::addValueItem(const std::string text, const std::string &value, ColorStyle style, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
+MyGUI::TextBox* StatsWindow::addValueItem(const std::string text, const std::string &value, ColorStyle style, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
 {
-    MyGUI::StaticTextPtr skillNameWidget, skillValueWidget;
+    MyGUI::TextBox *skillNameWidget, *skillValueWidget;
 
-    skillNameWidget = skillClientWidget->createWidget<MyGUI::StaticText>("SandText", coord1, MyGUI::Align::Default);
+    skillNameWidget = skillClientWidget->createWidget<MyGUI::TextBox>("SandText", coord1, MyGUI::Align::Default);
     skillNameWidget->setCaption(text);
 
-    skillValueWidget = skillClientWidget->createWidget<MyGUI::StaticText>("SandTextRight", coord2, MyGUI::Align::Default);
+    skillValueWidget = skillClientWidget->createWidget<MyGUI::TextBox>("SandTextRight", coord2, MyGUI::Align::Default);
     setStyledText(skillValueWidget, style, value);
 
     skillWidgets.push_back(skillNameWidget);
@@ -259,9 +259,9 @@ MyGUI::StaticTextPtr StatsWindow::addValueItem(const std::string text, const std
 
 void StatsWindow::addItem(const std::string text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2)
 {
-    MyGUI::StaticTextPtr skillNameWidget;
+    MyGUI::TextBox* skillNameWidget;
 
-    skillNameWidget = skillClientWidget->createWidget<MyGUI::StaticText>("SandText", coord1 + MyGUI::IntSize(coord2.width, 0), MyGUI::Align::Default);
+    skillNameWidget = skillClientWidget->createWidget<MyGUI::TextBox>("SandText", coord1 + MyGUI::IntSize(coord2.width, 0), MyGUI::Align::Default);
     skillNameWidget->setCaption(text);
 
     skillWidgets.push_back(skillNameWidget);
@@ -297,7 +297,7 @@ void StatsWindow::addSkills(const SkillList &skills, const std::string &titleId,
             style = CS_Super;
         else if (modified < base)
             style = CS_Sub;
-        MyGUI::StaticTextPtr widget = addValueItem(mWindowManager.getGameSettingString(skillNameId, skillNameId), boost::lexical_cast<std::string>(static_cast<int>(modified)), style, coord1, coord2);
+        MyGUI::TextBox* widget = addValueItem(mWindowManager.getGameSettingString(skillNameId, skillNameId), boost::lexical_cast<std::string>(static_cast<int>(modified)), style, coord1, coord2);
         skillWidgetMap[skillId] = widget;
     }
 }
diff --git a/apps/openmw/mwgui/stats_window.hpp b/apps/openmw/mwgui/stats_window.hpp
index 9db5c240b1..2ff170f571 100644
--- a/apps/openmw/mwgui/stats_window.hpp
+++ b/apps/openmw/mwgui/stats_window.hpp
@@ -49,26 +49,26 @@ namespace MWGui
                 CS_Normal,
                 CS_Super
             };
-            void setStyledText(MyGUI::StaticTextPtr widget, ColorStyle style, const std::string &value);
+            void setStyledText(MyGUI::TextBox* widget, ColorStyle style, const std::string &value);
             void addSkills(const SkillList &skills, const std::string &titleId, const std::string &titleDefault, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
             void addSeparator(MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
             void addGroup(const std::string &label, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
-            MyGUI::StaticTextPtr addValueItem(const std::string text, const std::string &value, ColorStyle style, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
+            MyGUI::TextBox* addValueItem(const std::string text, const std::string &value, ColorStyle style, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
             void addItem(const std::string text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
             void updateScroller();
 
-            void onScrollChangePosition(MyGUI::VScrollPtr scroller, size_t pos);
+            void onScrollChangePosition(MyGUI::ScrollBar* scroller, size_t pos);
             void onWindowResize(MyGUI::Window* window);
 
             static const int lineHeight;
 
             MyGUI::WidgetPtr skillAreaWidget, skillClientWidget;
-            MyGUI::VScrollPtr skillScrollerWidget;
+            MyGUI::ScrollBar* skillScrollerWidget;
             int lastPos, clientHeight;
 
             SkillList majorSkills, minorSkills, miscSkills;
             std::map<int, MWMechanics::Stat<float> > skillValues;
-            std::map<int, MyGUI::StaticTextPtr> skillWidgetMap;
+            std::map<int, MyGUI::TextBox*> skillWidgetMap;
             std::map<std::string, MyGUI::WidgetPtr> factionWidgetMap;
             FactionList factions; ///< Stores a list of factions and the current rank
             std::string birthSignId;
diff --git a/apps/openmw/mwgui/text_input.cpp b/apps/openmw/mwgui/text_input.cpp
index 83ebef6576..8ac07e7668 100644
--- a/apps/openmw/mwgui/text_input.cpp
+++ b/apps/openmw/mwgui/text_input.cpp
@@ -10,12 +10,12 @@ TextInputDialog::TextInputDialog(WindowManager& parWindowManager)
     center();
 
     getWidget(textEdit, "TextEdit");
-    textEdit->eventEditSelectAccept = newDelegate(this, &TextInputDialog::onTextAccepted);
+    textEdit->eventEditSelectAccept += newDelegate(this, &TextInputDialog::onTextAccepted);
 
     // TODO: These buttons should be managed by a Dialog class
     MyGUI::ButtonPtr okButton;
     getWidget(okButton, "OKButton");
-    okButton->eventMouseButtonClick = MyGUI::newDelegate(this, &TextInputDialog::onOkClicked);
+    okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &TextInputDialog::onOkClicked);
 
     // Make sure the edit box has focus
     MyGUI::InputManager::getInstance().setKeyFocusWidget(textEdit);
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index f62da2bab9..74603aaf1c 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -62,24 +62,24 @@ void MWSkill::updateWidgets()
     {
         if (skillId == ESM::Skill::Length)
         {
-            skillNameWidget->setCaption("");
+            static_cast<MyGUI::TextBox*>(skillNameWidget)->setCaption("");
         }
         else
         {
             const std::string &name = manager->getGameSettingString(ESM::Skill::sSkillNameIds[skillId], "");
-            skillNameWidget->setCaption(name);
+            static_cast<MyGUI::TextBox*>(skillNameWidget)->setCaption(name);
         }
     }
     if (skillValueWidget)
     {
         SkillValue::Type modified = value.getModified(), base = value.getBase();
-        skillValueWidget->setCaption(boost::lexical_cast<std::string>(modified));
+        static_cast<MyGUI::TextBox*>(skillValueWidget)->setCaption(boost::lexical_cast<std::string>(modified));
         if (modified > base)
-            skillValueWidget->setState("increased");
+            skillValueWidget->_setWidgetState("increased");
         else if (modified < base)
-            skillValueWidget->setState("decreased");
+            skillValueWidget->_setWidgetState("decreased");
         else
-            skillValueWidget->setState("normal");
+            skillValueWidget->_setWidgetState("normal");
     }
 }
 
@@ -88,59 +88,32 @@ void MWSkill::onClicked(MyGUI::Widget* _sender)
     eventClicked(this);
 }
 
-void MWSkill::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-{
-    Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-    initialiseWidgetSkin(_info);
-}
-
 MWSkill::~MWSkill()
 {
-    shutdownWidgetSkin();
 }
 
-void MWSkill::baseChangeWidgetSkin(ResourceSkin* _info)
+void MWSkill::initialiseOverride()
 {
-    shutdownWidgetSkin();
-    Base::baseChangeWidgetSkin(_info);
-    initialiseWidgetSkin(_info);
-}
+    Base::initialiseOverride();
 
-void MWSkill::initialiseWidgetSkin(ResourceSkin* _info)
-{
-    for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
+    assignWidget(skillNameWidget, "StatName");
+    assignWidget(skillValueWidget, "StatValue");
+
+    MyGUI::ButtonPtr button;
+    assignWidget(button, "StatNameButton");
+    if (button)
     {
-        const std::string &name = *(*iter)->_getInternalData<std::string>();
-        if (name == "StatName")
-        {
-            MYGUI_DEBUG_ASSERT( ! skillNameWidget, "widget already assigned");
-            skillNameWidget = (*iter)->castType<StaticText>();
-        }
-        else if (name == "StatValue")
-        {
-            MYGUI_DEBUG_ASSERT( ! skillValueWidget, "widget already assigned");
-            skillValueWidget = (*iter)->castType<StaticText>();
-        }
-        else if (name == "StatNameButton")
-        {
-            MYGUI_DEBUG_ASSERT( ! skillNameWidget, "widget already assigned");
-            MyGUI::ButtonPtr button = (*iter)->castType<Button>();
-            skillNameWidget = button;
-            button->eventMouseButtonClick = MyGUI::newDelegate(this, &MWSkill::onClicked);
-        }
-        else if (name == "StatValueButton")
-        {
-            MYGUI_DEBUG_ASSERT( ! skillValueWidget, "widget already assigned");
-            MyGUI::ButtonPtr button = (*iter)->castType<Button>();
-            skillNameWidget = button;
-            button->eventMouseButtonClick = MyGUI::newDelegate(this, &MWSkill::onClicked);
-        }
+        skillNameWidget = button;
+        button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
     }
-}
 
-void MWSkill::shutdownWidgetSkin()
-{
+    button = 0;
+    assignWidget(button, "StatValueButton");
+    if (button)
+    {
+        skillNameWidget = button;
+        button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
+    }
 }
 
 /* MWAttribute */
@@ -176,7 +149,7 @@ void MWAttribute::updateWidgets()
     {
         if (id < 0 || id >= 8)
         {
-            attributeNameWidget->setCaption("");
+            static_cast<MyGUI::TextBox*>(attributeNameWidget)->setCaption("");
         }
         else
         {
@@ -191,75 +164,48 @@ void MWAttribute::updateWidgets()
                 "sAttributeLuck"
             };
             const std::string &name = manager->getGameSettingString(attributes[id], "");
-            attributeNameWidget->setCaption(name);
+            static_cast<MyGUI::TextBox*>(attributeNameWidget)->setCaption(name);
         }
     }
     if (attributeValueWidget)
     {
         AttributeValue::Type modified = value.getModified(), base = value.getBase();
-        attributeValueWidget->setCaption(boost::lexical_cast<std::string>(modified));
+        static_cast<MyGUI::TextBox*>(attributeValueWidget)->setCaption(boost::lexical_cast<std::string>(modified));
         if (modified > base)
-            attributeValueWidget->setState("increased");
+            attributeValueWidget->_setWidgetState("increased");
         else if (modified < base)
-            attributeValueWidget->setState("decreased");
+            attributeValueWidget->_setWidgetState("decreased");
         else
-            attributeValueWidget->setState("normal");
+            attributeValueWidget->_setWidgetState("normal");
     }
 }
 
-void MWAttribute::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-{
-    Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-    initialiseWidgetSkin(_info);
-}
-
 MWAttribute::~MWAttribute()
 {
-    shutdownWidgetSkin();
 }
 
-void MWAttribute::baseChangeWidgetSkin(ResourceSkin* _info)
+void MWAttribute::initialiseOverride()
 {
-    shutdownWidgetSkin();
-    Base::baseChangeWidgetSkin(_info);
-    initialiseWidgetSkin(_info);
-}
+    Base::initialiseOverride();
 
-void MWAttribute::initialiseWidgetSkin(ResourceSkin* _info)
-{
-    for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
+    assignWidget(attributeNameWidget, "StatName");
+    assignWidget(attributeValueWidget, "StatValue");
+    
+    MyGUI::ButtonPtr button;
+    assignWidget(button, "StatNameButton");
+    if (button)
     {
-        const std::string &name = *(*iter)->_getInternalData<std::string>();
-        if (name == "StatName")
-        {
-            MYGUI_DEBUG_ASSERT( ! attributeNameWidget, "widget already assigned");
-            attributeNameWidget = (*iter)->castType<StaticText>();
-        }
-        else if (name == "StatValue")
-        {
-            MYGUI_DEBUG_ASSERT( ! attributeValueWidget, "widget already assigned");
-            attributeValueWidget = (*iter)->castType<StaticText>();
-        }
-        else if (name == "StatNameButton")
-        {
-            MYGUI_DEBUG_ASSERT( ! attributeNameWidget, "widget already assigned");
-            MyGUI::ButtonPtr button = (*iter)->castType<Button>();
-            attributeNameWidget = button;
-            button->eventMouseButtonClick = MyGUI::newDelegate(this, &MWAttribute::onClicked);
-        }
-        else if (name == "StatValue")
-        {
-            MYGUI_DEBUG_ASSERT( ! attributeValueWidget, "widget already assigned");
-            MyGUI::ButtonPtr button = (*iter)->castType<Button>();
-            attributeNameWidget = button;
-            button->eventMouseButtonClick = MyGUI::newDelegate(this, &MWAttribute::onClicked);
-        }
+        attributeNameWidget = button;
+        button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
     }
-}
 
-void MWAttribute::shutdownWidgetSkin()
-{
+    button = 0;
+    assignWidget(button, "StatValueButton");
+    if (button)
+    {
+        attributeValueWidget = button;
+        button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
+    }
 }
 
 /* MWSpell */
@@ -301,45 +247,20 @@ void MWSpell::updateWidgets()
         const ESMS::ESMStore &store = mWindowManager->getStore();
         const ESM::Spell *spell = store.spells.search(id);
         if (spell)
-            spellNameWidget->setCaption(spell->name);
+            static_cast<MyGUI::TextBox*>(spellNameWidget)->setCaption(spell->name);
         else
-            spellNameWidget->setCaption("");
+            static_cast<MyGUI::TextBox*>(spellNameWidget)->setCaption("");
     }
 }
 
-void MWSpell::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
+void MWSpell::initialiseOverride()
 {
-    Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
+    Base::initialiseOverride();
 
-    initialiseWidgetSkin(_info);
+    assignWidget(spellNameWidget, "StatName");
 }
 
 MWSpell::~MWSpell()
-{
-    shutdownWidgetSkin();
-}
-
-void MWSpell::baseChangeWidgetSkin(ResourceSkin* _info)
-{
-    shutdownWidgetSkin();
-    Base::baseChangeWidgetSkin(_info);
-    initialiseWidgetSkin(_info);
-}
-
-void MWSpell::initialiseWidgetSkin(ResourceSkin* _info)
-{
-    for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-    {
-        const std::string &name = *(*iter)->_getInternalData<std::string>();
-        if (name == "StatName")
-        {
-            MYGUI_DEBUG_ASSERT( ! spellNameWidget, "widget already assigned");
-            spellNameWidget = (*iter)->castType<StaticText>();
-        }
-    }
-}
-
-void MWSpell::shutdownWidgetSkin()
 {
 }
 
@@ -408,10 +329,10 @@ void MWSpellEffect::updateWidgets()
                 spellLine += " on Touch";
             else if (effect.range == ESM::RT_Target)
                 spellLine += " on Target";
-            textWidget->setCaption(spellLine);
+            static_cast<MyGUI::TextBox*>(textWidget)->setCaption(spellLine);
         }
         else
-            textWidget->setCaption("");
+            static_cast<MyGUI::TextBox*>(textWidget)->setCaption("");
     }
     if (imageWidget)
     {
@@ -421,45 +342,16 @@ void MWSpellEffect::updateWidgets()
     }
 }
 
-void MWSpellEffect::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-{
-    Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-    initialiseWidgetSkin(_info);
-}
-
 MWSpellEffect::~MWSpellEffect()
 {
-    shutdownWidgetSkin();
 }
 
-void MWSpellEffect::baseChangeWidgetSkin(ResourceSkin* _info)
+void MWSpellEffect::initialiseOverride()
 {
-    shutdownWidgetSkin();
-    Base::baseChangeWidgetSkin(_info);
-    initialiseWidgetSkin(_info);
-}
+    Base::initialiseOverride();
 
-void MWSpellEffect::initialiseWidgetSkin(ResourceSkin* _info)
-{
-    for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-    {
-        const std::string &name = *(*iter)->_getInternalData<std::string>();
-        if (name == "Text")
-        {
-            MYGUI_DEBUG_ASSERT( ! textWidget, "widget already assigned");
-            textWidget = (*iter)->castType<StaticText>();
-        }
-        else if (name == "Image")
-        {
-            MYGUI_DEBUG_ASSERT( ! imageWidget, "widget already assigned");
-            imageWidget = (*iter)->castType<StaticImage>();
-        }
-    }
-}
-
-void MWSpellEffect::shutdownWidgetSkin()
-{
+    assignWidget(textWidget, "Text");
+    assignWidget(imageWidget, "Image");
 }
 
 /* MWDynamicStat */
@@ -491,60 +383,27 @@ void MWDynamicStat::setValue(int cur, int max_)
         {
             std::stringstream out;
             out << value << "/" << max;
-            barTextWidget->setCaption(out.str().c_str());
+            static_cast<MyGUI::TextBox*>(barTextWidget)->setCaption(out.str().c_str());
         }
         else
-            barTextWidget->setCaption("");
+            static_cast<MyGUI::TextBox*>(barTextWidget)->setCaption("");
     }
 }
 void MWDynamicStat::setTitle(const std::string text)
 {
     if (textWidget)
-        textWidget->setCaption(text);
-}
-
-void MWDynamicStat::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-{
-    Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-    initialiseWidgetSkin(_info);
+        static_cast<MyGUI::TextBox*>(textWidget)->setCaption(text);
 }
 
 MWDynamicStat::~MWDynamicStat()
 {
-    shutdownWidgetSkin();
 }
 
-void MWDynamicStat::baseChangeWidgetSkin(ResourceSkin* _info)
+void MWDynamicStat::initialiseOverride()
 {
-    shutdownWidgetSkin();
-    Base::baseChangeWidgetSkin(_info);
-    initialiseWidgetSkin(_info);
-}
+    Base::initialiseOverride();
 
-void MWDynamicStat::initialiseWidgetSkin(ResourceSkin* _info)
-{
-    for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-    {
-        const std::string &name = *(*iter)->_getInternalData<std::string>();
-        if (name == "Text")
-        {
-            MYGUI_DEBUG_ASSERT( ! textWidget, "widget already assigned");
-            textWidget = (*iter)->castType<StaticText>();
-        }
-        else if (name == "Bar")
-        {
-            MYGUI_DEBUG_ASSERT( ! barWidget, "widget already assigned");
-            barWidget = (*iter)->castType<Progress>();
-        }
-        else if (name == "BarText")
-        {
-            MYGUI_DEBUG_ASSERT( ! barTextWidget, "widget already assigned");
-            barTextWidget = (*iter)->castType<StaticText>();
-        }
-    }
-}
-
-void MWDynamicStat::shutdownWidgetSkin()
-{
+    assignWidget(textWidget, "Text");
+    assignWidget(barWidget, "Bar");
+    assignWidget(barTextWidget, "BarText");
 }
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index cba8fefd32..4d31ad5219 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -38,26 +38,21 @@ namespace MWGui
             const SkillValue& getSkillValue() const { return value; }
 
             // Events
-            typedef delegates::CDelegate1<MWSkill*> EventHandle_SkillVoid;
+            typedef delegates::CMultiDelegate1<MWSkill*> EventHandle_SkillVoid;
 
             /** Event : Skill clicked.\n
                 signature : void method(MWSkill* _sender)\n
             */
             EventHandle_SkillVoid eventClicked;
 
-        /*internal:*/
-            virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
         protected:
             virtual ~MWSkill();
 
-            void baseChangeWidgetSkin(ResourceSkin* _info);
+            virtual void initialiseOverride();
 
             void onClicked(MyGUI::Widget* _sender);
 
         private:
-            void initialiseWidgetSkin(ResourceSkin* _info);
-            void shutdownWidgetSkin();
 
             void updateWidgets();
 
@@ -85,26 +80,21 @@ namespace MWGui
             const AttributeValue& getAttributeValue() const { return value; }
 
             // Events
-            typedef delegates::CDelegate1<MWAttribute*> EventHandle_AttributeVoid;
+            typedef delegates::CMultiDelegate1<MWAttribute*> EventHandle_AttributeVoid;
 
             /** Event : Attribute clicked.\n
                 signature : void method(MWAttribute* _sender)\n
             */
             EventHandle_AttributeVoid eventClicked;
 
-        /*internal:*/
-            virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
         protected:
             virtual ~MWAttribute();
 
-            void baseChangeWidgetSkin(ResourceSkin* _info);
+            virtual void initialiseOverride();
 
             void onClicked(MyGUI::Widget* _sender);
 
         private:
-            void initialiseWidgetSkin(ResourceSkin* _info);
-            void shutdownWidgetSkin();
 
             void updateWidgets();
 
@@ -130,23 +120,17 @@ namespace MWGui
 
             const std::string &getSpellId() const { return id; }
 
-        /*internal:*/
-            virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
         protected:
             virtual ~MWSpell();
 
-            void baseChangeWidgetSkin(ResourceSkin* _info);
+		virtual void initialiseOverride();
 
         private:
-            void initialiseWidgetSkin(ResourceSkin* _info);
-            void shutdownWidgetSkin();
-
             void updateWidgets();
 
             WindowManager* mWindowManager;
             std::string id;
-            MyGUI::StaticTextPtr spellNameWidget;
+            MyGUI::TextBox* spellNameWidget;
         };
         typedef MWSpell* MWSpellPtr;
 
@@ -163,24 +147,19 @@ namespace MWGui
 
             const SpellEffectValue &getSpellEffect() const { return effect; }
 
-        /*internal:*/
-            virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
         protected:
             virtual ~MWSpellEffect();
 
-            void baseChangeWidgetSkin(ResourceSkin* _info);
-
+            virtual void initialiseOverride();
+            
         private:
-            void initialiseWidgetSkin(ResourceSkin* _info);
-            void shutdownWidgetSkin();
 
             void updateWidgets();
 
             WindowManager* mWindowManager;
             SpellEffectValue effect;
-            MyGUI::StaticImagePtr imageWidget;
-            MyGUI::StaticTextPtr textWidget;
+            MyGUI::ImageBox* imageWidget;
+            MyGUI::TextBox* textWidget;
         };
         typedef MWSpellEffect* MWSpellEffectPtr;
 
@@ -196,22 +175,17 @@ namespace MWGui
             int getValue() const { return value; }
             int getMax() const { return max; }
 
-            /*internal:*/
-            virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
         protected:
             virtual ~MWDynamicStat();
 
-            void baseChangeWidgetSkin(ResourceSkin* _info);
+            virtual void initialiseOverride();
 
         private:
-            void initialiseWidgetSkin(ResourceSkin* _info);
-            void shutdownWidgetSkin();
 
             int value, max;
-            MyGUI::StaticTextPtr textWidget;
+            MyGUI::TextBox* textWidget;
             MyGUI::ProgressPtr barWidget;
-            MyGUI::StaticTextPtr barTextWidget;
+            MyGUI::TextBox* barTextWidget;
         };
         typedef MWDynamicStat* MWDynamicStatPtr;
 
diff --git a/apps/openmw/mwgui/window_base.cpp b/apps/openmw/mwgui/window_base.cpp
index 192dcd988d..1eb126a74c 100644
--- a/apps/openmw/mwgui/window_base.cpp
+++ b/apps/openmw/mwgui/window_base.cpp
@@ -16,7 +16,7 @@ void WindowBase::open()
 void WindowBase::center()
 {
     // Centre dialog
-    MyGUI::IntSize gameWindowSize = mWindowManager.getGui()->getViewSize();
+    MyGUI::IntSize gameWindowSize = MyGUI::RenderManager::getInstance().getViewSize();
     MyGUI::IntCoord coord = mMainWidget->getCoord();
     coord.left = (gameWindowSize.width - coord.width)/2;
     coord.top = (gameWindowSize.height - coord.height)/2;
diff --git a/apps/openmw/mwgui/window_base.hpp b/apps/openmw/mwgui/window_base.hpp
index 84fb601e32..99ddbe9181 100644
--- a/apps/openmw/mwgui/window_base.hpp
+++ b/apps/openmw/mwgui/window_base.hpp
@@ -13,7 +13,7 @@ namespace MWGui
         WindowBase(const std::string& parLayout, WindowManager& parWindowManager);
 
         // Events
-        typedef MyGUI::delegates::CDelegate1<WindowBase*> EventHandle_WindowBase;
+        typedef MyGUI::delegates::CMultiDelegate1<WindowBase*> EventHandle_WindowBase;
 
         virtual void open();
         void center();
diff --git a/apps/openmw/mwgui/window_manager.cpp b/apps/openmw/mwgui/window_manager.cpp
index baf8548143..8ac4b11d72 100644
--- a/apps/openmw/mwgui/window_manager.cpp
+++ b/apps/openmw/mwgui/window_manager.cpp
@@ -37,12 +37,12 @@ WindowManager::WindowManager(MWWorld::Environment& environment,
     gui = mGuiManager->getGui();
 
     //Register own widgets with MyGUI
-    MyGUI::FactoryManager::getInstance().registerFactory<DialogeHistory>("Widget");
+    MyGUI::FactoryManager::getInstance().registerFactory<DialogueHistory>("Widget");
 
     // Get size info from the Gui object
     assert(gui);
-    int w = gui->getViewSize().width;
-    int h = gui->getViewSize().height;
+    int w = MyGUI::RenderManager::getInstance().getViewSize().width;
+    int h = MyGUI::RenderManager::getInstance().getViewSize().height;
 
     hud = new HUD(w,h, showFPSLevel);
     menu = new MainMenu(w,h);
@@ -153,7 +153,7 @@ void WindowManager::updateVisible()
     dialogueWindow->setVisible(false);
 
     // Mouse is visible whenever we're not in game mode
-    gui->setVisiblePointer(isGuiMode());
+    MyGUI::PointerManager::getInstance().setVisible(isGuiMode());
 
     // If in game mode, don't show anything.
     if(mode == GM_Game) //Use a switch/case structure
diff --git a/cmake/FindMyGUI.cmake b/cmake/FindMyGUI.cmake
new file mode 100644
index 0000000000..339f494ddb
--- /dev/null
+++ b/cmake/FindMyGUI.cmake
@@ -0,0 +1,125 @@
+# - Find MyGUI includes and library
+#
+# This module defines
+# MYGUI_INCLUDE_DIRS
+# MYGUI_LIBRARIES, the libraries to link against to use MYGUI.
+# MYGUI_LIB_DIR, the location of the libraries
+# MYGUI_FOUND, If false, do not try to use MYGUI
+#
+# Copyright © 2007, Matt Williams
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+CMAKE_POLICY(PUSH)
+include(FindPkgMacros)
+
+# IF (MYGUI_LIBRARIES AND MYGUI_INCLUDE_DIRS)
+    # SET(MYGUI_FIND_QUIETLY TRUE)
+# ENDIF (MYGUI_LIBRARIES AND MYGUI_INCLUDE_DIRS)
+
+IF (WIN32) #Windows
+    MESSAGE(STATUS "Looking for MyGUI")
+	SET(MYGUISDK $ENV{MYGUI_HOME})
+    IF (MYGUISDK)
+		findpkg_begin ( "MYGUI" )
+        MESSAGE(STATUS "Using MyGUI in OGRE SDK")
+		STRING(REGEX REPLACE "[\\]" "/" MYGUISDK "${MYGUISDK}" )
+
+		find_path ( MYGUI_INCLUDE_DIRS
+		  MyGUI.h 
+		  "${MYGUISDK}/MyGUIEngine/include"
+		  NO_DEFAULT_PATH )
+		  
+		find_path ( MYGUI_PLATFORM_INCLUDE_DIRS
+		  MyGUI_OgrePlatform.h
+		  "${MYGUISDK}/Platforms/Ogre/OgrePlatform/include"
+		  NO_DEFAULT_PATH )		  
+
+		SET ( MYGUI_LIB_DIR ${MYGUISDK}/*/lib )
+		
+		find_library ( MYGUI_LIBRARIES_REL NAMES
+		MyGUIEngine.lib 
+		MyGUI.OgrePlatform.lib
+		HINTS
+		${MYGUI_LIB_DIR}
+		PATH_SUFFIXES "" release relwithdebinfo minsizerel )
+
+		find_library ( MYGUI_LIBRARIES_DBG NAMES
+		MyGUIEngine_d.lib 
+		MyGUI.OgrePlatform_d.lib
+		HINTS
+		${MYGUI_LIB_DIR}
+		PATH_SUFFIXES "" debug )
+
+		find_library ( MYGUI_PLATFORM_LIBRARIES_REL NAMES
+		MyGUI.OgrePlatform.lib
+		HINTS
+		${MYGUI_LIB_DIR}
+		PATH_SUFFIXES "" release relwithdebinfo minsizerel )
+
+		find_library ( MYGUI_PLATFORM_LIBRARIES_DBG NAMES
+		MyGUI.OgrePlatform_d.lib
+		HINTS
+		${MYGUI_LIB_DIR}
+		PATH_SUFFIXES "" debug )
+		
+		make_library_set ( MYGUI_LIBRARIES )
+		make_library_set ( MYGUI_PLATFORM_LIBRARIES )
+		
+		MESSAGE ("${MYGUI_LIBRARIES}")
+		MESSAGE ("${MYGUI_PLATFORM_LIBRARIES}")
+
+		findpkg_finish ( "MYGUI" )
+
+    ENDIF (MYGUISDK)
+    IF (OGRESOURCE)
+        MESSAGE(STATUS "Using MyGUI in OGRE dependencies")
+        STRING(REGEX REPLACE "[\\]" "/" OGRESDK "${OGRESOURCE}" )
+        SET(MYGUI_INCLUDE_DIRS ${OGRESOURCE}/OgreMain/include/MYGUI)
+        SET(MYGUI_LIB_DIR ${OGRESOURCE}/lib)
+        SET(MYGUI_LIBRARIES debug Debug/MyGUIEngine_d optimized Release/MyGUIEngine)
+    ENDIF (OGRESOURCE)
+ELSE (WIN32) #Unix
+    CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)
+    FIND_PACKAGE(PkgConfig)
+    PKG_SEARCH_MODULE(MYGUI MYGUI MyGUI)
+    IF (MYGUI_INCLUDE_DIRS)
+        SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS})
+        SET(MYGUI_LIB_DIR ${MYGUI_LIBDIR})
+        SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} CACHE STRING "")
+    ELSE (MYGUI_INCLUDE_DIRS)
+        FIND_PATH(MYGUI_INCLUDE_DIRS MyGUI.h PATHS /usr/local/include /usr/include PATH_SUFFIXES MyGUI MYGUI)
+        FIND_LIBRARY(MYGUI_LIBRARIES mygui PATHS /usr/lib /usr/local/lib)
+        SET(MYGUI_LIB_DIR ${MYGUI_LIBRARIES})
+        STRING(REGEX REPLACE "(.*)/.*" "\\1" MYGUI_LIB_DIR "${MYGUI_LIB_DIR}")
+        STRING(REGEX REPLACE ".*/" "" MYGUI_LIBRARIES "${MYGUI_LIBRARIES}")
+    ENDIF (MYGUI_INCLUDE_DIRS)
+ENDIF (WIN32)
+
+#Do some preparation
+SEPARATE_ARGUMENTS(MYGUI_INCLUDE_DIRS)
+SEPARATE_ARGUMENTS(MYGUI_LIBRARIES)
+SEPARATE_ARGUMENTS(MYGUI_PLATFORM_LIBRARIES)
+
+SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS} CACHE PATH "")
+SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} CACHE STRING "")
+SET(MYGUI_LIBRARIES ${MYGUI_PLATFORM_LIBRARIES} CACHE STRING "")
+SET(MYGUI_LIB_DIR ${MYGUI_LIB_DIR} CACHE PATH "")
+
+IF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES)
+    SET(MYGUI_FOUND TRUE)
+ENDIF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES)
+
+IF (MYGUI_FOUND)
+	MARK_AS_ADVANCED(MYGUI_LIB_DIR)
+    IF (NOT MYGUI_FIND_QUIETLY)
+        MESSAGE(STATUS " libraries : ${MYGUI_LIBRARIES} from ${MYGUI_LIB_DIR}")
+        MESSAGE(STATUS " includes : ${MYGUI_INCLUDE_DIRS}")
+    ENDIF (NOT MYGUI_FIND_QUIETLY)
+ELSE (MYGUI_FOUND)
+    IF (MYGUI_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "Could not find MYGUI")
+    ENDIF (MYGUI_FIND_REQUIRED)
+ENDIF (MYGUI_FOUND)
+
+CMAKE_POLICY(POP)
\ No newline at end of file
diff --git a/extern/mygui_3.0.1/COPYING.LESSER b/extern/mygui_3.0.1/COPYING.LESSER
deleted file mode 100644
index fc8a5de7ed..0000000000
--- a/extern/mygui_3.0.1/COPYING.LESSER
+++ /dev/null
@@ -1,165 +0,0 @@
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/extern/mygui_3.0.1/MyGUIEngine/CMakeLists.txt b/extern/mygui_3.0.1/MyGUIEngine/CMakeLists.txt
deleted file mode 100644
index 27362e0275..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-set (PROJECT_NAME MyGUIEngine)
-
-project( ${PROJECT_NAME} )
-
-include(${PROJECT_NAME}.list)
-
-include_directories(include)
-if (MYGUI_USE_FREETYPE)
-	include_directories(
-		${FREETYPE_INCLUDE_DIRS}
-	)
-	add_definitions(-DMYGUI_USE_FREETYPE)
-endif ()
-
-add_definitions(-DMYGUI_BUILD)
-
-if (WIN32)
-	add_definitions(-DNOMINMAX)
-endif ()
-
-add_library(${PROJECT_NAME} ${MYGUI_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
-if (MYGUI_USE_FREETYPE)
-	target_link_libraries(${PROJECT_NAME}
-		${FREETYPE_LIBRARIES}
-	)
-endif()
-
-# We don't need this lib in OS X. uuid functions is in libc here.
-if (NOT APPLE)
-	target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS} uuid)
-endif(NOT APPLE)
-
-if (MINGW)
-  target_link_libraries(${PROJECT_NAME} libwinmm.a)
-endif (MINGW)
diff --git a/extern/mygui_3.0.1/MyGUIEngine/MyGUIEngine.list b/extern/mygui_3.0.1/MyGUIEngine/MyGUIEngine.list
deleted file mode 100644
index 42fa447188..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/MyGUIEngine.list
+++ /dev/null
@@ -1,561 +0,0 @@
-set (HEADER_FILES
-  include/MyGUI_Allocator.h
-  include/MyGUI_CustomAllocator.h
-  include/MyGUI_DDItemInfo.h
-  include/MyGUI_IBItemInfo.h
-  include/MyGUI_MenuItemType.h
-  include/MyGUI_MessageStyle.h
-  include/MyGUI_WidgetToolTip.h
-  include/MyGUI_Button.h
-  include/MyGUI_Canvas.h
-  include/MyGUI_ComboBox.h
-  include/MyGUI_DDContainer.h
-  include/MyGUI_Edit.h
-  include/MyGUI_HScroll.h
-  include/MyGUI_ItemBox.h
-  include/MyGUI_List.h
-  include/MyGUI_ListBox.h
-  include/MyGUI_ListCtrl.h
-  include/MyGUI_MenuBar.h
-  include/MyGUI_MenuCtrl.h
-  include/MyGUI_MenuItem.h
-  include/MyGUI_Message.h
-  include/MyGUI_MultiList.h
-  include/MyGUI_PopupMenu.h
-  include/MyGUI_Progress.h
-  include/MyGUI_ScrollView.h
-  include/MyGUI_StaticImage.h
-  include/MyGUI_StaticText.h
-  include/MyGUI_Tab.h
-  include/MyGUI_TabItem.h
-  include/MyGUI_VScroll.h
-  include/MyGUI_Widget.h
-  include/MyGUI_Window.h
-  include/MyGUI_IWidgetFactory.h
-  include/MyGUI_Bitwise.h
-  include/MyGUI_CoordConverter.h
-  include/MyGUI_DataFileStream.h
-  include/MyGUI_DataStream.h
-  include/MyGUI_Delegate.h
-  include/MyGUI_DelegateImplement.h
-  include/MyGUI_DynLib.h
-  include/MyGUI_Enumerator.h
-  include/MyGUI_EventPair.h
-  include/MyGUI_Guid.h
-  include/MyGUI_RenderOut.h
-  include/MyGUI_TextChangeHistory.h
-  include/MyGUI_TextIterator.h
-  include/MyGUI_TextureUtility.h
-  include/MyGUI_TextView.h
-  include/MyGUI_Timer.h
-  include/MyGUI_UString.h
-  include/MyGUI_Utility.h
-  include/MyGUI_WidgetTranslate.h
-  include/MyGUI_XmlDocument.h
-  include/MyGUI_LogManager.h
-  include/MyGUI_LogStream.h
-  include/MyGUI.h
-  include/MyGUI_CastWidget.h
-  include/MyGUI_Common.h
-  include/MyGUI_Diagnostic.h
-  include/MyGUI_Exception.h
-  include/MyGUI_GenericFactory.h
-  include/MyGUI_Macros.h
-  include/MyGUI_Platform.h
-  include/MyGUI_Precompiled.h
-  include/MyGUI_Prerequest.h
-  include/MyGUI_RenderFormat.h
-  include/MyGUI_ResourceHolder.h
-  include/MyGUI_WidgetDefines.h
-  include/MyGUI_ICroppedRectangle.h
-  include/MyGUI_IDataStream.h
-  include/MyGUI_Instance.h
-  include/MyGUI_IObject.h
-  include/MyGUI_ISerializable.h
-  include/MyGUI_ITexture.h
-  include/MyGUI_IUnlinkWidget.h
-  include/MyGUI_IVertexBuffer.h
-  include/MyGUI_IWidgetCreator.h
-  include/MyGUI_Plugin.h
-  include/MyGUI_RTTI.h
-  include/MyGUI_BiIndexBase.h
-  include/MyGUI_ScrollViewBase.h
-  include/MyGUI_WidgetEvent.h
-  include/MyGUI_WidgetUserData.h
-  include/MyGUI_EditText.h
-  include/MyGUI_MainSkin.h
-  include/MyGUI_RawRect.h
-  include/MyGUI_RotatingSkin.h
-  include/MyGUI_SimpleText.h
-  include/MyGUI_SubSkin.h
-  include/MyGUI_TileRect.h
-  include/MyGUI_IStateInfo.h
-  include/MyGUI_ISubWidget.h
-  include/MyGUI_ISubWidgetRect.h
-  include/MyGUI_ISubWidgetText.h
-  include/MyGUI_LayerItem.h
-  include/MyGUI_LayerNode.h
-  include/MyGUI_OverlappedLayer.h
-  include/MyGUI_RenderItem.h
-  include/MyGUI_SharedLayer.h
-  include/MyGUI_SharedLayerNode.h
-  include/MyGUI_ILayer.h
-  include/MyGUI_ILayerItem.h
-  include/MyGUI_ILayerNode.h
-  include/MyGUI_IRenderTarget.h
-  include/MyGUI_ActionController.h
-  include/MyGUI_ControllerEdgeHide.h
-  include/MyGUI_ControllerFadeAlpha.h
-  include/MyGUI_ControllerItem.h
-  include/MyGUI_ControllerPosition.h
-  include/MyGUI_ResourceImageSet.h
-  include/MyGUI_ResourceImageSetPointer.h
-  include/MyGUI_ResourceManualFont.h
-  include/MyGUI_ResourceManualPointer.h
-  include/MyGUI_ResourceSkin.h
-  include/MyGUI_ResourceTrueTypeFont.h
-  include/MyGUI_IFont.h
-  include/MyGUI_IPointer.h
-  include/MyGUI_IResource.h
-  include/MyGUI_ChildSkinInfo.h
-  include/MyGUI_FontData.h
-  include/MyGUI_MaskPickInfo.h
-  include/MyGUI_SubWidgetBinding.h
-  include/MyGUI_SubWidgetInfo.h
-  include/MyGUI_Align.h
-  include/MyGUI_Any.h
-  include/MyGUI_Colour.h
-  include/MyGUI_CommonStateInfo.h
-  include/MyGUI_ImageInfo.h
-  include/MyGUI_InputDefine.h
-  include/MyGUI_RenderTargetInfo.h
-  include/MyGUI_TCoord.h
-  include/MyGUI_TPoint.h
-  include/MyGUI_TRect.h
-  include/MyGUI_TSize.h
-  include/MyGUI_Types.h
-  include/MyGUI_Version.h
-  include/MyGUI_VertexData.h
-  include/MyGUI_WidgetStyle.h
-  include/MyGUI_ClipboardManager.h
-  include/MyGUI_ControllerManager.h
-  include/MyGUI_DataManager.h
-  include/MyGUI_DynLibManager.h
-  include/MyGUI_FactoryManager.h
-  include/MyGUI_FontManager.h
-  include/MyGUI_Gui.h
-  include/MyGUI_InputManager.h
-  include/MyGUI_LanguageManager.h
-  include/MyGUI_LayerManager.h
-  include/MyGUI_LayoutManager.h
-  include/MyGUI_PluginManager.h
-  include/MyGUI_PointerManager.h
-  include/MyGUI_RenderManager.h
-  include/MyGUI_ResourceManager.h
-  include/MyGUI_SkinManager.h
-  include/MyGUI_SubWidgetManager.h
-  include/MyGUI_WidgetManager.h
-)
-set (SOURCE_FILES
-  src/MyGUI_Button.cpp
-  src/MyGUI_Canvas.cpp
-  src/MyGUI_ComboBox.cpp
-  src/MyGUI_DDContainer.cpp
-  src/MyGUI_Edit.cpp
-  src/MyGUI_HScroll.cpp
-  src/MyGUI_ItemBox.cpp
-  src/MyGUI_List.cpp
-  src/MyGUI_ListBox.cpp
-  src/MyGUI_ListCtrl.cpp
-  src/MyGUI_MenuBar.cpp
-  src/MyGUI_MenuCtrl.cpp
-  src/MyGUI_MenuItem.cpp
-  src/MyGUI_Message.cpp
-  src/MyGUI_MultiList.cpp
-  src/MyGUI_PopupMenu.cpp
-  src/MyGUI_Progress.cpp
-  src/MyGUI_ScrollView.cpp
-  src/MyGUI_StaticImage.cpp
-  src/MyGUI_StaticText.cpp
-  src/MyGUI_Tab.cpp
-  src/MyGUI_TabItem.cpp
-  src/MyGUI_VScroll.cpp
-  src/MyGUI_Widget.cpp
-  src/MyGUI_Window.cpp
-  src/MyGUI_EditText.cpp
-  src/MyGUI_MainSkin.cpp
-  src/MyGUI_RawRect.cpp
-  src/MyGUI_RotatingSkin.cpp
-  src/MyGUI_SimpleText.cpp
-  src/MyGUI_SubSkin.cpp
-  src/MyGUI_TileRect.cpp
-  src/MyGUI_LayerItem.cpp
-  src/MyGUI_LayerNode.cpp
-  src/MyGUI_OverlappedLayer.cpp
-  src/MyGUI_RenderItem.cpp
-  src/MyGUI_SharedLayer.cpp
-  src/MyGUI_SharedLayerNode.cpp
-  src/MyGUI_ActionController.cpp
-  src/MyGUI_ControllerEdgeHide.cpp
-  src/MyGUI_ControllerFadeAlpha.cpp
-  src/MyGUI_ControllerPosition.cpp
-  src/MyGUI_Exception.cpp
-  src/MyGUI_Precompiled.cpp
-  src/MyGUI_IWidgetCreator.cpp
-  src/MyGUI_ScrollViewBase.cpp
-  src/MyGUI_ResourceImageSet.cpp
-  src/MyGUI_ResourceImageSetPointer.cpp
-  src/MyGUI_ResourceManualFont.cpp
-  src/MyGUI_ResourceManualPointer.cpp
-  src/MyGUI_ResourceSkin.cpp
-  src/MyGUI_ResourceTrueTypeFont.cpp
-  src/MyGUI_MaskPickInfo.cpp
-  src/MyGUI_Any.cpp
-  src/MyGUI_Colour.cpp
-  src/MyGUI_ClipboardManager.cpp
-  src/MyGUI_ControllerManager.cpp
-  src/MyGUI_DataManager.cpp
-  src/MyGUI_DynLibManager.cpp
-  src/MyGUI_FactoryManager.cpp
-  src/MyGUI_FontManager.cpp
-  src/MyGUI_Gui.cpp
-  src/MyGUI_InputManager.cpp
-  src/MyGUI_LanguageManager.cpp
-  src/MyGUI_LayerManager.cpp
-  src/MyGUI_LayoutManager.cpp
-  src/MyGUI_PluginManager.cpp
-  src/MyGUI_PointerManager.cpp
-  src/MyGUI_RenderManager.cpp
-  src/MyGUI_ResourceManager.cpp
-  src/MyGUI_SkinManager.cpp
-  src/MyGUI_SubWidgetManager.cpp
-  src/MyGUI_WidgetManager.cpp
-  src/MyGUI_DataFileStream.cpp
-  src/MyGUI_DataStream.cpp
-  src/MyGUI_DynLib.cpp
-  src/MyGUI_Guid.cpp
-  src/MyGUI_RenderOut.cpp
-  src/MyGUI_TextIterator.cpp
-  src/MyGUI_TextureUtility.cpp
-  src/MyGUI_Timer.cpp
-  src/MyGUI_XmlDocument.cpp
-  src/MyGUI_LogManager.cpp
-  src/MyGUI_LogStream.cpp
-)
-SOURCE_GROUP("Source Files\\Widget\\Widget" FILES
-  src/MyGUI_Button.cpp
-  src/MyGUI_Canvas.cpp
-  src/MyGUI_ComboBox.cpp
-  src/MyGUI_DDContainer.cpp
-  src/MyGUI_Edit.cpp
-  src/MyGUI_HScroll.cpp
-  src/MyGUI_ItemBox.cpp
-  src/MyGUI_List.cpp
-  src/MyGUI_ListBox.cpp
-  src/MyGUI_ListCtrl.cpp
-  src/MyGUI_MenuBar.cpp
-  src/MyGUI_MenuCtrl.cpp
-  src/MyGUI_MenuItem.cpp
-  src/MyGUI_Message.cpp
-  src/MyGUI_MultiList.cpp
-  src/MyGUI_PopupMenu.cpp
-  src/MyGUI_Progress.cpp
-  src/MyGUI_ScrollView.cpp
-  src/MyGUI_StaticImage.cpp
-  src/MyGUI_StaticText.cpp
-  src/MyGUI_Tab.cpp
-  src/MyGUI_TabItem.cpp
-  src/MyGUI_VScroll.cpp
-  src/MyGUI_Widget.cpp
-  src/MyGUI_Window.cpp
-)
-SOURCE_GROUP("Source Files\\Widget" FILES
-)
-SOURCE_GROUP("Source Files\\Core\\SubWidget" FILES
-  src/MyGUI_EditText.cpp
-  src/MyGUI_MainSkin.cpp
-  src/MyGUI_RawRect.cpp
-  src/MyGUI_RotatingSkin.cpp
-  src/MyGUI_SimpleText.cpp
-  src/MyGUI_SubSkin.cpp
-  src/MyGUI_TileRect.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\LayerItem" FILES
-  src/MyGUI_LayerItem.cpp
-  src/MyGUI_LayerNode.cpp
-  src/MyGUI_OverlappedLayer.cpp
-  src/MyGUI_RenderItem.cpp
-  src/MyGUI_SharedLayer.cpp
-  src/MyGUI_SharedLayerNode.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Controller" FILES
-  src/MyGUI_ActionController.cpp
-  src/MyGUI_ControllerEdgeHide.cpp
-  src/MyGUI_ControllerFadeAlpha.cpp
-  src/MyGUI_ControllerPosition.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Common\\Interfaces" FILES
-  src/MyGUI_IWidgetCreator.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Common\\Base" FILES
-  src/MyGUI_ScrollViewBase.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Common" FILES
-  src/MyGUI_Exception.cpp
-  src/MyGUI_Precompiled.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Resource\\Data" FILES
-  src/MyGUI_MaskPickInfo.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Resource" FILES
-  src/MyGUI_ResourceImageSet.cpp
-  src/MyGUI_ResourceImageSetPointer.cpp
-  src/MyGUI_ResourceManualFont.cpp
-  src/MyGUI_ResourceManualPointer.cpp
-  src/MyGUI_ResourceSkin.cpp
-  src/MyGUI_ResourceTrueTypeFont.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Types" FILES
-  src/MyGUI_Any.cpp
-  src/MyGUI_Colour.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Manager" FILES
-  src/MyGUI_ClipboardManager.cpp
-  src/MyGUI_ControllerManager.cpp
-  src/MyGUI_DataManager.cpp
-  src/MyGUI_DynLibManager.cpp
-  src/MyGUI_FactoryManager.cpp
-  src/MyGUI_FontManager.cpp
-  src/MyGUI_Gui.cpp
-  src/MyGUI_InputManager.cpp
-  src/MyGUI_LanguageManager.cpp
-  src/MyGUI_LayerManager.cpp
-  src/MyGUI_LayoutManager.cpp
-  src/MyGUI_PluginManager.cpp
-  src/MyGUI_PointerManager.cpp
-  src/MyGUI_RenderManager.cpp
-  src/MyGUI_ResourceManager.cpp
-  src/MyGUI_SkinManager.cpp
-  src/MyGUI_SubWidgetManager.cpp
-  src/MyGUI_WidgetManager.cpp
-)
-SOURCE_GROUP("Source Files\\Core" FILES
-)
-SOURCE_GROUP("Source Files\\Utility\\Logging" FILES
-  src/MyGUI_LogManager.cpp
-  src/MyGUI_LogStream.cpp
-)
-SOURCE_GROUP("Source Files\\Utility" FILES
-  src/MyGUI_DataFileStream.cpp
-  src/MyGUI_DataStream.cpp
-  src/MyGUI_DynLib.cpp
-  src/MyGUI_Guid.cpp
-  src/MyGUI_RenderOut.cpp
-  src/MyGUI_TextIterator.cpp
-  src/MyGUI_TextureUtility.cpp
-  src/MyGUI_Timer.cpp
-  src/MyGUI_XmlDocument.cpp
-)
-SOURCE_GROUP("Source Files" FILES
-)
-SOURCE_GROUP("Header Files\\Widget\\Types" FILES
-  include/MyGUI_DDItemInfo.h
-  include/MyGUI_IBItemInfo.h
-  include/MyGUI_MenuItemType.h
-  include/MyGUI_MessageStyle.h
-  include/MyGUI_WidgetToolTip.h
-)
-SOURCE_GROUP("Header Files\\Widget\\Widget" FILES
-  include/MyGUI_Button.h
-  include/MyGUI_Canvas.h
-  include/MyGUI_ComboBox.h
-  include/MyGUI_DDContainer.h
-  include/MyGUI_Edit.h
-  include/MyGUI_HScroll.h
-  include/MyGUI_ItemBox.h
-  include/MyGUI_List.h
-  include/MyGUI_ListBox.h
-  include/MyGUI_ListCtrl.h
-  include/MyGUI_MenuBar.h
-  include/MyGUI_MenuCtrl.h
-  include/MyGUI_MenuItem.h
-  include/MyGUI_Message.h
-  include/MyGUI_MultiList.h
-  include/MyGUI_PopupMenu.h
-  include/MyGUI_Progress.h
-  include/MyGUI_ScrollView.h
-  include/MyGUI_StaticImage.h
-  include/MyGUI_StaticText.h
-  include/MyGUI_Tab.h
-  include/MyGUI_TabItem.h
-  include/MyGUI_VScroll.h
-  include/MyGUI_Widget.h
-  include/MyGUI_Window.h
-)
-SOURCE_GROUP("Header Files\\Widget\\Interfaces" FILES
-  include/MyGUI_IWidgetFactory.h
-)
-SOURCE_GROUP("Header Files\\Widget" FILES
-)
-SOURCE_GROUP("Header Files\\Utility\\Logging" FILES
-  include/MyGUI_LogManager.h
-  include/MyGUI_LogStream.h
-)
-SOURCE_GROUP("Header Files\\Utility" FILES
-  include/MyGUI_Bitwise.h
-  include/MyGUI_CoordConverter.h
-  include/MyGUI_DataFileStream.h
-  include/MyGUI_DataStream.h
-  include/MyGUI_Delegate.h
-  include/MyGUI_DelegateImplement.h
-  include/MyGUI_DynLib.h
-  include/MyGUI_Enumerator.h
-  include/MyGUI_EventPair.h
-  include/MyGUI_Guid.h
-  include/MyGUI_RenderOut.h
-  include/MyGUI_TextChangeHistory.h
-  include/MyGUI_TextIterator.h
-  include/MyGUI_TextureUtility.h
-  include/MyGUI_TextView.h
-  include/MyGUI_Timer.h
-  include/MyGUI_UString.h
-  include/MyGUI_Utility.h
-  include/MyGUI_WidgetTranslate.h
-  include/MyGUI_XmlDocument.h
-)
-SOURCE_GROUP("Header Files\\Core\\Common\\Interfaces" FILES
-  include/MyGUI_ICroppedRectangle.h
-  include/MyGUI_IDataStream.h
-  include/MyGUI_Instance.h
-  include/MyGUI_IObject.h
-  include/MyGUI_ISerializable.h
-  include/MyGUI_ITexture.h
-  include/MyGUI_IUnlinkWidget.h
-  include/MyGUI_IVertexBuffer.h
-  include/MyGUI_IWidgetCreator.h
-  include/MyGUI_Plugin.h
-  include/MyGUI_RTTI.h
-)
-SOURCE_GROUP("Header Files\\Core\\Common\\Base" FILES
-  include/MyGUI_BiIndexBase.h
-  include/MyGUI_ScrollViewBase.h
-  include/MyGUI_WidgetEvent.h
-  include/MyGUI_WidgetUserData.h
-)
-SOURCE_GROUP("Header Files\\Core\\Common" FILES
-  include/MyGUI.h
-  include/MyGUI_CastWidget.h
-  include/MyGUI_Common.h
-  include/MyGUI_Diagnostic.h
-  include/MyGUI_Exception.h
-  include/MyGUI_GenericFactory.h
-  include/MyGUI_Macros.h
-  include/MyGUI_Platform.h
-  include/MyGUI_Precompiled.h
-  include/MyGUI_Prerequest.h
-  include/MyGUI_RenderFormat.h
-  include/MyGUI_ResourceHolder.h
-  include/MyGUI_WidgetDefines.h
-)
-SOURCE_GROUP("Header Files\\Core\\SubWidget\\Interfaces" FILES
-  include/MyGUI_IStateInfo.h
-  include/MyGUI_ISubWidget.h
-  include/MyGUI_ISubWidgetRect.h
-  include/MyGUI_ISubWidgetText.h
-)
-SOURCE_GROUP("Header Files\\Core\\SubWidget" FILES
-  include/MyGUI_EditText.h
-  include/MyGUI_MainSkin.h
-  include/MyGUI_RawRect.h
-  include/MyGUI_RotatingSkin.h
-  include/MyGUI_SimpleText.h
-  include/MyGUI_SubSkin.h
-  include/MyGUI_TileRect.h
-)
-SOURCE_GROUP("Header Files\\Core\\LayerItem\\Interfaces" FILES
-  include/MyGUI_ILayer.h
-  include/MyGUI_ILayerItem.h
-  include/MyGUI_ILayerNode.h
-  include/MyGUI_IRenderTarget.h
-)
-SOURCE_GROUP("Header Files\\Core\\LayerItem" FILES
-  include/MyGUI_LayerItem.h
-  include/MyGUI_LayerNode.h
-  include/MyGUI_OverlappedLayer.h
-  include/MyGUI_RenderItem.h
-  include/MyGUI_SharedLayer.h
-  include/MyGUI_SharedLayerNode.h
-)
-SOURCE_GROUP("Header Files\\Core\\Controller" FILES
-  include/MyGUI_ActionController.h
-  include/MyGUI_ControllerEdgeHide.h
-  include/MyGUI_ControllerFadeAlpha.h
-  include/MyGUI_ControllerItem.h
-  include/MyGUI_ControllerPosition.h
-)
-SOURCE_GROUP("Header Files\\Core\\Resource\\Interface" FILES
-  include/MyGUI_IFont.h
-  include/MyGUI_IPointer.h
-  include/MyGUI_IResource.h
-)
-SOURCE_GROUP("Header Files\\Core\\Resource\\Data" FILES
-  include/MyGUI_ChildSkinInfo.h
-  include/MyGUI_FontData.h
-  include/MyGUI_MaskPickInfo.h
-  include/MyGUI_SubWidgetBinding.h
-  include/MyGUI_SubWidgetInfo.h
-)
-SOURCE_GROUP("Header Files\\Core\\Resource" FILES
-  include/MyGUI_ResourceImageSet.h
-  include/MyGUI_ResourceImageSetPointer.h
-  include/MyGUI_ResourceManualFont.h
-  include/MyGUI_ResourceManualPointer.h
-  include/MyGUI_ResourceSkin.h
-  include/MyGUI_ResourceTrueTypeFont.h
-)
-SOURCE_GROUP("Header Files\\Core\\Types" FILES
-  include/MyGUI_Align.h
-  include/MyGUI_Any.h
-  include/MyGUI_Colour.h
-  include/MyGUI_CommonStateInfo.h
-  include/MyGUI_ImageInfo.h
-  include/MyGUI_InputDefine.h
-  include/MyGUI_RenderTargetInfo.h
-  include/MyGUI_TCoord.h
-  include/MyGUI_TPoint.h
-  include/MyGUI_TRect.h
-  include/MyGUI_TSize.h
-  include/MyGUI_Types.h
-  include/MyGUI_Version.h
-  include/MyGUI_VertexData.h
-  include/MyGUI_WidgetStyle.h
-)
-SOURCE_GROUP("Header Files\\Core\\Manager" FILES
-  include/MyGUI_ClipboardManager.h
-  include/MyGUI_ControllerManager.h
-  include/MyGUI_DataManager.h
-  include/MyGUI_DynLibManager.h
-  include/MyGUI_FactoryManager.h
-  include/MyGUI_FontManager.h
-  include/MyGUI_Gui.h
-  include/MyGUI_InputManager.h
-  include/MyGUI_LanguageManager.h
-  include/MyGUI_LayerManager.h
-  include/MyGUI_LayoutManager.h
-  include/MyGUI_PluginManager.h
-  include/MyGUI_PointerManager.h
-  include/MyGUI_RenderManager.h
-  include/MyGUI_ResourceManager.h
-  include/MyGUI_SkinManager.h
-  include/MyGUI_SubWidgetManager.h
-  include/MyGUI_WidgetManager.h
-)
-SOURCE_GROUP("Header Files\\Core" FILES
-)
-SOURCE_GROUP("Header Files" FILES
-  include/MyGUI_Allocator.h
-  include/MyGUI_CustomAllocator.h
-)
-SOURCE_GROUP("" FILES
-  CMakeLists.txt
-)
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI.h
deleted file mode 100644
index db960fc8b8..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*!
-	@file
-	@author		Georgiy Evmenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_H__
-#define __MYGUI_H__
-
-#include "MyGUI_Gui.h"
-
-#include "MyGUI_Button.h"
-#include "MyGUI_ComboBox.h"
-#include "MyGUI_Edit.h"
-#include "MyGUI_HScroll.h"
-#include "MyGUI_List.h"
-#include "MyGUI_StaticText.h"
-#include "MyGUI_StaticImage.h"
-#include "MyGUI_Tab.h"
-#include "MyGUI_TabItem.h"
-#include "MyGUI_VScroll.h"
-#include "MyGUI_Window.h"
-#include "MyGUI_Progress.h"
-#include "MyGUI_Message.h"
-#include "MyGUI_ItemBox.h"
-#include "MyGUI_MultiList.h"
-#include "MyGUI_MenuCtrl.h"
-#include "MyGUI_MenuItem.h"
-#include "MyGUI_PopupMenu.h"
-#include "MyGUI_MenuBar.h"
-#include "MyGUI_ScrollView.h"
-#include "MyGUI_DDContainer.h"
-#include "MyGUI_Canvas.h"
-#include "MyGUI_ListCtrl.h"
-#include "MyGUI_ListBox.h"
-
-#include "MyGUI_InputManager.h"
-#include "MyGUI_SubWidgetManager.h"
-#include "MyGUI_ClipboardManager.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_LogManager.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_LayoutManager.h"
-#include "MyGUI_FontManager.h"
-#include "MyGUI_PointerManager.h"
-#include "MyGUI_PluginManager.h"
-#include "MyGUI_DynLibManager.h"
-#include "MyGUI_ControllerManager.h"
-#include "MyGUI_LanguageManager.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_DataManager.h"
-#include "MyGUI_FactoryManager.h"
-
-#include "MyGUI_ActionController.h"
-#include "MyGUI_ControllerEdgeHide.h"
-#include "MyGUI_ControllerFadeAlpha.h"
-#include "MyGUI_ControllerPosition.h"
-#include "MyGUI_CoordConverter.h"
-#include "MyGUI_IResource.h"
-#include "MyGUI_CastWidget.h"
-#include "MyGUI_Any.h"
-#include "MyGUI_MenuItemType.h"
-#include "MyGUI_Version.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_WidgetStyle.h"
-#include "MyGUI_IObject.h"
-#include "MyGUI_ISerializable.h"
-#include "MyGUI_RenderOut.h"
-
-#include "MyGUI_RawRect.h"
-#include "MyGUI_RotatingSkin.h"
-#include "MyGUI_TextureUtility.h"
-
-#endif // __MYGUI_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ActionController.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ActionController.h
deleted file mode 100644
index 7f89b4fd3f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ActionController.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_ACTION_CONTROLLER_H__
-#define __MYGUI_ACTION_CONTROLLER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include <math.h>
-
-namespace MyGUI
-{
-
-	namespace action
-	{
-
-		/** Function used for hiding widget with one of controller event */
-		void MYGUI_EXPORT actionWidgetHide(Widget* _widget);
-
-		/** Function used for showing widget with one of controller event */
-		void MYGUI_EXPORT actionWidgetShow(Widget* _widget);
-
-		/** Function used for destroying widget with one of controller event */
-		void MYGUI_EXPORT actionWidgetDestroy(Widget* _widget);
-
-		/** Function for ControllerPosition per frame action : Move with constant speed */
-		void MYGUI_EXPORT linearMoveFunction(const IntCoord& _startRect, const IntCoord& _destRect, IntCoord& _result, float _k);
-
-		/** Function for ControllerPosition per frame action : Move with accelerated speed
-			if N == 10 then this function is same as linearMoveFunction
-			if N > 10 speed will be increasing
-			if N < 10 speed will be decreasing
-		*/
-		template <int N>
-		inline void acceleratedMoveFunction(const IntCoord& _startRect, const IntCoord& _destRect, IntCoord& _result, float _current_time)
-		{
-			float k = (float)pow (_current_time, N/10.f /*3 by default as Accelerated and 0.4 by default as Slowed*/);
-			linearMoveFunction(_startRect, _destRect, _result, k);
-		}
-
-		/** Function for ControllerPosition per frame action : Move with accelerated speed a bit farther than necessary and then return it back */
-		template <int N>
-		inline void jumpMoveFunction(const IntCoord& _startRect, const IntCoord& _destRect, IntCoord& _result, float _current_time)
-		{
-			float k = pow (_current_time, 2) * (-2 - N/10.f) + _current_time * (3 + N/10.f);
-			linearMoveFunction(_startRect, _destRect, _result, k);
-		}
-
-		/** Function for ControllerPosition per frame action : Start with zero speed increasing half time and then decreasing to zero */
-		void MYGUI_EXPORT inertionalMoveFunction(const IntCoord& _startRect, const IntCoord& _destRect, IntCoord& _result, float _current_time);
-
-	} // namespace action
-
-} // namespace MyGUI
-
-#endif // __MYGUI_ACTION_CONTROLLER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Align.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Align.h
deleted file mode 100644
index ca1e6c64a4..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Align.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		08/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_ALIGN_H__
-#define __MYGUI_ALIGN_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Macros.h"
-#include "MyGUI_Diagnostic.h"
-#include <map>
-
-namespace MyGUI
-{
-
-	struct MYGUI_EXPORT Align
-	{
-		enum Enum
-		{
-			HCenter = MYGUI_FLAG_NONE, /**< center horizontally */
-			VCenter = MYGUI_FLAG_NONE, /**< center vertically */
-			Center = HCenter | VCenter, /**< center in the dead center */
-
-			Left = MYGUI_FLAG(1), /**< value from the left (and center vertically) */
-			Right = MYGUI_FLAG(2), /**< value from the right (and center vertically) */
-			HStretch = Left | Right, /**< stretch horizontally proportionate to parent window (and center vertically) */
-
-			Top = MYGUI_FLAG(3), /**< value from the top (and center horizontally) */
-			Bottom = MYGUI_FLAG(4), /**< value from the bottom (and center horizontally) */
-			VStretch = Top | Bottom, /**< stretch vertically proportionate to parent window (and center horizontally) */
-
-			Stretch = HStretch | VStretch, /**< stretch proportionate to parent window */
-			Default = Left | Top, /**< default value (value from left and top) */
-
-			HRelative = MYGUI_FLAG(5),
-			VRelative = MYGUI_FLAG(6),
-			Relative = HRelative | VRelative
-		};
-
-		Align(Enum _value = Default) : value(_value) { }
-
-		bool isHCenter() const { return HCenter == (value & ((int)HStretch | (int)HRelative)); }
-		bool isVCenter() const { return VCenter == (value & ((int)VStretch | (int)VRelative)); }
-		bool isCenter() const { return Center == (value & ((int)Stretch | (int)Relative)); }
-
-		bool isLeft() const { return Left == (value & ((int)HStretch | (int)HRelative)); }
-		bool isRight() const { return Right == (value & ((int)HStretch | (int)HRelative)); }
-		bool isHStretch() const { return HStretch == (value & ((int)HStretch | (int)HRelative)); }
-
-		bool isTop() const { return Top == (value & ((int)VStretch | (int)VRelative)); }
-		bool isBottom() const { return (Bottom == (value & ((int)VStretch | (int)VRelative))); }
-		bool isVStretch() const { return (VStretch == (value & ((int)VStretch | (int)VRelative))); }
-
-		bool isStretch() const { return (Stretch == (value & ((int)Stretch | (int)Relative))); }
-		bool isDefault() const { return (Default == (value & ((int)Stretch | (int)Relative))); }
-
-		bool isHRelative() const { return HRelative == (value & (int)HRelative); }
-		bool isVRelative() const { return VRelative == (value & (int)VRelative); }
-		bool isRelative() const { return Relative == (value & (int)Relative); }
-
-		Align& operator |= (Align const& _other) { value = Enum(int(value) | int(_other.value)); return *this; }
-		friend Align operator | (Enum const& a, Enum const& b) { return Align(Enum(int(a) | int(b))); }
-		friend Align operator | (Align const& a, Align const& b) { return Align(Enum(int(a.value) | int(b.value))); }
-
-		friend bool operator == (Align const& a, Align const& b) { return a.value == b.value; }
-		friend bool operator != (Align const& a, Align const& b) { return a.value != b.value; }
-
-		typedef std::map<std::string, int> MapAlign;
-
-		static Align parse(const std::string& _value)
-		{
-			Align result(Enum(0));
-			const MapAlign& map_names = result.getValueNames();
-			const std::vector<std::string>& vec = utility::split(_value);
-			for (size_t pos=0; pos<vec.size(); pos++)
-			{
-				MapAlign::const_iterator iter = map_names.find(vec[pos]);
-				if (iter != map_names.end())
-				{
-					result.value = Enum(int(result.value) | int(iter->second));
-				}
-			}
-			return result;
-		}
-
-		std::string print() const
-		{
-			std::string result;
-
-			if (value & Left)
-			{
-				if (value & Right) result = "HStretch";
-				else result = "Left";
-			}
-			else if (value & Right) result = "Right";
-			else result = "HCenter";
-
-			if (value & Top)
-			{
-				if (value & Bottom) result += " VStretch";
-				else result += " Top";
-			}
-			else if (value & Bottom) result += " Bottom";
-			else result += " VCenter";
-
-			return result;
-		}
-
-		friend std::ostream& operator << ( std::ostream& _stream, const Align&  _value )
-		{
-			_stream << _value.print();
-			return _stream;
-		}
-
-		friend std::istream& operator >> ( std::istream& _stream, Align&  _value )
-		{
-			_value.value = Enum(0);
-			std::string value;
-			_stream >> value;
-
-			const MapAlign& map_names = _value.getValueNames();
-			MapAlign::const_iterator iter = map_names.find(value);
-			if (iter != map_names.end())
-				_value.value = Enum(int(_value.value) | int(iter->second));
-
-
-			if (!_stream.eof())
-			{
-				std::string value2;
-				_stream >> value2;
-				iter = map_names.find(value2);
-				if (iter != map_names.end())
-					_value.value = Enum(int(_value.value) | int(iter->second));
-			}
-
-			return _stream;
-		}
-
-	private:
-		const MapAlign& getValueNames() const
-		{
-			static MapAlign map_names;
-
-			if (map_names.empty())
-			{
-				// OBSOLETE
-				map_names["ALIGN_HCENTER"] = HCenter;
-				map_names["ALIGN_VCENTER"] = VCenter;
-				map_names["ALIGN_CENTER"] = Center;
-				map_names["ALIGN_LEFT"] = Left;
-				map_names["ALIGN_RIGHT"] = Right;
-				map_names["ALIGN_HSTRETCH"] = HStretch;
-				map_names["ALIGN_TOP"] = Top;
-				map_names["ALIGN_BOTTOM"] = Bottom;
-				map_names["ALIGN_VSTRETCH"] = VStretch;
-				map_names["ALIGN_STRETCH"] = Stretch;
-				map_names["ALIGN_DEFAULT"] = Default;
-
-				MYGUI_REGISTER_VALUE(map_names, HCenter);
-				MYGUI_REGISTER_VALUE(map_names, VCenter);
-				MYGUI_REGISTER_VALUE(map_names, Center);
-				MYGUI_REGISTER_VALUE(map_names, Left);
-				MYGUI_REGISTER_VALUE(map_names, Right);
-				MYGUI_REGISTER_VALUE(map_names, HStretch);
-				MYGUI_REGISTER_VALUE(map_names, Top);
-				MYGUI_REGISTER_VALUE(map_names, Bottom);
-				MYGUI_REGISTER_VALUE(map_names, VStretch);
-				MYGUI_REGISTER_VALUE(map_names, Stretch);
-				MYGUI_REGISTER_VALUE(map_names, Default);
-				MYGUI_REGISTER_VALUE(map_names, HRelative);
-				MYGUI_REGISTER_VALUE(map_names, VRelative);
-				MYGUI_REGISTER_VALUE(map_names, Relative);
-			}
-
-			return map_names;
-		}
-
-	private:
-		Enum value;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_ALIGN_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Allocator.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Allocator.h
deleted file mode 100644
index ca107dcbd8..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Allocator.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_ALLOCATOR_H__
-#define __MYGUI_ALLOCATOR_H__
-
-#include <memory>
-#include <limits>
-
-namespace MyGUI
-{
-
-	template<typename T>
-	class Allocator
-	{
-	public:
-		//    typedefs
-		typedef T value_type;
-		typedef value_type* pointer;
-		typedef const value_type* const_pointer;
-		typedef value_type& reference;
-		typedef const value_type& const_reference;
-		typedef std::size_t size_type;
-		typedef std::ptrdiff_t difference_type;
-
-	public:
-		//    convert an allocator<T> to allocator<U>
-		template<typename U>
-		struct rebind
-		{
-			typedef Allocator<U> other;
-		};
-
-	public:
-		inline explicit Allocator() { }
-		inline ~Allocator() { }
-		template<typename U>
-		inline explicit Allocator(Allocator<U> const&) { }
-
-		//    address
-		inline pointer address(reference r) { return &r; }
-		inline const_pointer address(const_reference r) { return &r; }
-
-		//    memory allocation
-		inline pointer allocate(size_type cnt, typename std::allocator<void>::const_pointer = 0)
-		{
-			return reinterpret_cast<pointer>(::operator new (cnt * sizeof (T)));
-		}
-		inline void deallocate(pointer p, size_type)
-		{
-			::operator delete (p);
-		}
-
-		//    size
-		inline size_type max_size() const
-		{
-			return std::numeric_limits<size_type>::max() / sizeof(T);
-		}
-
-		//    construction/destruction
-		inline void construct(pointer p, const T& t) { new (p) T(t); }
-		inline void destroy(pointer p) { p->~T(); }
-
-		inline bool operator==(Allocator const&) { return true; }
-		inline bool operator!=(Allocator const& a) { return !operator==(a); }
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_ALLOCATOR_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Any.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Any.h
deleted file mode 100644
index bf5ae0fbed..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Any.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		10/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// -- Based on boost::any, original copyright information follows --
-// Copyright Kevlin Henney, 2000, 2001, 2002. All rights reserved.
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See at http://www.boost.org/LICENSE_1_0.txt)
-// -- End original copyright --
-
-#ifndef __MYGUI_ANY_H__
-#define __MYGUI_ANY_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Diagnostic.h"
-#include <algorithm>
-#include <typeinfo>
-
-namespace MyGUI
-{
-
-	/** @example "Class Any usage"
-	@code
-	void f()
-	{
-		// RU: тестовый класс, с простыми типами все аналогично
-		// EN: test class, with simple types all is similar
-		struct Data { int value; };
-
-		// RU: экземпляр и инициализация
-		// EN: instance and initialization
-		Data data;
-		data.value = 0xDEAD;
-
-		// RU: создастся копия класса Data
-		// EN: copy of class Data will be created
-		MyGUI::Any any = data;
-		// RU: копия класса Data
-		// EN: copy of class Data
-		Data copy_data = *any.castType<Data>();
-		// RU: теперь value == 0xDEAD
-		// EN: now value == 0xDEAD
-		int value = copy_data.value;
-
-
-		// RU: создастся копия указателя на класс Data
-		// EN: copy of pointer on class Data will be created
-		any = &data;
-		// RU: копия указателя на класс Data и конкретно на объект data
-		// EN: copy of pointer on class Data and on object data
-		Data * copy_ptr = *any.castType<Data*>();
-		// RU: теперь data.value == 0
-		// EN: now value == 0
-		copy_ptr->value = 0;
-
-	}
-	@endcode
-	*/
-
-	class MYGUI_EXPORT Any
-	{
-
-	private:
-		struct AnyEmpty { };
-
-	public:
-		static AnyEmpty Null;
-
-	public:
-		Any() :
-			mContent(nullptr)
-		{
-		}
-
-		template<typename ValueType> Any(const ValueType& value) :
-			mContent(new Holder<ValueType>(value))
-		{
-		}
-
-		Any(const Any::AnyEmpty& value) :
-			mContent(nullptr)
-		{
-		}
-
-		Any(const Any& other) :
-			mContent(other.mContent ? other.mContent->clone() : nullptr)
-		{
-		}
-
-		~Any()
-		{
-			delete mContent;
-		}
-
-		Any& swap(Any& rhs)
-		{
-			std::swap(mContent, rhs.mContent);
-			return *this;
-		}
-
-		template<typename ValueType> Any& operator = (const ValueType& rhs)
-		{
-			Any(rhs).swap(*this);
-			return *this;
-		}
-
-		Any& operator = (const Any::AnyEmpty& rhs)
-		{
-			delete mContent;
-			mContent = nullptr;
-			return *this;
-		}
-
-		Any& operator = (const Any& rhs)
-		{
-			Any(rhs).swap(*this);
-			return *this;
-		}
-
-		bool empty() const
-		{
-			return !mContent;
-		}
-
-		const std::type_info& getType() const
-		{
-			return mContent ? mContent->getType() : typeid(void);
-		}
-
-		template<typename ValueType>
-		ValueType * castType(bool _throw = true) const
-		{
-			if (this->getType() == typeid(ValueType))
-			{
-				return &static_cast<Any::Holder<ValueType> *>(this->mContent)->held;
-			}
-			MYGUI_ASSERT(!_throw, "Bad cast from type '" << getType().name() << "' to '" << typeid(ValueType).name() << "'");
-			return nullptr;
-		}
-
-		void * castUnsafe() const
-		{
-			return mContent ? static_cast<Any::Holder<void *> *>(this->mContent)->held : nullptr;
-		}
-
-	private:
-		class Placeholder
-		{
-		public:
-			virtual ~Placeholder() { }
-
-		public:
-			virtual const std::type_info& getType() const = 0;
-			virtual Placeholder * clone() const = 0;
-
-		};
-
-		template<typename ValueType> class Holder : public Placeholder
-		{
-		public:
-			Holder(const ValueType& value) :
-				held(value)
-			{
-			}
-
-		public:
-			virtual const std::type_info& getType() const
-			{
-				return typeid(ValueType);
-			}
-
-			virtual Placeholder * clone() const
-			{
-				return new Holder(held);
-			}
-
-		public:
-			ValueType held;
-
-		private:
-			Holder& operator=(const Holder &);
-
-		};
-
-
-		private: // representation
-			Placeholder * mContent;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_ANY_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_BiIndexBase.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_BiIndexBase.h
deleted file mode 100644
index f9f38a76d3..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_BiIndexBase.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		10/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_BIINDEX_BASE_H__
-#define __MYGUI_BIINDEX_BASE_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	class BiIndexBase
-	{
-	public:
-		virtual ~BiIndexBase() { }
-	protected:
-
-		size_t getIndexCount() { return mIndexFace.size(); }
-
-		size_t insertItemAt(size_t _index)
-		{
-			#if MYGUI_DEBUG_MODE == 1
-				MYGUI_ASSERT_RANGE_INSERT(_index, mIndexFace.size(), "BiIndexBase::insertItemAt");
-				checkIndexes();
-			#endif
-
-			if (_index == MyGUI::ITEM_NONE) _index = mIndexFace.size();
-
-			size_t index;
-
-			if (_index == mIndexFace.size())
-			{
-				// для вставки айтема
-				index = mIndexFace.size();
-
-				mIndexFace.push_back(_index);
-				mIndexBack.push_back(_index);
-			}
-			else
-			{
-				// для вставки айтема
-				index = mIndexFace[_index];
-
-				size_t count = mIndexFace.size();
-				for (size_t pos=0; pos<count; ++pos)
-				{
-					if (mIndexFace[pos] >= index) mIndexFace[pos]++;
-				}
-				mIndexFace.insert(mIndexFace.begin() + _index, index);
-
-				count ++;
-				mIndexBack.push_back(0);
-				for (size_t pos=0; pos<count; ++pos)
-				{
-					mIndexBack[mIndexFace[pos]] = pos;
-				}
-			}
-
-			#if MYGUI_DEBUG_MODE == 1
-				checkIndexes();
-			#endif
-
-			return index;
-		}
-
-		size_t removeItemAt(size_t _index)
-		{
-			#if MYGUI_DEBUG_MODE == 1
-				MYGUI_ASSERT_RANGE(_index, mIndexFace.size(), "BiIndexBase::removeItemAt");
-				checkIndexes();
-			#endif
-
-			// для удаления айтема
-			size_t index = mIndexFace[_index];
-
-			mIndexFace.erase(mIndexFace.begin() + _index);
-			mIndexBack.pop_back();
-
-			size_t count = mIndexFace.size();
-			for (size_t pos=0; pos<count; ++pos)
-			{
-				if (mIndexFace[pos] > index) mIndexFace[pos]--;
-				mIndexBack[mIndexFace[pos]] = pos;
-			}
-
-			#if MYGUI_DEBUG_MODE == 1
-				checkIndexes();
-			#endif
-
-			return index;
-		}
-
-		void removeAllItems()
-		{
-			mIndexFace.clear();
-			mIndexBack.clear();
-		}
-
-		// на входе индексы пользователя, на выходе реальные индексы
-		size_t convertToBack(size_t _index) const
-		{
-			#if MYGUI_DEBUG_MODE == 1
-				MYGUI_ASSERT_RANGE_AND_NONE(_index, mIndexFace.size(), "BiIndexBase::convertToBack");
-			#endif
-			return _index == ITEM_NONE ? ITEM_NONE : mIndexFace[_index];
-		}
-
-		// на входе индексы реальные, на выходе, то что видит пользователь
-		size_t convertToFace(size_t _index) const
-		{
-			#if MYGUI_DEBUG_MODE == 1
-				MYGUI_ASSERT_RANGE_AND_NONE(_index, mIndexFace.size(), "BiIndexBase::convertToFace");
-			#endif
-			return _index == ITEM_NONE ? ITEM_NONE : mIndexBack[_index];
-		}
-
-		// меняет местами два индекса, индексы со стороны пользователя
-		void swapItemsFaceAt(size_t _index1, size_t _index2)
-		{
-			#if MYGUI_DEBUG_MODE == 1
-				MYGUI_ASSERT_RANGE(_index1, mIndexFace.size(), "BiIndexBase::swapItemsFaceAt");
-				MYGUI_ASSERT_RANGE(_index2, mIndexFace.size(), "BiIndexBase::swapItemsFaceAt");
-			#endif
-
-			std::swap(mIndexFace[_index1], mIndexFace[_index2]);
-			std::swap(mIndexBack[mIndexFace[_index1]], mIndexBack[mIndexFace[_index2]]);
-		}
-
-		// меняет местами два индекса, индексы со сторонны данных
-		void swapItemsBackAt(size_t _index1, size_t _index2)
-		{
-			#if MYGUI_DEBUG_MODE == 1
-				MYGUI_ASSERT_RANGE(_index1, mIndexFace.size(), "BiIndexBase::swapItemsBackAt");
-				MYGUI_ASSERT_RANGE(_index2, mIndexFace.size(), "BiIndexBase::swapItemsBackAt");
-			#endif
-
-			std::swap(mIndexBack[_index1], mIndexBack[_index2]);
-			std::swap(mIndexFace[mIndexBack[_index1]], mIndexFace[mIndexBack[_index2]]);
-		}
-
-		#if MYGUI_DEBUG_MODE == 1
-
-		void checkIndexes()
-		{
-			assert(mIndexFace.size() == mIndexBack.size());
-
-			// проверяем на уникальность каждого индекса в маппинге
-			std::vector<bool> vec;
-			size_t count = mIndexFace.size();
-
-			vec.reserve(count);
-			for (size_t pos=0; pos<count; ++pos) vec.push_back(false);
-
-			for (size_t pos=0; pos<count; ++pos)
-			{
-				// максимум
-				size_t index = mIndexBack[pos];
-				if (index >= count) throw new std::exception();
-
-				// максимум
-				index = mIndexFace[pos];
-				if (index >= count) throw new std::exception();
-
-				if (vec[index]) throw new std::exception();
-				vec[index] = true;
-			}
-
-			for (size_t pos=0; pos<count; ++pos)
-			{
-				if (!vec[pos]) throw new std::exception();
-			}
-
-			// проверяем на взаимоссылаемость индексов
-			for (size_t pos=0; pos<count; ++pos)
-			{
-				size_t index = mIndexFace[pos];
-				if (mIndexBack[index] != pos) throw new std::exception();
-			}
-		}
-
-		#endif
-
-	private:
-		typedef std::vector<size_t> VectorSizeT;
-
-		// маппинг с индексов, которые видны наружу
-		// на индексы которые реально используются данными
-		VectorSizeT mIndexFace;
-
-		// маппинг с индексов, которые используют данные
-		// на индексы которые виндны наружу
-		VectorSizeT mIndexBack;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_BIINDEX_BASE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Bitwise.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Bitwise.h
deleted file mode 100644
index 9ba9cc2983..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Bitwise.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_BITWISE_H__
-#define __MYGUI_BITWISE_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	class Bitwise
-	{
-	public:
-		/** Returns the closest power-of-two number greater or equal to value.
-		*/
-		template<typename Type>
-		static MYGUI_FORCEINLINE Type firstPO2From(Type _value)
-		{
-			--_value;
-			_value |= _value >> 16;
-			_value |= _value >> 8;
-			_value |= _value >> 4;
-			_value |= _value >> 2;
-			_value |= _value >> 1;
-			++_value;
-			return _value;
-		}
-
-		/** Determines whether the number is power-of-two or not. */
-		template<typename Type>
-		static MYGUI_FORCEINLINE bool isPO2(Type _value)
-		{
-			return (_value & (_value-1)) == 0;
-		}
-
-		/** Returns the number of bits a pattern must be shifted right by to
-		remove right-hand zeros.
-		*/
-		template<typename Type>
-		static MYGUI_FORCEINLINE size_t getBitShift(Type _mask)
-		{
-			if (_mask == 0)
-				return 0;
-
-			size_t result = 0;
-			while ((_mask & 1) == 0)
-			{
-				++result;
-				_mask >>= 1;
-			}
-			return result;
-		}
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_BITWISE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Button.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Button.h
deleted file mode 100644
index 0766de105c..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Button.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_BUTTON_H__
-#define __MYGUI_BUTTON_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_StaticText.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT Button :
-		public StaticText
-	{
-		MYGUI_RTTI_DERIVED( Button )
-
-	public:
-		Button();
-
-		//! OLD Set button check state
-		void setButtonPressed(bool _value) { setStateCheck(_value); }
-		//! OLD Get buton check
-		bool getButtonPressed() { return getStateCheck(); }
-
-		//! Set button check state
-		void setStateCheck(bool _value);
-
-		//! Get buton check
-		bool getStateCheck() { return mIsStateCheck; }
-
-		//! Set image index (image should be defined in skin)
-		void setImageIndex(size_t _value);
-		//! Get image index
-		size_t getImageIndex();
-
-		/** Enable or disable Image mode\n
-			Image mode: when button state changed Image on button also change it's picture.\n
-			Disabled (false) by default.
-		*/
-		void setModeImage(bool _value);
-		/** Get Image mode flag */
-		bool getModeImage() { return mModeImage; }
-
-		/** Get pointer to glyph image for this button (if it exist in button skin) */
-		StaticImage* getStaticImage() { return mImage; }
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-		void _setMouseFocus(bool _focus);
-
-	protected:
-		virtual ~Button();
-
-		virtual void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		virtual void onMouseLostFocus(Widget* _new);
-		virtual void onMouseSetFocus(Widget* _old);
-		virtual void onMouseButtonPressed(int _left, int _top, MouseButton _id);
-		virtual void onMouseButtonReleased(int _left, int _top, MouseButton _id);
-
-		virtual void baseUpdateEnable();
-
-		bool _setState(const std::string& _value);
-		void setImageResource(const std::string& _name);
-
-	private:
-		void updateButtonState();
-
-		void shutdownWidgetSkin();
-		void initialiseWidgetSkin(ResourceSkin* _info);
-
-	private:
-		// нажата ли кнопка
-		bool mIsMousePressed;
-		// в фокусе ли кнопка
-		bool mIsMouseFocus;
-		// статус кнопки нажата или нет
-		bool mIsStateCheck;
-
-		StaticImage* mImage;
-		bool mModeImage;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_BUTTON_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Canvas.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Canvas.h
deleted file mode 100644
index da1c77fe2c..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Canvas.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/*!
-	@file
-	@author		Alexander Ptakhin
-	@date		01/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_CANVAS_H__
-#define __MYGUI_CANVAS_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_ITexture.h"
-
-namespace MyGUI
-{
-
-	/**
-	 * Widget wrapper over Texture - shows the texture.
-	 * Implemented: resizing of texture (see TextureResizeMode); recovery after lossing device;
-	 */
-	class MYGUI_EXPORT Canvas :
-		public Widget,
-		public ITextureInvalidateListener
-	{
-		MYGUI_RTTI_DERIVED( Canvas )
-
-	public:
-		Canvas();
-
-		struct Event
-		{
-			Event( bool _textureChanged, bool _widgetResized, bool _requested ) :
-				textureChanged( _textureChanged ),
-				widgetResized( _widgetResized ),
-				requested( _requested )
-			{
-			}
-
-			bool textureChanged;
-			bool widgetResized;
-
-			/// This update was caused by calling updateTexture();
-			bool requested;
-		};
-
-		typedef delegates::CDelegate1<Canvas*> EventInfo_Canvas;
-		typedef delegates::CDelegate2<Canvas*, Event> EventInfo_CanvasEvent;
-
-		//FIXME
-		/**
-			Available resize and view modes of texture
-			@remarks PT - Power of Two (size)
-		*/
-		enum TextureResizeMode
-		{
-			//
-			TRM_PT_CONST_SIZE, /// Texture doesn't resizes and fills all widget space
-			TRM_PT_VIEW_REQUESTED, /// You can view all pixels of texture, texture cropped by sizes of widget
-			TRM_PT_VIEW_ALL /// Texture resizes and fills all widget space
-		};
-
-	public:
-
-		/// Creates texture
-		void createTexture( TextureResizeMode _resizeMode, TextureUsage _usage = getDefaultTextureUsage(), PixelFormat _format = getDefaultTextureFormat() );
-
-		/// Creates texture
-		void createTexture( int _width, int _height, TextureResizeMode _resizeMode, TextureUsage _usage = getDefaultTextureUsage(), PixelFormat _format = getDefaultTextureFormat() );
-
-		/// Creates texture
-		void createTexture( const IntSize& _size, TextureResizeMode _resizeMode, TextureUsage _usage = getDefaultTextureUsage(), PixelFormat _format = getDefaultTextureFormat() );
-
-		/// Destroys texture
-		void destroyTexture();
-
-		/// Call user delegate update and removes old texture if it isn't original.
-		void updateTexture();
-
-		/// Locks hardware pixel buffer.
-		void* lock(TextureUsage _usage = TextureUsage::Write);
-
-		/// Unlocks hardware pixel buffer.
-		void unlock();
-
-		/// Checks lockness of hardware _pixel buffer.
-		bool isLocked() const { return mTexture->isLocked(); }
-
-		/// Returns real width of texture.
-		int getTextureRealWidth() const { return (int) mTexture->getWidth(); }
-
-		/// Returns real height of texture.
-		int getTextureRealHeight() const { return (int) mTexture->getHeight(); }
-
-		/// Returns real _size of texture.
-		IntSize getTextureRealSize() const { return IntSize( getTextureRealWidth(), getTextureRealHeight() ); }
-
-		/// Returns needed width while creating texture.
-		int getTextureSrcWidth() const { return mReqTexSize.width; }
-
-		/// Returns needed height while creating texture.
-		int getTextureSrcHeight() const { return mReqTexSize.height; }
-
-		/// Returns needed sizes while creating texture.
-		IntSize getTextureSrcSize() const { return mReqTexSize; }
-
-		/// Returns needed sizes while creating texture.
-		PixelFormat getTextureFormat() const { return mTexture->getFormat(); }
-
-		/// Returns name of the current texture.
-		const std::string& getTextureName() const { return mTexture->getName(); }
-
-		//! @copydoc Widget::setSize(const IntSize& _value)
-		virtual void setSize(const IntSize& _value);
-		//! @copydoc Widget::setCoord(const IntCoord& _value)
-		virtual void setCoord(const IntCoord& _value);
-
-		/** @copydoc Widget::setSize(int _width, int _height) */
-		void setSize(int _width, int _height) { setSize(IntSize(_width, _height)); }
-		/** @copydoc Widget::setCoord(int _left, int _top, int _width, int _height) */
-		void setCoord(int _left, int _top, int _width, int _height) { setCoord(IntCoord(_left, _top, _width, _height)); }
-
-		/// Returns resize mode
-		TextureResizeMode getResizeMode() const { return mTexResizeMode; }
-
-		/// Sets resize mode of texture \sa TextureResizeMode
-		void setResizeMode( TextureResizeMode _set ) { mTexResizeMode = _set; }
-
-		/// Checks if the texture has the source (required by user) size, otherwise real texture size are bigger.
-		bool isTextureSrcSize() const;
-
-		/// Returns true if the texture was created (and exists), otherwise false
-		bool isTextureCreated() const { return mTexture != nullptr; }
-
-		/// Returns true if we own the texture, otherwise false. \sa mManaged
-		bool isTextureManaged() const { return mTexManaged; }
-
-		/// Reurns interface texture.
-		ITexture* getTexture() { return mTexture; }
-
-		/// Sets the texture managed @remarks Be careful with assigning managed status to texture, which wasn't created in Canvas! \sa mManaged
-		void setTextureManaged( bool _value ) { mTexManaged = _value; }
-
-		/// Returns default GUI texture usage
-		static TextureUsage getDefaultTextureUsage() { return TextureUsage::Stream | TextureUsage::Write; }
-
-		/// Returns default GUI texture format
-		static PixelFormat getDefaultTextureFormat() { return PixelFormat::R8G8B8A8; }
-
-	/*event:*/
-		/** Event : Notify user texture instance will be changed \sa requestUpdateCanvas\n
-			signature : void method(MyGUI::Canvas* _canvas)\n
-			@param _canvas, which will be updated
-		 */
-		EventInfo_Canvas eventPreTextureChanges;
-
-		/** Event : Texture instance was changed (May be caused by resizing texture or lossing device). User have to update all references to new instance of texture.\n
-			signature : void method(MyGUI::Canvas* _canvas, MyGUI::Canvas::Event _event)\n
-			@param _canvas, which needs to update
-			@param _event
-		 */
-		EventInfo_CanvasEvent requestUpdateCanvas;
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	protected:
-		virtual ~Canvas();
-
-		/// Destroys texture
-		void _destroyTexture( bool _sendEvent );
-
-		/// Update entered parameters according to current texture resize mode(size) and restore (if can) parameters of usage and format from texture
-		void validate( int& _width, int& _height, TextureUsage& _usage, PixelFormat& _format ) const;
-
-		/// Creates the texture itself
-		void createExactTexture( int _width, int _height, TextureUsage _usage, PixelFormat _format );
-
-		/// Checks if we need to create a texture with such sizes.
-		bool checkCreate( int _width, int _height ) const;
-
-		/// Calls when resize widget
-		void resize( const IntSize& _size );
-
-		/// Correct texture uv-coordinates
-		void correctUV();
-
-		//! @copydoc Widget::baseChangeWidgetSkin(ResourceSkin* _info)
-		void baseChangeWidgetSkin( ResourceSkin* _info );
-
-		//! @copydoc Widget::initialiseWidgetSkin(ResourceSkin* _info)
-		void initialiseWidgetSkin( ResourceSkin* _info );
-
-		//! @copydoc Widget::shutdownWidgetSkin()
-		void shutdownWidgetSkin();
-
-		/// For updating once per frame.
-		void frameAdvise( bool _advise );
-
-		/// For updating once per frame.
-		void frameEntered( float _time );
-
-		virtual void textureInvalidate(ITexture* _texture);
-
-	protected:
-		/// Current texture
-		ITexture* mTexture;
-
-		/// Requested bu user sizes
-		IntSize mReqTexSize;
-
-		/// Generated texture name
-		std::string mGenTexName;
-
-		/// Texture resize mode \sa TextureResizeMode
-		TextureResizeMode mTexResizeMode;
-
-		/// Saved pointer from last calling lock. \sa lock
-		uint8* mTexData;
-
-		/// true if we own the texture (can delete it or replace by another instance), otherwise false
-		bool mTexManaged;
-
-		/// For updating once per frame. True state means updating before next frame starts.
-		bool mFrameAdvise;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_CANVAS_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_CastWidget.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_CastWidget.h
deleted file mode 100644
index 28ac57789e..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_CastWidget.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_CAST_WIDGET_H__
-#define __MYGUI_CAST_WIDGET_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Widget.h"
-
-namespace MyGUI
-{
-
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-	// шаблонный класс для проверки типа виджета
-	template <typename T>
-	MYGUI_OBSOLETE("use : template<typename Type> Type* Widget::castType(bool _throw)")
-	T* castWidget(Widget * _widget)
-	{
-		MYGUI_DEBUG_ASSERT(nullptr != _widget, "Error static cast, widget == nullptr");
-		return _widget->castType<T>();
-	}
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-} // namespace MyGUI
-
-#endif // __MYGUI_CAST_WIDGET_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ChildSkinInfo.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ChildSkinInfo.h
deleted file mode 100644
index 4a129252db..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ChildSkinInfo.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_CHILD_SKIN_INFO_H__
-#define __MYGUI_CHILD_SKIN_INFO_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_WidgetStyle.h"
-
-namespace MyGUI
-{
-
-	struct MYGUI_EXPORT ChildSkinInfo
-	{
-		ChildSkinInfo() : style(WidgetStyle::Child), align(Align::Default) { }
-
-		ChildSkinInfo(const std::string& _type, const WidgetStyle& _style, const std::string& _skin, const IntCoord& _coord, const Align& _align, const std::string& _layer, const std::string& _name) :
-			type(_type),
-			skin(_skin),
-			name(_name),
-			layer(_layer),
-			style(_style),
-			coord(_coord),
-			align(_align)
-		{
-			// set Child style by default
-			if (style == WidgetStyle::MAX) style = WidgetStyle::Child;
-		}
-
-		void addParam(const std::string& _key, const std::string& _value)
-		{
-			params[_key] = _value;
-		}
-
-		std::string findValue(const std::string& _key) const
-		{
-			MapString::const_iterator iter = params.find(_key);
-			if (iter != params.end()) return iter->second;
-			return "";
-		}
-
-		std::string type, skin, name, layer;
-		WidgetStyle style;
-		IntCoord coord;
-		Align align;
-		MapString params;
-	};
-
-	typedef std::vector<ChildSkinInfo> VectorChildSkinInfo;
-
-} // namespace MyGUI
-
-
-#endif // __MYGUI_CHILD_SKIN_INFO_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ClipboardManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ClipboardManager.h
deleted file mode 100644
index 857ce012a2..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ClipboardManager.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_CLIPBOARD_MANAGER_H__
-#define __MYGUI_CLIPBOARD_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_UString.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ClipboardManager
-	{
-		MYGUI_INSTANCE_HEADER( ClipboardManager )
-
-	public:
-		void initialise();
-		void shutdown();
-
-		/** Set current data in clipboard
-			@param _type of data (for example "Text")
-			@param _data
-		*/
-		void setClipboardData(const std::string& _type, const std::string& _data);
-		/** Clear specific type data
-			@param _type of data to delete (for example "Text")
-		*/
-		void clearClipboardData(const std::string& _type);
-		/** Get specific type data
-			@param _type of data to get (for example "Text")
-		*/
-		std::string getClipboardData(const std::string& _type);
-
-	private:
-		MapString mClipboardData;
-
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-	// дискриптор нашего главного окна
-	size_t mHwnd;
-	// строка, которую мы положили в буфер обмена винды
-	UString mPutTextInClipboard;
-#endif
-
-	};
-
-}
-
-#endif // __MYGUI_CLIPBOARD_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Colour.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Colour.h
deleted file mode 100644
index bb51b3239c..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Colour.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_COLOUR_H__
-#define __MYGUI_COLOUR_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-
-namespace MyGUI
-{
-
-	struct MYGUI_EXPORT Colour
-	{
-		float red, green, blue, alpha;
-
-		static const Colour Zero;
-		static const Colour Black;
-		static const Colour White;
-		static const Colour Red;
-		static const Colour Green;
-		static const Colour Blue;
-
-		Colour() : red( 1 ), green( 1 ), blue( 1 ), alpha( 1 ) { }
-		Colour( float _red, float _green, float _blue, float _alpha = 1 ) : red( _red ), green( _green ), blue( _blue ), alpha( _alpha ) { }
-		explicit Colour(const std::string& _value) { *this = parse(_value); }
-
-
-		Colour& operator=( Colour const& _value )
-		{
-			red = _value.red;
-			green = _value.green;
-			blue = _value.blue;
-			alpha = _value.alpha;
-			return *this;
-		}
-
-		bool operator==( Colour const& _value ) const
-		{
-			return ((red == _value.red) && (green == _value.green) && (blue == _value.blue) && (alpha == _value.alpha));
-		}
-
-		bool operator!=( Colour const& _value ) const
-		{
-			return ! (*this == _value);
-		}
-
-		void set( float _red, float _green, float _blue, float _alpha = 1 )
-		{
-			red = _red;
-			green = _green;
-			blue = _blue;
-			alpha = _alpha;
-		}
-
-		void clear()
-		{
-			red = green = blue = alpha = 0;
-		}
-
-		std::string print() const
-		{
-			std::ostringstream stream;
-			stream << *this;
-			return stream.str();
-		}
-
-		static Colour parse(const std::string& _value)
-		{
-			if (!_value.empty())
-			{
-				if (_value[0] == '#')
-				{
-					std::istringstream stream(_value.substr(1));
-					int result = 0;
-					stream >> std::hex >> result;
-					if (!stream.fail())
-					{
-						return Colour( (unsigned char)( result >> 16 ) / 256.0f, (unsigned char)( result >> 8 ) / 256.0f, (unsigned char)( result ) / 256.0f );
-					}
-				}
-				else
-				{
-					float red, green, blue, alpha = 1;
-					std::istringstream stream(_value);
-					stream >> red >> green >> blue;
-					if (!stream.fail())
-					{
-						if (!stream.eof())
-							stream >> alpha;
-						return Colour(red, green, blue, alpha);
-					}
-				}
-			}
-			return Colour::Zero;
-		}
-
-		friend std::ostream& operator << ( std::ostream& _stream, const Colour&  _value )
-		{
-			_stream << _value.red << " " << _value.green << " " << _value.blue << " " << _value.alpha;
-			return _stream;
-		}
-
-		friend std::istream& operator >> ( std::istream& _stream, Colour&  _value )
-		{
-			_value.clear();
-
-			std::string value;
-			_stream >> value;
-
-			if (value.empty())
-				return _stream;
-
-			if (value[0] == '#')
-			{
-				_value = Colour::parse(value);
-			}
-			else
-			{
-				std::istringstream stream(value);
-				stream >> _value.red;
-				if (stream.fail())
-					_value.clear();
-				else
-				{
-					_stream >> _value.green >> _value.blue;
-					if (!_stream.eof())
-						_stream >> _value.alpha;
-					else
-						_value.alpha = 1;
-
-					if (_stream.fail())
-						_value.clear();
-				}
-			}
-
-			return _stream;
-		}
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_COLOUR_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ComboBox.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ComboBox.h
deleted file mode 100644
index ffdd1b1587..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ComboBox.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_COMBO_BOX_H__
-#define __MYGUI_COMBO_BOX_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Edit.h"
-#include "MyGUI_List.h"
-#include "MyGUI_Any.h"
-#include "MyGUI_EventPair.h"
-#include "MyGUI_ControllerFadeAlpha.h"
-
-namespace MyGUI
-{
-
-	typedef delegates::CDelegate2<ComboBox*, size_t> EventHandle_ComboBoxPtrSizeT;
-
-	class MYGUI_EXPORT ComboBox :
-		public Edit
-	{
-		MYGUI_RTTI_DERIVED( ComboBox )
-
-	public:
-		ComboBox();
-
-		//------------------------------------------------------------------------------//
-		// манипуляции айтемами
-
-		//! Get number of items
-		size_t getItemCount() const { return mList->getItemCount(); }
-
-		//! Insert an item into a array at a specified position
-		void insertItemAt(size_t _index, const UString& _name, Any _data = Any::Null);
-
-		//! Add an item to the end of a array
-		void addItem(const UString& _name, Any _data = Any::Null) { return insertItemAt(ITEM_NONE, _name, _data); }
-
-		//! Remove item at a specified position
-		void removeItemAt(size_t _index);
-
-		//! Remove all items
-		void removeAllItems();
-
-
-		//! Search item, returns the position of the first occurrence in array or ITEM_NONE if item not found
-		size_t findItemIndexWith(const UString& _name);
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции выделениями
-
-		//! Get index of selected item (ITEM_NONE if none selected)
-		size_t getIndexSelected() { return mItemIndex; }
-
-		//! Select specified _index
-		void setIndexSelected(size_t _index);
-
-		//! Clear item selection
-		void clearIndexSelected() { setIndexSelected(ITEM_NONE); }
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции данными
-
-		//! Replace an item data at a specified position
-		void setItemDataAt(size_t _index, Any _data);
-
-		//! Clear an item data at a specified position
-		void clearItemDataAt(size_t _index) { setItemDataAt(_index, Any::Null); }
-
-		//! Get item data from specified position
-		template <typename ValueType>
-		ValueType * getItemDataAt(size_t _index, bool _throw = true)
-		{
-			return mList->getItemDataAt<ValueType>(_index, _throw);
-		}
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции отображением
-
-		//! Replace an item name at a specified position
-		void setItemNameAt(size_t _index, const UString& _name);
-
-		//! Get item name from specified position
-		const UString& getItemNameAt(size_t _index) { return mList->getItemNameAt(_index); }
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции выдимостью
-
-		//! Move all elements so specified becomes visible
-		void beginToItemAt(size_t _index) { mList->beginToItemAt(_index); }
-
-		//! Move all elements so first becomes visible
-		void beginToItemFirst() { if (getItemCount()) beginToItemAt(0); }
-
-		//! Move all elements so last becomes visible
-		void beginToItemLast() { if (getItemCount()) beginToItemAt(getItemCount() - 1); }
-
-		//! Move all elements so selected becomes visible
-		void beginToItemSelected() { if (getIndexSelected() != ITEM_NONE) beginToItemAt(getIndexSelected()); }
-
-
-		//------------------------------------------------------------------------------------//
-		// методы для управления отображением
-
-		//! Set drop list mode (text can not be edited)
-		void setComboModeDrop(bool _value);
-		//! Get drop list mode flag
-		bool getComboModeDrop() { return mModeDrop; }
-
-		//! Set smooth show of list
-		void setSmoothShow(bool _value) { mShowSmooth = _value; }
-		//! Get smooth show of list flag
-		bool getSmoothShow() { return mShowSmooth; }
-
-		//! Get max list height
-		void setMaxListHeight(int _value) { mMaxHeight = _value; }
-		//! Set max list height
-		int getMaxListHeight() { return mMaxHeight; }
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*event:*/
-		/** Event : Enter pressed in combo mode or item selected in drop.\n
-			signature : void method(MyGUI::ComboBox* _sender, size_t _index)
-			@param _sender widget that called this event
-			@param _index item
-		*/
-		EventPair<EventHandle_WidgetVoid, EventHandle_ComboBoxPtrSizeT> eventComboAccept;
-
-		/** Event : Position changed.\n
-			signature : void method(MyGUI::ComboBox* _sender, size_t _index)
-			@param _sender widget that called this event
-			@param _index of new position
-		*/
-		EventPair<EventHandle_WidgetSizeT, EventHandle_ComboBoxPtrSizeT> eventComboChangePosition;
-
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : size_t ComboBox::getIndexSelected()")
-		size_t getItemIndexSelected() { return getIndexSelected(); }
-		MYGUI_OBSOLETE("use : void ComboBox::setIndexSelected(size_t _index)")
-		void setItemSelectedAt(size_t _index) { setIndexSelected(_index); }
-		MYGUI_OBSOLETE("use : void ComboBox::clearIndexSelected()")
-		void clearItemSelected() { clearIndexSelected(); }
-
-		MYGUI_OBSOLETE("use : void ComboBox::insertItemAt(size_t _index, const UString& _name)")
-		void insertItem(size_t _index, const UString& _name) { insertItemAt(_index, _name); }
-		MYGUI_OBSOLETE("use : void ComboBox::setItemNameAt(size_t _index, const UString& _name)")
-		void setItem(size_t _index, const UString& _item) { setItemNameAt(_index, _item); }
-		MYGUI_OBSOLETE("use : const UString& ComboBox::getItemNameAt(size_t _index)")
-		const UString& getItem(size_t _index) { return getItemNameAt(_index); }
-		MYGUI_OBSOLETE("use : void ComboBox::removeItemAt(size_t _index)")
-		void deleteItem(size_t _index) { removeItemAt(_index); }
-		MYGUI_OBSOLETE("use : void ComboBox::removeAllItems()")
-		void deleteAllItems() { removeAllItems(); }
-		MYGUI_OBSOLETE("use : size_t ComboBox::getIndexSelected()")
-		size_t getItemSelect() { return getIndexSelected(); }
-		MYGUI_OBSOLETE("use : void void ComboBox::clearIndexSelected()")
-		void resetItemSelect() { clearIndexSelected(); }
-		MYGUI_OBSOLETE("use : void ComboBox::setIndexSelected(size_t _index)")
-		void setItemSelect(size_t _index) { setIndexSelected(_index); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	protected:
-		virtual ~ComboBox();
-
-		virtual void onKeyButtonPressed(KeyCode _key, Char _char);
-
-		virtual void baseChangeWidgetSkin(ResourceSkin* _info);
-
-	private:
-		void notifyButtonPressed(Widget* _sender, int _left, int _top, MouseButton _id);
-		void notifyListLostFocus(Widget* _sender, MyGUI::Widget* _new);
-		void notifyListSelectAccept(List* _widget, size_t _position);
-		void notifyListMouseItemActivate(List* _widget, size_t _position);
-		void notifyListChangePosition(List* _widget, size_t _position);
-		void notifyMouseWheel(Widget* _sender, int _rel);
-		void notifyMousePressed(Widget* _sender, int _left, int _top, MouseButton _id);
-		void notifyEditTextChange(Edit* _sender);
-
-		void showList();
-		void hideList();
-
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-		void actionWidgetHide(Widget* _widget);
-
-		ControllerFadeAlpha* createControllerFadeAlpha(float _alpha, float _coef, bool _enable);
-
-	private:
-		Button* mButton;
-		List* mList;
-
-		bool mListShow;
-		int mMaxHeight;
-		size_t mItemIndex;
-		bool mModeDrop;
-		bool mDropMouse;
-		bool mShowSmooth;
-		bool mManualList;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_COMBO_BOX_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Common.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Common.h
deleted file mode 100644
index 079a92ee24..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Common.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@author		baho_is
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_COMMON_H__
-#define __MYGUI_COMMON_H__
-
-#include "MyGUI_Prerequest.h"
-
-#include <string>
-#include <list>
-#include <set>
-#include <map>
-#include <vector>
-#include <deque>
-#include <exception>
-#include <math.h>
-
-#ifdef MYGUI_CUSTOM_ALLOCATOR
-#    include "MyGUI_CustomAllocator.h"
-#else // MYGUI_CUSTOM_ALLOCATOR
-#    include "MyGUI_Allocator.h"
-#endif // MYGUI_CUSTOM_ALLOCATOR
-
-#include "MyGUI_Macros.h"
-#include "MyGUI_Diagnostic.h"
-#include "MyGUI_LogManager.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_RenderOut.h"
-#include "MyGUI_Utility.h"
-#include "MyGUI_InputDefine.h"
-#include "MyGUI_Version.h"
-#include "MyGUI_WidgetStyle.h"
-#include "MyGUI_UString.h"
-#include "MyGUI_Delegate.h"
-
-#endif // __MYGUI_COMMON_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_CommonStateInfo.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_CommonStateInfo.h
deleted file mode 100644
index 1788c558ed..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_CommonStateInfo.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_COMMON_STATE_INFO_H__
-#define __MYGUI_COMMON_STATE_INFO_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_IStateInfo.h"
-#include "MyGUI_CoordConverter.h"
-#include "MyGUI_LanguageManager.h"
-#include "MyGUI_TextureUtility.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT SubSkinStateInfo :
-		public IStateInfo
-	{
-		MYGUI_RTTI_DERIVED( SubSkinStateInfo )
-
-	public:
-		virtual ~SubSkinStateInfo() { }
-
-		const FloatRect& getRect() { return mRect; }
-
-	private:
-		virtual void deserialization(xml::ElementPtr _node, Version _version)
-		{
-			std::string texture = _node->getParent()->getParent()->findAttribute("texture");
-
-			// ��������� ������ ����� � ������
-			if (_version >= Version(1, 1))
-			{
-				texture = LanguageManager::getInstance().replaceTags(texture);
-			}
-
-			const IntSize& size = texture_utility::getTextureSize(texture);
-			const IntCoord& coord = IntCoord::parse(_node->findAttribute("offset"));
-			mRect = CoordConverter::convertTextureCoord(coord, size);
-		}
-
-	private:
-		FloatRect mRect;
-	};
-
-	class MYGUI_EXPORT TileRectStateInfo :
-		public IStateInfo
-	{
-		MYGUI_RTTI_DERIVED( TileRectStateInfo )
-
-	public:
-		TileRectStateInfo() : mTileH(true), mTileV(true) { }
-		virtual ~TileRectStateInfo() { }
-
-		const FloatRect& getRect() { return mRect; }
-		const IntSize& getTileSize() { return mTileSize; }
-		bool getTileH() { return mTileH; }
-		bool getTileV() { return mTileV; }
-
-	private:
-		virtual void deserialization(xml::ElementPtr _node, Version _version)
-		{
-			std::string texture = _node->getParent()->getParent()->findAttribute("texture");
-
-			// ��������� ������ ����� � ������
-			if (_version >= Version(1, 1))
-			{
-				texture = LanguageManager::getInstance().replaceTags(texture);
-			}
-
-			const IntSize& size = texture_utility::getTextureSize(texture);
-			const IntCoord& coord = IntCoord::parse(_node->findAttribute("offset"));
-			mRect = CoordConverter::convertTextureCoord(coord, size);
-
-			xml::ElementEnumerator prop = _node->getElementEnumerator();
-			while (prop.next("Property"))
-			{
-				const std::string& key = prop->findAttribute("key");
-				const std::string& value = prop->findAttribute("value");
-				if (key == "TileH") mTileH = utility::parseBool(value);
-				else if (key == "TileV") mTileV = utility::parseBool(value);
-				else if (key == "TileSize") mTileSize = IntSize::parse(value);
-			}
-		}
-
-	private:
-		FloatRect mRect;
-		IntSize mTileSize;
-		bool mTileH;
-		bool mTileV;
-	};
-
-	class MYGUI_EXPORT EditTextStateInfo :
-		public IStateInfo
-	{
-		MYGUI_RTTI_DERIVED( EditTextStateInfo )
-
-	public:
-		EditTextStateInfo() : mColour(Colour::White), mShift(false) { }
-		virtual ~EditTextStateInfo() { }
-
-		const Colour& getColour() { return mColour; }
-		bool getShift() { return mShift; }
-
-	private:
-		virtual void deserialization(xml::ElementPtr _node, Version _version)
-		{
-			mShift = utility::parseBool(_node->findAttribute("shift"));
-
-			std::string colour = _node->findAttribute("colour");
-			if (_version >= Version(1, 1))
-			{
-				colour = LanguageManager::getInstance().replaceTags(colour);
-			}
-
-			mColour = Colour::parse(colour);
-		}
-
-	private:
-		Colour mColour;
-		bool mShift;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_COMMON_STATE_INFO_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerEdgeHide.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerEdgeHide.h
deleted file mode 100644
index 5a050e7787..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerEdgeHide.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*!
-	@file
-	@author		Evmenov Georgiy
-	@date		04/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_CONTROLLER_EDGE_HIDE_H__
-#define __MYGUI_CONTROLLER_EDGE_HIDE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_WidgetDefines.h"
-#include "MyGUI_ControllerItem.h"
-#include "MyGUI_Types.h"
-
-namespace MyGUI
-{
-
-	/** This controller used for hiding widgets near screen edges.
-		Widget will start hiding(move out of screen) if it's near
-		border and it and it's childrens don't have any focus. Hiding
-		till only small part of widget be visible. Widget will move
-		inside screen if it have any focus.
-	*/
-	class MYGUI_EXPORT ControllerEdgeHide :
-		public ControllerItem
-	{
-		MYGUI_RTTI_DERIVED( ControllerEdgeHide )
-
-	public:
-		ControllerEdgeHide();
-		virtual ~ControllerEdgeHide() { }
-
-		/**
-			@param _value in which widget will be hidden or shown
-		*/
-		void setTime(float _value) { mTime = _value; }
-
-		/**
-			@param _remainPixels how many pixels you will see afterr full hide
-		*/
-		void setRemainPixels(int _value) { mRemainPixels = _value; }
-
-		/**
-			@param _shadowSize adds to _remainPixels when hiding left or top (for example used for windows with shadows)
-		*/
-		void setShadowSize(int _value) { mShadowSize = _value; }
-
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	private:
-		bool addTime(Widget* _widget, float _time);
-		void prepareItem(Widget* _widget);
-
-		void recalculateTime(Widget* _widget);
-
-		delegates::CDelegate1<Widget*> eventPostAction;
-
-		float mTime;
-		int mRemainPixels;
-		int mShadowSize;
-		float mElapsedTime;
-		// for checking if widget was moved
-		MyGUI::IntCoord mLastCoord;
-	};
-
-}
-
-#endif // __MYGUI_CONTROLLER_EDGE_HIDE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerFadeAlpha.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerFadeAlpha.h
deleted file mode 100644
index 2bbe58ccc0..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerFadeAlpha.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_CONTROLLER_FADE_ALPHA_H__
-#define __MYGUI_CONTROLLER_FADE_ALPHA_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_WidgetDefines.h"
-#include "MyGUI_ControllerItem.h"
-
-namespace MyGUI
-{
-
-	/** This controller used for smooth changing alpha of widget in time */
-	class MYGUI_EXPORT ControllerFadeAlpha :
-		public ControllerItem
-	{
-		MYGUI_RTTI_DERIVED( ControllerFadeAlpha )
-
-	public:
-		ControllerFadeAlpha();
-		virtual ~ControllerFadeAlpha() { }
-
-		/**
-			@param _alpha that will be as result of changing
-		*/
-		void setAlpha(float _value) { mAlpha = _value; }
-
-		/**
-			@param _coef of alpha changing speed (1. mean that alpha will change from 0 to 1 at 1 second)
-		*/
-		void setCoef(float _value) { mCoef = _value; }
-
-		/**
-			@param _enabled if true then widget will be inactive after start of alpha changing
-		*/
-		void setEnabled(bool _value) { mEnabled = _value; }
-
-
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	private:
-		bool addTime(Widget* _widget, float _time);
-		void prepareItem(Widget* _widget);
-
-		bool getEnabled() { return mEnabled; }
-		float getAlpha() { return mAlpha; }
-		float getCoef() { return mCoef; }
-
-	private:
-		float mAlpha;
-		float mCoef;
-		bool mEnabled;
-
-	};
-
-}
-
-#endif // __MYGUI_CONTROLLER_FADE_ALPHA_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerItem.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerItem.h
deleted file mode 100644
index 74d162ff82..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerItem.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_CONTROLLER_ITEM_H__
-#define __MYGUI_CONTROLLER_ITEM_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_WidgetDefines.h"
-#include "MyGUI_IObject.h"
-#include "MyGUI_Delegate.h"
-
-namespace MyGUI
-{
-
-	/** Base interface for controllers */
-	class MYGUI_EXPORT ControllerItem :
-		public IObject
-	{
-		MYGUI_RTTI_DERIVED( ControllerItem )
-
-	public:
-		virtual ~ControllerItem() { }
-
-		virtual void prepareItem(Widget* _widget) = 0;
-		virtual bool addTime(Widget* _widget, float _time) = 0;
-
-		virtual void setProperty(const std::string& _key, const std::string& _value) { }
-
-		/** Event : Before controller started working.\n
-			signature : void method(MyGUI::Widget* _sender)\n
-			@param _sender widget under control
-		*/
-		delegates::CDelegate1<Widget*>
-			eventPreAction;
-
-		/** Event : Controller updated (called every frame).\n
-			signature : void method(MyGUI::Widget* _sender)\n
-			@param _sender widget under control
-		*/
-		delegates::CDelegate1<Widget*>
-			eventUpdateAction;
-
-		/** Event : After controller finished working.\n
-			signature : void method(MyGUI::Widget* _sender)\n
-			@param _sender widget under control
-		*/
-		delegates::CDelegate1<Widget*>
-			eventPostAction;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_CONTROLLER_ITEM_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerManager.h
deleted file mode 100644
index 4910313e06..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerManager.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_CONTROLLER_MANAGER_H__
-#define __MYGUI_CONTROLLER_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_ControllerItem.h"
-#include "MyGUI_IUnlinkWidget.h"
-#include "MyGUI_WidgetDefines.h"
-#include "MyGUI_ActionController.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ControllerManager : public IUnlinkWidget
-	{
-		MYGUI_INSTANCE_HEADER( ControllerManager )
-
-	public:
-		void initialise();
-		void shutdown();
-
-		// ������� ����������
-		ControllerItem* createItem(const std::string& _type);
-
-		/** Add controlled widget
-			@param _widget to be controlled
-			@param _item controller with some actions (for example ControllerFadeAlpha or your own)
-			@note _item will be deleted automatically at end of controller lifetime
-				(if not removed by removeItem(Widget* _widget) before)
-		*/
-		void addItem(Widget* _widget, ControllerItem * _item);
-
-		/** Stop the control over a widget
-			@param _widget to be removed
-		*/
-		void removeItem(Widget* _widget);
-
-	private:
-		void _unlinkWidget(Widget* _widget);
-		void frameEntered(float _time);
-		void clear();
-
-	private:
-		typedef std::pair<Widget*, ControllerItem *> PairControllerItem;
-		typedef std::list<PairControllerItem> ListControllerItem;
-		ListControllerItem mListItem;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_CONTROLLER_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerPosition.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerPosition.h
deleted file mode 100644
index 1477709155..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ControllerPosition.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*!
-	@file
-	@author		Evmenov Georgiy
-	@date		03/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_CONTROLLER_POSITION_H__
-#define __MYGUI_CONTROLLER_POSITION_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Delegate.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_WidgetDefines.h"
-#include "MyGUI_ControllerItem.h"
-
-namespace MyGUI
-{
-
-	/** This controller used for smooth changing position of widget in time */
-	class MYGUI_EXPORT ControllerPosition :
-		public ControllerItem
-	{
-		MYGUI_RTTI_DERIVED( ControllerPosition )
-
-	public:
-		typedef delegates::CDelegate4<const IntCoord&, const IntCoord&, IntCoord&, float> FrameAction;
-
-		ControllerPosition();
-		virtual ~ControllerPosition() { }
-
-		void setCoord(const IntCoord& _value);
-
-		void setSize(const IntSize& _value);
-
-		void setPosition(const IntPoint& _value);
-
-		void setFunction(const std::string& _value);
-
-		/**
-			@param _value seconds in which widget planned to reach destination coordinate
-		*/
-		void setTime(float _value) { mTime = _value; }
-
-		/**
-			@param _action applied to widget every frame (see ControllerPosition::eventFrameAction)
-		*/
-		void setAction(FrameAction::IDelegate* _value) { eventFrameAction = _value; }
-
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	private:
-		bool addTime(Widget* _widget, float _time);
-		void prepareItem(Widget* _widget);
-
-		float getElapsedTime() { return mElapsedTime; }
-
-		IntCoord mStartCoord;
-		IntCoord mDestCoord;
-		float mTime;
-		float mElapsedTime;
-
-		// controller changing position
-		bool mCalcPosition;
-		// controller changing size
-		bool mCalcSize;
-
-		/** Event : Every frame action while controller exist.\n
-			signature : void method(const IntRect& _startRect, const IntRect& _destRect, IntRect& _result, float _current_time)\n
-			@param _startRect start coordinate of widget
-			@param _destRect destination coordinate
-			@param _result resultRect
-			@param _current_time elapsed time (_current_time is real elapsed time divided by _time(see constructor) so _current_time == 1 mean that _time seconds elapsed)
-		*/
-		FrameAction eventFrameAction;
-	};
-
-}
-
-#endif // __MYGUI_CONTROLLER_POSITION_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_CoordConverter.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_CoordConverter.h
deleted file mode 100644
index 82a0f7e3d3..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_CoordConverter.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_COORD_CONVERTER_H__
-#define __MYGUI_COORD_CONVERTER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT CoordConverter
-	{
-	public:
-		/** Convert pixel coordinates to texture UV coordinates */
-		static FloatRect convertTextureCoord(const IntCoord& _coord, const IntSize& _textureSize)
-		{
-			if (!_textureSize.width || !_textureSize.height) return FloatRect();
-			return FloatRect(
-			(float)_coord.left / (float)_textureSize.width,
-			(float)_coord.top / (float)_textureSize.height,
-			(float)_coord.right() / (float)_textureSize.width,
-			(float)_coord.bottom() / (float)_textureSize.height);
-		}
-
-		/* Convert from relative to pixel coordinates.
-			@param _coord relative coordinates.
-		*/
-		static IntCoord convertFromRelative(const FloatCoord& _coord, const IntSize& _view)
-		{
-			return IntCoord(int(_coord.left * _view.width), int(_coord.top * _view.height), int(_coord.width * _view.width), int(_coord.height * _view.height));
-		}
-
-		/* Convert from relative to pixel coordinates.
-			@param _coord relative coordinates.
-		*/
-		static IntSize convertFromRelative(const FloatSize& _size, const IntSize& _view)
-		{
-			return IntSize(int(_size.width * _view.width), int(_size.height * _view.height));
-		}
-
-		/* Convert from relative to pixel coordinates.
-			@param _coord relative coordinates.
-		*/
-		static IntPoint convertFromRelative(const FloatPoint& _point, const IntSize& _view)
-		{
-			return IntPoint(int(_point.left * _view.width), int(_point.top * _view.height));
-		}
-
-		/* Convert from pixel to relative coordinates.
-			@param _coord pixel coordinates.
-		*/
-		static FloatCoord convertToRelative(const IntCoord& _coord, const IntSize& _view)
-		{
-			return FloatCoord(_coord.left / (float)_view.width, _coord.top / (float)_view.height, _coord.width / (float)_view.width, _coord.height / (float)_view.height);
-		}
-
-		static FloatSize convertToRelative(const IntSize& _size, const IntSize& _view)
-		{
-			return FloatSize(_size.width / (float)_view.width, _size.height / (float)_view.height);
-		}
-
-		static FloatPoint convertToRelative(const IntPoint& _point, const IntSize& _view)
-		{
-			return FloatPoint(_point.left / (float)_view.width, _point.top / (float)_view.height);
-		}
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_COORD_CONVERTER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_CustomAllocator.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_CustomAllocator.h
deleted file mode 100644
index 870092a648..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_CustomAllocator.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_CUSTOM_ALLOCATOR_H__
-#define __MYGUI_CUSTOM_ALLOCATOR_H__
-
-#include <memory>
-#include <limits>
-
-// for Ogre version
-#include <OgrePrerequisites.h>
-
-#if OGRE_VERSION < MYGUI_DEFINE_VERSION(1, 6, 0)
-#include <OgreMemoryManager.h>
-#include <OgreNoMemoryMacros.h>
-#endif
-
-namespace MyGUI
-{
-
-	template<typename T>
-	class Allocator
-	{
-	public:
-		//    typedefs
-		typedef T value_type;
-		typedef value_type* pointer;
-		typedef const value_type* const_pointer;
-		typedef value_type& reference;
-		typedef const value_type& const_reference;
-		typedef std::size_t size_type;
-		typedef std::ptrdiff_t difference_type;
-
-	public:
-		//    convert an allocator<T> to allocator<U>
-		template<typename U>
-		struct rebind
-		{
-			typedef Allocator<U> other;
-		};
-
-	public:
-		inline explicit Allocator() { }
-		inline ~Allocator() { }
-		template<typename U>
-		inline explicit Allocator(Allocator<U> const&) { }
-
-		//    address
-		inline pointer address(reference r) { return &r; }
-		inline const_pointer address(const_reference r) { return &r; }
-
-		//    memory allocation
-		inline pointer allocate(size_type cnt, typename std::allocator<void>::const_pointer = 0)
-		{
-			return reinterpret_cast<pointer>(::operator new (cnt * sizeof (T)));
-		}
-		inline void deallocate(pointer p, size_type)
-		{
-			::operator delete (p);
-		}
-
-		//    size
-		inline size_type max_size() const
-		{
-			return std::numeric_limits<size_type>::max() / sizeof(T);
-		}
-
-		//    construction/destruction
-		inline void construct(pointer p, const T& t) { new (p) T(t); }
-		inline void destroy(pointer p) { p->~T(); }
-
-		inline bool operator==(Allocator const&) { return true; }
-		inline bool operator!=(Allocator const& a) { return !operator==(a); }
-	};
-
-} // namespace MyGUI
-
-#if OGRE_VERSION < MYGUI_DEFINE_VERSION(1, 6, 0)
-#include <OgreMemoryMacros.h>
-#endif
-
-#endif // __MYGUI_CUSTOM_ALLOCATOR_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DDContainer.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DDContainer.h
deleted file mode 100644
index 560cb90181..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DDContainer.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		10/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_DDCONTAINER_H__
-#define __MYGUI_DDCONTAINER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_DDItemInfo.h"
-#include "MyGUI_EventPair.h"
-
-namespace MyGUI
-{
-
-	typedef delegates::CDelegate3<DDContainer*, const DDItemInfo&, bool&> EventHandle_DDContainerPtrCDDItemInfoRefBoolRef;
-	typedef delegates::CDelegate3<DDContainer*, const DDItemInfo&, bool> EventHandle_DDContainerPtrCDDItemInfoRefBool;
-	typedef delegates::CDelegate2<DDContainer*, DDItemState> EventHandle_EventHandle_DDContainerPtrDDItemState;
-	typedef delegates::CDelegate3<DDContainer*, WidgetPtr&, IntCoord&> EventHandle_EventHandle_DDContainerPtrWidgetPtrRefIntCoordRef;
-
-
-	class MYGUI_EXPORT DDContainer :
-		public Widget
-	{
-		MYGUI_RTTI_DERIVED( DDContainer )
-
-	public:
-		DDContainer();
-
-		/** Set drag'n'drop mode flag.
-			Disabled (false) by default.
-		*/
-		void setNeedDragDrop(bool _value) { mNeedDragDrop = _value; }
-		/** Get drag'n'drop mode flag */
-		bool getNeedDragDrop() { return mNeedDragDrop; }
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*event:*/
-		/** Event : request for start drag
-			signature : void method(MyGUI::DDContainer* _sender, const MyGUI::DDItemInfo& _info, bool& _result)
-			@param _sender widget that called this event
-			@param _info information about DDContainers
-			@param _result write here true if container can be draggedor false if it can't
-		*/
-		EventHandle_DDContainerPtrCDDItemInfoRefBoolRef eventStartDrag;
-
-		/** Event : request for start drag (moving mouse over container, but not dropped yet)
-			signature : void method(MyGUI::DDContainer* _sender, const MyGUI::DDItemInfo& _info, bool& _result)
-			@param _sender widget that called this event
-			@param _info information about DDContainers
-			@param _result write here true if container accept dragged widget or false if it isn't
-		*/
-		EventHandle_DDContainerPtrCDDItemInfoRefBoolRef eventRequestDrop;
-
-		/** Event : end drag (drop)
-			signature : void method(MyGUI::DDContainer* _sender, const MyGUI::DDItemInfo& _info, bool _result)
-			@param _sender widget that called this event
-			@param _info information about DDContainers
-			@param _result if true then drop was successfull
-		*/
-		EventHandle_DDContainerPtrCDDItemInfoRefBool eventDropResult;
-
-		/** Event : drag'n'drop state changed
-			signature : void method(MyGUI::DDContainer* _sender, MyGUI::DDItemState _state)
-			@param _sender widget that called this event
-			@param _state new state
-		*/
-		EventHandle_EventHandle_DDContainerPtrDDItemState eventChangeDDState;
-
-		/** Event : [not used] request widget for dragging
-			signature : void method(MyGUI::DDContainer* _sender, MyGUI::Widget*& _item, MyGUI::IntCoord& _dimension)
-			@param _sender widget that called this event
-			@param _item write widget pointer here
-			@param _dimension write widget coordinate here
-		*/
-		EventHandle_EventHandle_DDContainerPtrWidgetPtrRefIntCoordRef requestDragWidgetInfo;
-
-
-	/*internal:*/
-		// метод для установления стейта айтема
-		virtual void _setContainerItemInfo(size_t _index, bool _set, bool _accept) { }
-
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-		/** Event : внутреннее событие, невалидна информация для контейнера
-			signature : void method(MyGUI::DDContainer* _sender)
-			@param _sender widget that called this event
-		*/
-		EventPair<EventHandle_WidgetVoid, delegates::CDelegate1<DDContainer*> >
-			_eventInvalideContainer;
-
-		/** Event : !!обновить виджеты дропа DD_FIXME наверное internal
-			signature : void method(MyGUI::DDContainer* _sender, MyGUI::Widget* _item, const MyGUI::DDWidgetState& _state)
-			@param _sender widget that called this event
-			@param _items
-			@param _state
-		*/
-		delegates::CDelegate3<DDContainer*, Widget*, const DDWidgetState&>
-			eventUpdateDropState;
-
-	protected:
-		virtual ~DDContainer();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		virtual void onMouseButtonPressed(int _left, int _top, MouseButton _id);
-		virtual void onMouseButtonReleased(int _left, int _top, MouseButton _id);
-		virtual void onMouseDrag(int _left, int _top);
-
-		virtual void notifyInvalideDrop(DDContainer* _sender);
-
-		virtual void _getContainer(Widget*& _container, size_t& _index);
-
-		virtual void removeDropItems();
-		virtual void updateDropItems();
-		virtual void updateDropItemsState(const DDWidgetState& _state);
-
-		void mouseDrag();
-		void mouseButtonReleased(MouseButton _id);
-		void mouseButtonPressed(MouseButton _id);
-
-		void endDrop(bool _reset);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-
-	protected:
-		bool mDropResult;
-		bool mNeedDrop;
-		bool mStartDrop;
-
-		Widget* mOldDrop;
-		Widget* mCurrentSender;
-
-		DDItemInfo mDropInfo;
-
-		size_t mDropSenderIndex;
-
-		// список виджетов для дропа
-		Widget* mDropItem;
-		IntCoord mDropDimension;
-
-		IntPoint mClickInWidget;
-
-		// нужно и виджету поддержка драг энд дропа
-		bool mNeedDragDrop;
-
-		DDContainer* mReseiverContainer;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_DDCONTAINER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DDItemInfo.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DDItemInfo.h
deleted file mode 100644
index 288598073b..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DDItemInfo.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_ITEM_DROP_INFO_H__
-#define __MYGUI_ITEM_DROP_INFO_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	struct MYGUI_EXPORT DDItemState
-	{
-		enum Enum
-		{
-			None,
-			Start, /**< start drag */
-			End, /**< end drag (drop) */
-			Miss, /**< drag DDContainer over empty space or widgets that don't have drag'n'drop */
-			Accept, /**< drag DDContainer over another DDContainer that accept dropping on it */
-			Refuse /**< drag DDContainer over another DDContainer that refuse dropping on it */
-		};
-
-		DDItemState(Enum _value = None) : value(_value) { }
-
-		friend bool operator == (DDItemState const& a, DDItemState const& b) { return a.value == b.value; }
-		friend bool operator != (DDItemState const& a, DDItemState const& b) { return a.value != b.value; }
-
-	private:
-		Enum value;
-	};
-
-	// структура информации об индексах дропа
-	/** Inormation about drag'n'drop indexes */
-	struct MYGUI_EXPORT DDItemInfo
-	{
-		DDItemInfo() :
-			sender(nullptr),
-			sender_index(ITEM_NONE),
-			receiver(nullptr),
-			receiver_index(ITEM_NONE)
-		{
-		}
-
-		DDItemInfo(DDContainer* _sender, size_t _sender_index, DDContainer* _receiver, size_t _receiver_index) :
-			sender(_sender),
-			sender_index(_sender_index),
-			receiver(_receiver),
-			receiver_index(_receiver_index)
-		{
-		}
-
-		void set(DDContainer* _sender, size_t _sender_index, DDContainer* _receiver, size_t _receiver_index)
-		{
-			sender = _sender;
-			sender_index = _sender_index;
-			receiver = _receiver;
-			receiver_index = _receiver_index;
-		}
-
-		void reset()
-		{
-			sender = nullptr;
-			sender_index = ITEM_NONE;
-			receiver = nullptr;
-			receiver_index = ITEM_NONE;
-		}
-
-		/** DDContainer that send this event (container from which we started drag) */
-		DDContainer* sender;
-		/** Index of sender container */
-		size_t sender_index;
-
-		/** DDContainer that receive dragged widget (container to which we want to drop) */
-		DDContainer* receiver;
-		/** Index of receiver container */
-		size_t receiver_index;
-	};
-
-	struct MYGUI_EXPORT DDWidgetState
-	{
-		DDWidgetState(size_t _index) :
-			index(_index),
-			update(true),
-			accept(false),
-			refuse(false)
-		{ }
-
-		/** Index of element */
-		size_t index;
-		/** State and internal data changed */
-		bool update;
-		/** Is widget accept drop */
-		bool accept;
-		/** Is widget refuse drop */
-		bool refuse;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_ITEM_DROP_INFO_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DataFileStream.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DataFileStream.h
deleted file mode 100644
index 0907f21b60..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DataFileStream.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_DATA_FILE_STREAM_H__
-#define __MYGUI_DATA_FILE_STREAM_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_DataStream.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT DataFileStream : public DataStream
-	{
-	public:
-		DataFileStream();
-		DataFileStream(std::ifstream* _stream);
-		~DataFileStream();
-
-	private:
-		std::ifstream* mFileStream;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_DATA_STREAM_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DataManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DataManager.h
deleted file mode 100644
index be7649e8f5..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DataManager.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_DATA_MANAGER_H__
-#define __MYGUI_DATA_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_IDataStream.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT DataManager
-	{
-	public:
-		DataManager();
-		virtual ~DataManager() = 0;
-
-		static DataManager& getInstance();
-		static DataManager* getInstancePtr();
-
-		virtual IDataStream* getData(const std::string& _name) = 0;
-
-		virtual bool isDataExist(const std::string& _name) = 0;
-
-		virtual const VectorString& getDataListNames(const std::string& _pattern) = 0;
-
-		virtual const std::string& getDataPath(const std::string& _name) = 0;
-
-	private:
-		static DataManager* msInstance;
-		bool mIsInitialise;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_DATA_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DataStream.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DataStream.h
deleted file mode 100644
index a532eebee7..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DataStream.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_DATA_STREAM_H__
-#define __MYGUI_DATA_STREAM_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_IDataStream.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT DataStream : public IDataStream
-	{
-	public:
-		DataStream();
-		DataStream(std::istream* _stream);
-		virtual ~DataStream();
-
-		virtual bool eof();
-		virtual size_t size();
-		virtual void readline(std::string& _source, Char _delim);
-		virtual size_t read(void* _buf, size_t _count);
-
-	protected:
-		std::istream* mStream;
-		size_t mSize;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_DATA_STREAM_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Delegate.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Delegate.h
deleted file mode 100644
index 5dd843c85f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Delegate.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_DELEGATE_H__
-#define __MYGUI_DELEGATE_H__
-
-#include "MyGUI_Diagnostic.h"
-#include <typeinfo>
-#include <list>
-
-// source
-// http://rsdn.ru/article/cpp/delegates.xml
-
-// генерация делегатов для различного колличества параметров
-namespace MyGUI
-{
-
-	namespace delegates
-	{
-		// базовый класс для тех классов, что хотят себя отвязывать от мульти делегатов
-		class MYGUI_EXPORT IDelegateUnlink
-		{
-		public:
-			virtual ~IDelegateUnlink() { }
-
-			IDelegateUnlink() { m_baseDelegateUnlink = this; }
-			bool compare(IDelegateUnlink * _unlink) const { return m_baseDelegateUnlink == _unlink->m_baseDelegateUnlink; }
-
-		private:
-			IDelegateUnlink * m_baseDelegateUnlink;
-		};
-
-		inline IDelegateUnlink * GetDelegateUnlink(void * _base) { return 0; }
-		inline IDelegateUnlink * GetDelegateUnlink(IDelegateUnlink * _base) { return _base; }
-	}
-
-	// без параметров
-	#define MYGUI_SUFFIX       0
-	#define MYGUI_TEMPLATE
-	#define MYGUI_TEMPLATE_PARAMS
-	#define MYGUI_TEMPLATE_ARGS
-	#define MYGUI_T_TEMPLATE_PARAMS  <typename T>
-	#define MYGUI_T_TEMPLATE_ARGS <T>
-	#define MYGUI_PARAMS
-	#define MYGUI_ARGS
-	#define MYGUI_TYPENAME
-
-	#include "MyGUI_DelegateImplement.h"
-
-	// один параметр
-	#define MYGUI_SUFFIX       1
-	#define MYGUI_TEMPLATE	template
-	#define MYGUI_TEMPLATE_PARAMS  <typename TP1>
-	#define MYGUI_TEMPLATE_ARGS    <TP1>
-	#define MYGUI_T_TEMPLATE_PARAMS  <typename T, typename TP1>
-	#define MYGUI_T_TEMPLATE_ARGS    <T, TP1>
-	#define MYGUI_PARAMS       TP1 p1
-	#define MYGUI_ARGS         p1
-	#define MYGUI_TYPENAME     typename
-
-	#include "MyGUI_DelegateImplement.h"
-
-	// два параметра
-	#define MYGUI_SUFFIX       2
-	#define MYGUI_TEMPLATE	template
-	#define MYGUI_TEMPLATE_PARAMS  <typename TP1, typename TP2>
-	#define MYGUI_TEMPLATE_ARGS    <TP1, TP2>
-	#define MYGUI_T_TEMPLATE_PARAMS  <typename T, typename TP1, typename TP2>
-	#define MYGUI_T_TEMPLATE_ARGS    <T, TP1, TP2>
-	#define MYGUI_PARAMS       TP1 p1, TP2 p2
-	#define MYGUI_ARGS         p1, p2
-	#define MYGUI_TYPENAME     typename
-
-	#include "MyGUI_DelegateImplement.h"
-
-	// три параметра
-	#define MYGUI_SUFFIX       3
-	#define MYGUI_TEMPLATE	template
-	#define MYGUI_TEMPLATE_PARAMS  <typename TP1, typename TP2, typename TP3>
-	#define MYGUI_TEMPLATE_ARGS    <TP1, TP2, TP3>
-	#define MYGUI_T_TEMPLATE_PARAMS  <typename T, typename TP1, typename TP2, typename TP3>
-	#define MYGUI_T_TEMPLATE_ARGS    <T, TP1, TP2, TP3>
-	#define MYGUI_PARAMS       TP1 p1, TP2 p2, TP3 p3
-	#define MYGUI_ARGS         p1, p2, p3
-	#define MYGUI_TYPENAME     typename
-
-	#include "MyGUI_DelegateImplement.h"
-
-	// четыре параметра
-	#define MYGUI_SUFFIX       4
-	#define MYGUI_TEMPLATE	template
-	#define MYGUI_TEMPLATE_PARAMS  <typename TP1, typename TP2, typename TP3, typename TP4>
-	#define MYGUI_TEMPLATE_ARGS    <TP1, TP2, TP3, TP4>
-	#define MYGUI_T_TEMPLATE_PARAMS  <typename T, typename TP1, typename TP2, typename TP3, typename TP4>
-	#define MYGUI_T_TEMPLATE_ARGS    <T, TP1, TP2, TP3, TP4>
-	#define MYGUI_PARAMS       TP1 p1, TP2 p2, TP3 p3, TP4 p4
-	#define MYGUI_ARGS         p1, p2, p3, p4
-	#define MYGUI_TYPENAME     typename
-
-	#include "MyGUI_DelegateImplement.h"
-
-	// пять параметров
-	#define MYGUI_SUFFIX       5
-	#define MYGUI_TEMPLATE	template
-	#define MYGUI_TEMPLATE_PARAMS  <typename TP1, typename TP2, typename TP3, typename TP4, typename TP5>
-	#define MYGUI_TEMPLATE_ARGS    <TP1, TP2, TP3, TP4, TP5>
-	#define MYGUI_T_TEMPLATE_PARAMS  <typename T, typename TP1, typename TP2, typename TP3, typename TP4, typename TP5>
-	#define MYGUI_T_TEMPLATE_ARGS    <T, TP1, TP2, TP3, TP4, TP5>
-	#define MYGUI_PARAMS       TP1 p1, TP2 p2, TP3 p3, TP4 p4, TP5 p5
-	#define MYGUI_ARGS         p1, p2, p3, p4, p5
-	#define MYGUI_TYPENAME     typename
-
-	#include "MyGUI_DelegateImplement.h"
-
-
-} // namespace MyGUI
-
-#endif // __MYGUI_DELEGATE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DelegateImplement.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DelegateImplement.h
deleted file mode 100644
index f07e48675e..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DelegateImplement.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace delegates
-{
-
-	#define MYGUI_COMBINE(a, b)									MYGUI_COMBINE1(a, b)
-	#define MYGUI_COMBINE1(a, b)								a##b
-
-	#define MYGUI_I_DELEGATE									MYGUI_COMBINE(IDelegate, MYGUI_SUFFIX)
-
-	#define MYGUI_C_STATIC_DELEGATE					MYGUI_COMBINE(CStaticDelegate, MYGUI_SUFFIX)
-	#define MYGUI_C_METHOD_DELEGATE					MYGUI_COMBINE(CMethodDelegate, MYGUI_SUFFIX)
-
-	#define MYGUI_C_DELEGATE									MYGUI_COMBINE(CDelegate, MYGUI_SUFFIX)
-	#define MYGUI_C_MULTI_DELEGATE						MYGUI_COMBINE(CMultiDelegate, MYGUI_SUFFIX)
-
-
-	// базовый класс всех делегатов
-	MYGUI_TEMPLATE   MYGUI_TEMPLATE_PARAMS
-	class MYGUI_I_DELEGATE
-	{
-	public:
-		virtual ~MYGUI_I_DELEGATE() { }
-		virtual bool isType( const std::type_info& _type) = 0;
-		virtual void invoke( MYGUI_PARAMS ) = 0;
-		virtual bool compare(  MYGUI_I_DELEGATE MYGUI_TEMPLATE_ARGS  * _delegate) const = 0;
-		virtual bool compare(IDelegateUnlink * _unlink) const { return false; }
-	};
-
-
-	// делегат для статической функции
-	MYGUI_TEMPLATE   MYGUI_TEMPLATE_PARAMS
-	class MYGUI_C_STATIC_DELEGATE : public  MYGUI_I_DELEGATE MYGUI_TEMPLATE_ARGS
-	{
-	public:
-		typedef void (*Func)( MYGUI_PARAMS );
-
-		MYGUI_C_STATIC_DELEGATE (Func _func) : mFunc(_func) { }
-
-		virtual bool isType( const std::type_info& _type) { return typeid( MYGUI_C_STATIC_DELEGATE MYGUI_TEMPLATE_ARGS ) == _type; }
-
-		virtual void invoke( MYGUI_PARAMS )
-		{
-			mFunc( MYGUI_ARGS );
-		}
-
-		virtual bool compare(  MYGUI_I_DELEGATE MYGUI_TEMPLATE_ARGS  * _delegate) const
-		{
-			if (nullptr == _delegate || !_delegate->isType(typeid(MYGUI_C_STATIC_DELEGATE MYGUI_TEMPLATE_ARGS)) ) return false;
-			MYGUI_C_STATIC_DELEGATE MYGUI_TEMPLATE_ARGS * cast = static_cast<MYGUI_C_STATIC_DELEGATE MYGUI_TEMPLATE_ARGS *>(_delegate);
-			return cast->mFunc == mFunc;
-		}
-		virtual bool compare(IDelegateUnlink * _unlink) const { return false; }
-
-	private:
-		Func mFunc;
-	};
-
-
-	// делегат для метода класса
-	template MYGUI_T_TEMPLATE_PARAMS
-	class MYGUI_C_METHOD_DELEGATE : public  MYGUI_I_DELEGATE MYGUI_TEMPLATE_ARGS
-	{
-	public:
-		typedef void (T::*Method)( MYGUI_PARAMS );
-
-		MYGUI_C_METHOD_DELEGATE(IDelegateUnlink * _unlink, T * _object, Method _method) : mUnlink(_unlink), mObject(_object), mMethod(_method) { }
-
-		virtual bool isType( const std::type_info& _type) { return typeid( MYGUI_C_METHOD_DELEGATE MYGUI_T_TEMPLATE_ARGS ) == _type; }
-
-		virtual void invoke( MYGUI_PARAMS )
-		{
-			(mObject->*mMethod)( MYGUI_ARGS );
-		}
-
-		virtual bool compare(  MYGUI_I_DELEGATE MYGUI_TEMPLATE_ARGS  * _delegate) const
-		{
-			if (nullptr == _delegate || !_delegate->isType(typeid(MYGUI_C_METHOD_DELEGATE MYGUI_T_TEMPLATE_ARGS)) ) return false;
-			MYGUI_C_METHOD_DELEGATE MYGUI_T_TEMPLATE_ARGS  * cast = static_cast<  MYGUI_C_METHOD_DELEGATE MYGUI_T_TEMPLATE_ARGS  * >(_delegate);
-			return cast->mObject == mObject && cast->mMethod == mMethod;
-		}
-
-		virtual bool compare(IDelegateUnlink * _unlink) const
-		{
-			return mUnlink == _unlink;
-		}
-
-	private:
-		IDelegateUnlink *mUnlink;
-		T * mObject;
-		Method mMethod;
-	};
-
-} // namespace delegates
-
-// шаблон для создания делегата статической функции
-// параметры : указатель на функцию
-// пример : newDelegate(funk_name);
-// пример : newDelegate(class_name::static_method_name);
-MYGUI_TEMPLATE   MYGUI_TEMPLATE_PARAMS
-inline  delegates::MYGUI_I_DELEGATE MYGUI_TEMPLATE_ARGS  * newDelegate( void (*_func)( MYGUI_PARAMS ) )
-{
-	return new delegates::MYGUI_C_STATIC_DELEGATE MYGUI_TEMPLATE_ARGS  (_func);
-}
-
-
-// шаблон для создания делегата метода класса
-// параметры : указатель на объект класса и указатель на метод класса
-// пример : newDelegate(&object_name, &class_name::method_name);
-template MYGUI_T_TEMPLATE_PARAMS
-inline  delegates::MYGUI_I_DELEGATE MYGUI_TEMPLATE_ARGS  * newDelegate( T * _object, void (T::*_method)( MYGUI_PARAMS ) )
-{
-	return new delegates::MYGUI_C_METHOD_DELEGATE  MYGUI_T_TEMPLATE_ARGS  (delegates::GetDelegateUnlink(_object), _object, _method);
-}
-
-namespace delegates
-{
-	// шаблон класса делегата
-	MYGUI_TEMPLATE   MYGUI_TEMPLATE_PARAMS
-	class MYGUI_C_DELEGATE
-	{
-	public:
-		typedef  MYGUI_I_DELEGATE MYGUI_TEMPLATE_ARGS  IDelegate;
-
-		MYGUI_C_DELEGATE () : mDelegate(nullptr) { }
-		MYGUI_C_DELEGATE (const MYGUI_C_DELEGATE  MYGUI_TEMPLATE_ARGS& _event)
-		{
-			// забираем себе владение
-			mDelegate = _event.mDelegate;
-			const_cast< MYGUI_C_DELEGATE  MYGUI_TEMPLATE_ARGS& >(_event).mDelegate = nullptr;
-		}
-		~MYGUI_C_DELEGATE () { clear(); }
-
-		bool empty() const { return mDelegate == nullptr; }
-
-		void clear()
-		{
-			if (mDelegate)
-			{
-				delete mDelegate;
-				mDelegate = nullptr;
-			}
-		}
-
-		MYGUI_C_DELEGATE  MYGUI_TEMPLATE_ARGS & operator=(IDelegate* _delegate)
-		{
-			delete mDelegate;
-			mDelegate = _delegate;
-			return *this;
-		}
-
-		MYGUI_C_DELEGATE  MYGUI_TEMPLATE_ARGS & operator=(const MYGUI_C_DELEGATE  MYGUI_TEMPLATE_ARGS& _event)
-		{
-			// забираем себе владение
-			delete mDelegate;
-			mDelegate = _event.mDelegate;
-			const_cast< MYGUI_C_DELEGATE  MYGUI_TEMPLATE_ARGS& >(_event).mDelegate = nullptr;
-
-			return *this;
-		}
-
-		void operator()( MYGUI_PARAMS )
-		{
-			if (mDelegate == nullptr) return;
-			mDelegate->invoke( MYGUI_ARGS );
-		}
-
-	private:
-		IDelegate * mDelegate;
-	};
-
-
-	// шаблон класса мульти делегата
-	MYGUI_TEMPLATE   MYGUI_TEMPLATE_PARAMS
-	class MYGUI_C_MULTI_DELEGATE
-	{
-	public:
-		typedef  MYGUI_I_DELEGATE MYGUI_TEMPLATE_ARGS  IDelegate;
-		typedef MYGUI_TYPENAME std::list<IDelegate* /*, Allocator<IDelegate*>*/ > ListDelegate;
-		typedef MYGUI_TYPENAME ListDelegate::iterator ListDelegateIterator;
-		typedef MYGUI_TYPENAME ListDelegate::const_iterator ConstListDelegateIterator;
-
-		MYGUI_C_MULTI_DELEGATE () { }
-		~MYGUI_C_MULTI_DELEGATE () { clear(); }
-
-		bool empty() const
-		{
-		  for (ConstListDelegateIterator iter = mListDelegates.begin(); iter!=mListDelegates.end(); ++iter)
-			{
-				if (*iter) return false;
-			}
-			return true;
-		}
-
-		void clear()
-		{
-			for (ListDelegateIterator iter=mListDelegates.begin(); iter!=mListDelegates.end(); ++iter)
-			{
-				if (*iter)
-				{
-					delete (*iter);
-					(*iter) = nullptr;
-				}
-			}
-		}
-
-		void clear(IDelegateUnlink * _unlink)
-		{
-			for (ListDelegateIterator iter=mListDelegates.begin(); iter!=mListDelegates.end(); ++iter)
-			{
-				if ((*iter) && (*iter)->compare(_unlink))
-				{
-					delete (*iter);
-					(*iter) = nullptr;
-				}
-			}
-		}
-
-		MYGUI_C_MULTI_DELEGATE  MYGUI_TEMPLATE_ARGS & operator+=(IDelegate* _delegate)
-		{
-			for (ListDelegateIterator iter=mListDelegates.begin(); iter!=mListDelegates.end(); ++iter)
-			{
-				if ((*iter) && (*iter)->compare(_delegate))
-				{
-					MYGUI_ASSERT(false, "dublicate delegate");
-				}
-			}
-			mListDelegates.push_back(_delegate);
-			return *this;
-		}
-
-		MYGUI_C_MULTI_DELEGATE  MYGUI_TEMPLATE_ARGS & operator-=(IDelegate* _delegate)
-		{
-			for (ListDelegateIterator iter=mListDelegates.begin(); iter!=mListDelegates.end(); ++iter)
-			{
-				if ((*iter) && (*iter)->compare(_delegate))
-				{
-					// проверяем на идентичность делегатов
-					if ((*iter) != _delegate) delete (*iter);
-					(*iter) = nullptr;
-					break;
-				}
-			}
-			delete _delegate;
-			return *this;
-		}
-
-		void operator()( MYGUI_PARAMS )
-		{
-			ListDelegateIterator iter = mListDelegates.begin();
-			while (iter != mListDelegates.end())
-			{
-				if (nullptr == (*iter))
-				{
-					iter = mListDelegates.erase(iter);
-				}
-				else
-				{
-					(*iter)->invoke( MYGUI_ARGS );
-					++iter;
-				}
-			}
-		}
-
-	private:
-		// constructor and operator =, without implementation, just for private
-		MYGUI_C_MULTI_DELEGATE (const MYGUI_C_MULTI_DELEGATE  MYGUI_TEMPLATE_ARGS & _event);
-		MYGUI_C_MULTI_DELEGATE  MYGUI_TEMPLATE_ARGS & operator=(const MYGUI_C_MULTI_DELEGATE  MYGUI_TEMPLATE_ARGS & _event);
-
-
-	private:
-		ListDelegate mListDelegates;
-
-	};
-
-
-	#undef MYGUI_COMBINE
-	#undef MYGUI_COMBINE1
-
-	#undef MYGUI_I_DELEGATE
-
-	#undef MYGUI_C_STATIC_DELEGATE
-	#undef MYGUI_C_METHOD_DELEGATE
-
-	#undef MYGUI_C_DELEGATE
-	#undef MYGUI_C_MULTI_DELEGATE
-
-	#undef MYGUI_SUFFIX
-	#undef MYGUI_TEMPLATE
-	#undef MYGUI_TEMPLATE_PARAMS
-	#undef MYGUI_TEMPLATE_ARGS
-	#undef MYGUI_T_TEMPLATE_PARAMS
-	#undef MYGUI_T_TEMPLATE_ARGS
-	#undef MYGUI_PARAMS
-	#undef MYGUI_ARGS
-	#undef MYGUI_TYPENAME
-
-} // namespace delegates
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Diagnostic.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Diagnostic.h
deleted file mode 100644
index 5eee622cb6..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Diagnostic.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@author		baho_is
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_DIAGNOSTIC_H__
-#define __MYGUI_DIAGNOSTIC_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Exception.h"
-#include "MyGUI_LogManager.h"
-#include <sstream>
-
-// for debugging
-#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
-	#include <crtdbg.h>
-#endif
-
-#define MYGUI_LOG_SECTION "Core"
-#define MYGUI_LOG_FILENAME "MyGUI.log"
-#define MYGUI_LOG(level, text) MYGUI_LOGGING(MYGUI_LOG_SECTION, level, text)
-
-#define MYGUI_BASE_EXCEPT(desc, src)	 throw MyGUI::Exception(desc, src, __FILE__, __LINE__);
-
-// MSVC specific: sets the breakpoint
-#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
-	#define MYGUI_DBG_BREAK _CrtDbgBreak();
-#else
-	#define MYGUI_DBG_BREAK
-#endif
-
-#define MYGUI_EXCEPT(dest) \
-{ \
-	MYGUI_LOG(Critical, dest); \
-	MYGUI_DBG_BREAK;\
-	std::ostringstream stream; \
-	stream << dest << "\n"; \
-	MYGUI_BASE_EXCEPT(stream.str().c_str(), "MyGUI"); \
-}
-
-#define MYGUI_ASSERT(exp, dest) \
-{ \
-	if ( ! (exp) ) \
-	{ \
-		MYGUI_LOG(Critical, dest); \
-		MYGUI_DBG_BREAK;\
-		std::ostringstream stream; \
-		stream << dest << "\n"; \
-		MYGUI_BASE_EXCEPT(stream.str().c_str(), "MyGUI"); \
-	} \
-}
-
-#define MYGUI_ASSERT_RANGE(index, size, owner) MYGUI_ASSERT(index < size, owner << " : index number " << index << " out of range [" << size << "]");
-#define MYGUI_ASSERT_RANGE_AND_NONE(index, size, owner) MYGUI_ASSERT(index < size || index == ITEM_NONE, owner << " : index number " << index << " out of range [" << size << "]");
-#define MYGUI_ASSERT_RANGE_INSERT(index, size, owner) MYGUI_ASSERT((index <= size) || (index == MyGUI::ITEM_NONE), owner << " : insert index number " << index << " out of range [" << size << "] or not ITEM_NONE");
-
-#if MYGUI_DEBUG_MODE == 1
-	#define MYGUI_REGISTER_VALUE(map, value) \
-	{ \
-		MYGUI_LOG(Info, "Register value : '" << #value << "' = " << (int)value); \
-		map[#value] = value; \
-	}
-	#define MYGUI_DEBUG_ASSERT(exp, dest) MYGUI_ASSERT(exp, dest)
-#else
-	#define MYGUI_REGISTER_VALUE(map, value) map[#value] = value;
-	#define MYGUI_DEBUG_ASSERT(exp, dest) ((void)0)
-#endif
-
-
-// for more info see: http://mdf-i.blogspot.com/2008/09/deprecated-gcc-vs-vs-vs-vs.html
-#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
-	#if MYGUI_COMP_VER == 1310 	// VC++ 7.1
-		#define MYGUI_OBSOLETE_START(text)
-	    #define MYGUI_OBSOLETE_END
-	#else
-		#define MYGUI_OBSOLETE_START(text) __declspec(deprecated(text))
-	    #define MYGUI_OBSOLETE_END
-	#endif
-
-#elif MYGUI_COMPILER == MYGUI_COMPILER_GNUC
-	#if MYGUI_PLATFORM == MYGUI_PLATFORM_LINUX && MYGUI_COMP_VER == 412
-		#define MYGUI_OBSOLETE_START(text)
-        #define MYGUI_OBSOLETE_END
-	#else
-        #define MYGUI_OBSOLETE_START(text)
-		#define MYGUI_OBSOLETE_END __attribute__((deprecated))
-	#endif
-
-#else
-	#define MYGUI_OBSOLETE_START(text)
-	#define MYGUI_OBSOLETE_END
-
-#endif
-
-#define MYGUI_OBSOLETE(text) /*! \deprecated text */ MYGUI_OBSOLETE_START(text)MYGUI_OBSOLETE_END
-
-#endif // __MYGUI_DIAGNOSTIC_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DynLib.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DynLib.h
deleted file mode 100644
index 1eb23e884b..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DynLib.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*!
-	@file
-	@author		Denis Koronchik
-	@author		Georgiy Evmenov
-	@date		09/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __MYGUI_DYNLIB_H__
-#define __MYGUI_DYNLIB_H__
-
-#include "MyGUI_Prerequest.h"
-#include <string>
-
-
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-#    define MYGUI_DYNLIB_HANDLE hInstance
-#    define MYGUI_DYNLIB_LOAD( a ) LoadLibrary( a )
-#    define MYGUI_DYNLIB_GETSYM( a, b ) GetProcAddress( a, b )
-#    define MYGUI_DYNLIB_UNLOAD( a ) !FreeLibrary( a )
-
-struct HINSTANCE__;
-typedef struct HINSTANCE__* hInstance;
-
-#elif MYGUI_PLATFORM == MYGUI_PLATFORM_LINUX
-#    define MYGUI_DYNLIB_HANDLE void*
-#    define MYGUI_DYNLIB_LOAD( a ) dlopen( a, RTLD_LAZY | RTLD_GLOBAL)
-#    define MYGUI_DYNLIB_GETSYM( a, b ) dlsym( a, b )
-#    define MYGUI_DYNLIB_UNLOAD( a ) dlclose( a )
-
-#elif MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
-#    include <CoreFoundation/CFBundle.h>
-#    define MYGUI_DYNLIB_HANDLE CFBundleRef
-#    define MYGUI_DYNLIB_LOAD( a ) mac_loadExeBundle( a )
-#    define MYGUI_DYNLIB_GETSYM( a, b ) mac_getBundleSym( a, b )
-#    define MYGUI_DYNLIB_UNLOAD( a ) mac_unloadExeBundle( a )
-#endif
-
-namespace MyGUI
-{
-
-	/*! @brief Resource holding data about a dynamic library.
-
-		@remarks
-		This class holds the data required to get symbols from
-		libraries loaded at run-time (i.e. from DLL's for so's)
-	*/
-	class MYGUI_EXPORT DynLib
-	{
-		friend class DynLibManager;
-
-	protected:
-		DynLib(const std::string &name);
-
-		~DynLib();
-
-	public:
-
-		/*! Load the library
-		*/
-		bool load();
-
-		/*! Unload the library
-		*/
-		void unload();
-
-		//! Get the name of the library
-		std::string getName(void) const { return mName; }
-
-		/**
-			Returns the address of the given symbol from the loaded library.
-			@param
-				strName The name of the symbol to search for
-			@returns
-				If the function succeeds, the returned value is a handle to the symbol.
-				If the function fails, the returned value is <b>nullptr</b>.
-		*/
-		void* getSymbol( const std::string& strName ) const throw();
-
-	protected:
-		//! Gets the last loading error
-		std::string dynlibError(void);
-
-
-	protected:
-		//!	Name of library
-		std::string mName;
-
-		//! Handle to the loaded library.
-		MYGUI_DYNLIB_HANDLE mInstance;
-	};
-
-}
-
-#endif // __MYGUI_DYNLIB_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DynLibManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DynLibManager.h
deleted file mode 100644
index 4b6b99f62a..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_DynLibManager.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*!
-	@file
-	@author		Denis Koronchik
-	@date		08/2007
-	@module		libEngine
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_DYN_LIB_MANAGER_H__
-#define __MYGUI_DYN_LIB_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_DynLib.h"
-#include <map>
-
-namespace MyGUI
-{
-
-	/*!	\brief Manager of dynamic libraries
-	*/
-	class MYGUI_EXPORT DynLibManager
-	{
-		MYGUI_INSTANCE_HEADER( DynLibManager )
-
-	public:
-		void initialise();
-		void shutdown();
-
-		//!	Load library
-		DynLib* load(const std::string &fileName);
-		//!	Unload library
-		void unload(DynLib *library);
-
-	private:
-		//! Dynamic libraries map
-		typedef std::map <std::string, DynLib*> StringDynLibMap;
-		//!	Loaded libraries
-		StringDynLibMap mLibsMap;
-	};
-
-}
-
-#endif // __MYGUI_DYN_LIB_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Edit.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Edit.h
deleted file mode 100644
index 01277cdcae..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Edit.h
+++ /dev/null
@@ -1,443 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_EDIT_H__
-#define __MYGUI_EDIT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_StaticText.h"
-#include "MyGUI_TextChangeHistory.h"
-#include "MyGUI_TextIterator.h"
-#include "MyGUI_EventPair.h"
-#include "MyGUI_ScrollViewBase.h"
-
-namespace MyGUI
-{
-
-	typedef delegates::CDelegate1<Edit*> EventHandle_EditPtr;
-
-	class MYGUI_EXPORT Edit :
-		public StaticText,
-		public ScrollViewBase
-	{
-		MYGUI_RTTI_DERIVED( Edit )
-
-	public:
-		Edit();
-
-		/** Colour interval */
-		void setTextIntervalColour(size_t _start, size_t _count, const Colour& _colour);
-
-		/** Get index of first selected character or ITEM_NONE if nothing selected */
-		size_t getTextSelectionStart();
-
-		/** Get index of last selected character or ITEM_NONE if nothing selected */
-		size_t getTextSelectionEnd();
-
-		/** Get length of selected text */
-		size_t getTextSelectionLength();
-
-		// возвращает текст с тегами
-		/** Get _count characters with tags from _start position */
-		UString getTextInterval(size_t _start, size_t _count);
-
-		/** Set selected text interval
-			@param _start of interval
-			@param _end of interval
-		*/
-		void setTextSelection(size_t _start, size_t _end);
-
-		/** Delete selected text */
-		void deleteTextSelection();
-
-		/** Get selected text */
-		UString getTextSelection();
-
-		/** Is any text selected */
-		bool isTextSelection();
-
-		/** Colour selected text */
-		void setTextSelectionColour(const Colour& _value);
-
-		/** Set text cursor position */
-		void setTextCursor(size_t _index);
-		/** Get text cursor position */
-		size_t getTextCursor() { return mCursorPosition; }
-
-
-		/** Set edit text applying tags */
-		virtual void setCaption(const UString& _value);
-		/** Get edit text with tags */
-		virtual const UString& getCaption();
-
-		/** Set edit text without tags */
-		void setOnlyText(const UString& _value);
-		/** Get edit text without tags */
-		UString getOnlyText();
-
-		/** Get text length excluding tags
-			For example "#00FF00Hello" length is 5
-		*/
-		size_t getTextLength() const { return mTextLength; }
-
-		//! Sets if surplus characters should push characters off the left side rather than ignored
-		void setOverflowToTheLeft(bool _value) { mOverflowToTheLeft = _value; }
-		//! Returns true if surplus characters will be pushed off the left rather than ignored
-		bool getOverflowToTheLeft() { return mOverflowToTheLeft; }
-
-		//! Sets the max amount of text allowed in the edit field.
-		void setMaxTextLength(size_t _value) { mMaxTextLength = _value; }
-		//! Gets the max amount of text allowed in the edit field.
-		size_t getMaxTextLength() { return mMaxTextLength; }
-
-		/** Inser text at _index position (text end by default) */
-		void insertText(const UString& _text, size_t _index = ITEM_NONE);
-		/** Add text */
-		void addText(const UString& _text);
-		/** Erase _count characters from _start position */
-		void eraseText(size_t _start, size_t _count = 1);
-
-		/** Enable or disable edit read only mode\n
-			Read only mode: you can't edit text, but can select it.\n
-			Disabled (false) by default.
-		*/
-		void setEditReadOnly(bool _value);
-		/** Get edit read only mode flag */
-		bool getEditReadOnly() { return mModeReadOnly; }
-
-		/** Enable or disable edit password mode\n
-			Password mode: you see password chars (*** by default) instead text.\n
-			Disabled (false) by default.
-		*/
-		void setEditPassword(bool _value);
-		/** Get edit password mode flag */
-		bool getEditPassword() { return mModePassword; }
-
-		/** Enable or disable edit multiline mode\n
-			Multile mode: new line character moves text to new line.\n
-			Otherwise new lines replaced with space and all text is in single line.\n
-			Disabled (false) by default.
-		*/
-		void setEditMultiLine(bool _value);
-		/** Get edit multiline mode flag */
-		bool getEditMultiLine() { return mModeMultiline; }
-
-		/** Enable or disable edit static mode\n
-			Static mode is same as read only, but you also can't select text.\n
-			Disabled (false) by default.
-		*/
-		void setEditStatic(bool _value);
-		/** Get edit static mode flag */
-		bool getEditStatic() { return mModeStatic; }
-
-		/** Set edit password character ('*' by default) */
-		void setPasswordChar(Char _value);
-		/** Set edit password character ('*' by default). First character of string used. */
-		void setPasswordChar(const UString& _char);
-		/** Get edit password character */
-		Char getPasswordChar() { return mCharPassword; }
-
-		/** Enable or disable edit word wrap mode\n
-			Word Wrap mode: move words to new line if they goes out of width.
-			Also in this mode you can't edit or select text.\n
-			Disabled (false) by default.
-		*/
-		void setEditWordWrap(bool _value);
-		/** Get edit word wrap mode flag */
-		bool getEditWordWrap() { return mModeWordWrap; }
-
-		/** Enable or disable tab printing mode\n
-			Tab printing mode: when editing text and pressing Tab key it displayed.
-			If this mode disabled Tab key ignored.\n
-			Disabled (false) by default.
-		*/
-		void setTabPrinting(bool _value) { mTabPrinting = _value; }
-		/** Get edit tab printing wrap mode flag */
-		bool getTabPrinting() { return mTabPrinting; }
-
-		/** Get invert selected text color property */
-		bool getInvertSelected();
-		/** Enable or disable inverting color of selected text\n
-			Enabled (true) by default
-		*/
-		void setInvertSelected(bool _value);
-
-		//! @copydoc Widget::setPosition(const IntPoint& _value)
-		virtual void setPosition(const IntPoint& _value);
-		//! @copydoc Widget::setSize(const IntSize& _value)
-		virtual void setSize(const IntSize& _value);
-		//! @copydoc Widget::setCoord(const IntCoord& _value)
-		virtual void setCoord(const IntCoord& _value);
-
-		/** @copydoc Widget::setPosition(int _left, int _top) */
-		void setPosition(int _left, int _top) { setPosition(IntPoint(_left, _top)); }
-		/** @copydoc Widget::setSize(int _width, int _height) */
-		void setSize(int _width, int _height) { setSize(IntSize(_width, _height)); }
-		/** @copydoc Widget::setCoord(int _left, int _top, int _width, int _height) */
-		void setCoord(int _left, int _top, int _width, int _height) { setCoord(IntCoord(_left, _top, _width, _height)); }
-
-		/** Show VScroll when text size larger than Edit */
-		void setVisibleVScroll(bool _value);
-		/** Get Show VScroll flag */
-		bool isVisibleVScroll() { return mVisibleVScroll; }
-		/** Get range of vertical scroll (or 0 if no scroll).
-			Range measured in pixels (full text heiht minus Edit height).
-			For example if Edit is 200 pixels height and 40 lines of text
-			30 pixels height each (i.e. 600 pixels total), then return
-			value is 400 ( = 600 - 200 ).
-		*/
-		size_t getVScrollRange();
-		/** Get current position of vertical scroll (or 0 if no scroll) */
-		size_t getVScrollPosition();
-		/** Set current position of vertical scroll */
-		void setVScrollPosition(size_t _index);
-
-		/** Show HScroll when text size larger than Edit */
-		void setVisibleHScroll(bool _value);
-		/** Get Show HScroll flag */
-		bool isVisibleHScroll() { return mVisibleHScroll; }
-		/** Get range of horizontal scroll (or 0 if no scroll).
-			Range measured in pixels (full text width minus Edit width).
-			For example if Edit is 200 pixels width and the longest line
-			is 600 pixels width, then return value is 400 ( = 600 - 200 ).
-		*/
-		size_t getHScrollRange();
-		/** Get current position of horizontal scroll (or 0 if no scroll) */
-		size_t getHScrollPosition();
-		/** Set current position of horizontal scroll */
-		void setHScrollPosition(size_t _index);
-
-
-		//! @copydoc StaticText::setFontName
-		virtual void setFontName(const std::string& _value);
-		//! @copydoc StaticText::setFontHeight
-		virtual void setFontHeight(int _value);
-
-		//! @copydoc StaticText::setTextAlign
-		virtual void setTextAlign(Align _value);
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*event:*/
-		/** Event : Enter pressed (Ctrl+enter in multiline mode).\n
-			signature : void method(MyGUI::Edit* _sender)
-			@param _sender widget that called this event
-		*/
-		EventPair<EventHandle_WidgetVoid, EventHandle_EditPtr> eventEditSelectAccept;
-
-		/** Event : Text changed.\n
-			signature : void method(MyGUI::Edit* _sender)
-			@param _sender widget that called this event
-		*/
-		EventPair<EventHandle_WidgetVoid, EventHandle_EditPtr> eventEditTextChange;
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void Edit::setVisibleVScroll(bool _visible)")
-		void showVScroll(bool _visible) { setVisibleVScroll(_visible); }
-		MYGUI_OBSOLETE("use : bool Edit::isVisibleVScroll()")
-		bool isShowVScroll() { return isVisibleVScroll(); }
-		MYGUI_OBSOLETE("use : void Edit::setVisibleHScroll(bool _visible)")
-		void showHScroll(bool _visible) { setVisibleHScroll(_visible); }
-		MYGUI_OBSOLETE("use : bool Edit::isVisibleHScroll()")
-		bool isShowHScroll() { return isVisibleHScroll(); }
-
-		MYGUI_OBSOLETE("use : void Widget::setCoord(const IntCoord& _coord)")
-		void setPosition(const IntCoord& _coord) { setCoord(_coord); }
-		MYGUI_OBSOLETE("use : void Widget::setCoord(int _left, int _top, int _width, int _height)")
-		void setPosition(int _left, int _top, int _width, int _height) { setCoord(_left, _top, _width, _height); }
-
-		// to avoid hiding base virtual function
-		virtual void setTextColour(const Colour& _colour) { Base::setTextColour(_colour); }
-
-		MYGUI_OBSOLETE("use : void Edit::setTextIntervalColour(size_t _start, size_t _count, const Colour& _colour)")
-		void setTextColour(size_t _start, size_t _count, const Colour& _colour) { setTextIntervalColour(_start, _count, _colour); }
-
-		MYGUI_OBSOLETE("use : size_t Edit::getTextSelectionStart() , size_t getTextSelectionEnd()")
-		void getTextSelect(size_t& _start, size_t& _end);
-
-		MYGUI_OBSOLETE("use : UString Edit::getTextInterval(size_t _start, size_t _count)")
-		UString getText(size_t _start, size_t _count) { return getTextInterval(_start, _count); }
-
-		MYGUI_OBSOLETE("use : void Edit::setTextSelection(size_t _start, size_t _end)")
-		void setTextSelect(size_t _start, size_t _end) { setTextSelection(_start, _end); }
-
-		MYGUI_OBSOLETE("use : void Edit::deleteTextSelection()")
-		void deleteTextSelect() { deleteTextSelection(); }
-
-		MYGUI_OBSOLETE("use : UString Edit::getTextSelection()")
-		UString getSelectedText() { return getTextSelection(); }
-
-		MYGUI_OBSOLETE("use : bool Edit::isTextSelection()")
-		bool isTextSelect() { return isTextSelection(); }
-
-		MYGUI_OBSOLETE("use : void Edit::setTextSelectionColour(const Colour& _colour)")
-		void setTextSelectColour(const Colour& _colour) { setTextSelectionColour(_colour); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-
-	protected:
-		virtual ~Edit();
-
-		virtual void onMouseDrag(int _left, int _top);
-		virtual void onKeyLostFocus(Widget* _new);
-		virtual void onKeySetFocus(Widget* _old);
-		virtual void onKeyButtonPressed(KeyCode _key, Char _char);
-
-		// потом убрать все нотифи в сраку
-		void notifyMouseSetFocus(Widget* _sender, Widget* _old);
-		void notifyMouseLostFocus(Widget* _sender, Widget* _new);
-		void notifyMousePressed(Widget* _sender, int _left, int _top, MouseButton _id);
-		void notifyMouseReleased(Widget* _sender, int _left, int _top, MouseButton _id);
-		void notifyMouseDrag(Widget* _sender, int _left, int _top);
-		void notifyMouseButtonDoubleClick(Widget* _sender);
-
-		void notifyScrollChangePosition(VScroll* _sender, size_t _position);
-		void notifyMouseWheel(Widget* _sender, int _rel);
-
-		// обновление представления
-		void updateView();
-		void updateViewWithCursor();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		void eraseView();
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-	private:
-		// устанавливает текст
-		void setText(const UString& _text, bool _history);
-		// удаляет все что выделенно
-		bool deleteTextSelect(bool _history);
-		// вставляет текст в указанную позицию
-		void insertText(const UString& _text, size_t _index, bool _history);
-		// удаляет текст
-		void eraseText(size_t _start, size_t _count, bool _history);
-		// выделяет цветом выделение
-		void setTextSelectColour(const Colour& _colour, bool _history);
-		// выделяет цветом диапазон
-		void _setTextColour(size_t _start, size_t _count, const Colour& _colour, bool _history);
-
-		void frameEntered(float _frame);
-
-		void updateEditState();
-
-		// обновляет курсор по координате
-		void updateSelectText();
-
-		void resetSelect();
-
-		// запись в историю данных о позиции
-		void commandPosition(size_t _undo, size_t _redo, size_t _length, VectorChangeInfo * _info = nullptr);
-
-		// команнды отмена и повтор
-		bool commandRedo();
-		bool commandUndo();
-		// объединяет последние две комманды
-		void commandMerge();
-		// очистка
-		void commandResetRedo() { mVectorRedoChangeInfo.clear(); }
-		void commandResetHistory() { mVectorRedoChangeInfo.clear();mVectorUndoChangeInfo.clear(); }
-		void saveInHistory(VectorChangeInfo * _info = nullptr);
-
-		// работа с буфером обмена
-		void commandCut();
-		void commandCopy();
-		void commandPast();
-
-		const UString& getRealString();
-
-		void setRealString(const UString& _caption);
-
-		void updateCursorPosition();
-
-		// размер данных
-		virtual IntSize getContentSize();
-		// смещение данных
-		virtual IntPoint getContentPosition();
-		virtual void setContentPosition(const IntPoint& _point);
-		// размер окна, через которые видно данные
-		virtual IntSize getViewSize() const;
-		// размер на который прокручиваются данные при щелчке по скролу
-		virtual size_t getVScrollPage();
-		virtual size_t getHScrollPage();
-
-		virtual Align getContentAlign();
-
-	protected:
-		// нажата ли кнопка
-		bool mIsPressed;
-		// в фокусе ли кнопка
-		bool mIsFocus;
-
-		bool mCursorActive;
-		float mCursorTimer;
-		float mActionMouseTimer;
-
-		// позиция курсора
-		size_t mCursorPosition;
-		// максимальное колличество
-		size_t mTextLength;
-
-		// выделение
-		size_t mStartSelect;
-		size_t mEndSelect;
-
-		// списоки изменений для отмены и повтора
-		DequeUndoRedoInfo mVectorUndoChangeInfo;
-		DequeUndoRedoInfo mVectorRedoChangeInfo;
-
-		bool mMouseLeftPressed;
-
-		bool mModeReadOnly;
-		bool mModePassword;
-		bool mModeMultiline;
-		bool mModeStatic;
-		bool mModeWordWrap;
-
-		bool mTabPrinting;
-
-		// настоящий текст, закрытый за звездочками
-		UString mPasswordText;
-
-		// для поддержки режима статик, где курсор не нужен
-		std::string mOriginalPointer;
-
-		Char mCharPassword;
-
-		bool mOverflowToTheLeft;
-		size_t mMaxTextLength;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_EDIT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_EditText.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_EditText.h
deleted file mode 100644
index ad897061f2..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_EditText.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_EDIT_TEXT_H__
-#define __MYGUI_EDIT_TEXT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_ISubWidgetText.h"
-#include "MyGUI_IFont.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_RenderFormat.h"
-#include "MyGUI_TextView.h"
-
-namespace MyGUI
-{
-
-	class RenderItem;
-
-	class MYGUI_EXPORT EditText : public ISubWidgetText
-	{
-		MYGUI_RTTI_DERIVED( EditText )
-
-	public:
-		EditText();
-		virtual ~EditText();
-
-		virtual void setVisible(bool _value);
-
-		// обновляет все данные связанные с тектом
-		virtual void updateRawData();
-
-		// метод для отрисовки себя
-		virtual void doRender();
-
-		void setCaption(const UString& _value);
-		const UString& getCaption();
-
-		void setTextColour(const Colour& _value);
-		const Colour& getTextColour();
-
-		void setAlpha(float _value);
-		float getAlpha();
-
-		virtual void setFontName(const std::string& _value);
-		virtual const std::string& getFontName();
-
-		virtual void setFontHeight(int _value);
-		virtual int getFontHeight();
-
-		virtual void createDrawItem(ITexture* _texture, ILayerNode * _node);
-		virtual void destroyDrawItem();
-
-		virtual void setTextAlign(Align _value);
-		virtual Align getTextAlign();
-
-		virtual size_t getTextSelectionStart();
-		virtual size_t getTextSelectionEnd();
-		virtual void setTextSelection(size_t _start, size_t _end);
-
-		virtual bool getSelectBackground();
-		virtual void setSelectBackground(bool _normal);
-
-		virtual bool isVisibleCursor();
-		virtual void setVisibleCursor(bool _value);
-
-		/** Get invert selected text color property */
-		virtual bool getInvertSelected() { return mInvertSelect; }
-		/** Enable or disable inverting color of selected text\n
-			Enabled (true) by default
-		*/
-		virtual void setInvertSelected(bool _value);
-
-		virtual size_t getCursorPosition();
-		virtual void setCursorPosition(size_t _index);
-
-		virtual IntSize getTextSize();
-
-		// устанавливает смещение текста в пикселях
-		virtual void setViewOffset(const IntPoint& _point);
-		virtual IntPoint getViewOffset();
-
-		// возвращает положение курсора по произвольному положению
-		virtual size_t getCursorPosition(const IntPoint& _point);
-
-		// возвращает положение курсора в обсолютных координатах
-		virtual IntCoord getCursorCoord(size_t _position);
-
-		void setShiftText(bool _shift);
-
-		void setWordWrap(bool _value);
-
-		virtual void setStateData(IStateInfo * _data);
-
-		void _updateView();
-		void _correctView();
-
-	/*internal:*/
-		void _setAlign(const IntSize& _oldsize, bool _update);
-		void _setAlign(const IntCoord& _oldcoord, bool _update);
-
-	protected:
-		bool mEmptyView;
-		uint32 mCurrentColour;
-		uint32 mInverseColour;
-		uint32 mCurrentAlpha;
-		IntCoord mCurrentCoord;
-
-		UString mCaption;
-		bool mTextOutDate;
-		Align mTextAlign;
-
-		Colour mColour;
-		float mAlpha;
-		VertexColourType mVertexFormat;
-
-		IFont* mFont;
-		ITexture* mTexture;
-		int mFontHeight;
-
-		bool mBackgroundNormal;
-		size_t mStartSelect;
-		size_t mEndSelect;
-		size_t mCursorPosition;
-		bool mVisibleCursor;
-		bool mInvertSelect;
-
-		IntPoint mViewOffset; // смещение текста
-
-		ILayerNode* mNode;
-		RenderItem* mRenderItem;
-		size_t mCountVertex;
-		bool mIsAddCursorWidth;
-
-		bool mShiftText;
-		bool mWordWrap;
-		int mOldWidth;
-
-		TextView mTextView;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_EDIT_TEXT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Enumerator.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Enumerator.h
deleted file mode 100644
index c7c8811dd9..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Enumerator.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		08/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_ENUMERATOR_H__
-#define __MYGUI_ENUMERATOR_H__
-
-#include <assert.h>
-
-namespace MyGUI
-{
-
-	/** Class for comfortable using of vectors with small while loop
-	instead iterators. Performance is same as with iterators.
-	Enumerator usage
-	@example Enumerator
-	@code
-		typedef std::vector<std::string> VectorString;
-		typedef Enumerator<VectorString> EnumeratorVectorString;
-
-		VectorString vec;
-		vec.push_back("value");
-		//EnumeratorVectorString enum_vec(vec.begin(), vec.end());
-		EnumeratorVectorString enum_vec(vec);
-		while (enum_vec.next())
-		{
-			std::string value = enum_vec.current();
-		}
-
-		typedef std::pair<std::string, std::string> PairString;
-		typedef std::map<PairString> MapString;
-
-		MapString map;
-		map["key"] = "value";
-		//EnumeratorMapString enum_map(map.begin(), map.end());
-		EnumeratorMapString enum_map(map);
-		while (enum_map.next())
-		{
-			std::string key = enum_map.current().first;
-			std::string value = enum_map.current().second;
-		}
-	@endcode
-	*/
-
-	template<typename T>
-	class Enumerator
-	{
-	private:
-		Enumerator() { }
-
-	public:
-		explicit Enumerator(const T& _container) :
-			m_first(true),
-			m_current(_container.begin()),
-			m_end(_container.end())
-		{
-		}
-
-		Enumerator(typename T::const_iterator _first, typename T::const_iterator _end) :
-			m_first(true),
-			m_current(_first),
-			m_end(_end)
-		{
-		}
-
-		bool next()
-		{
-			if (m_current == m_end) return false;
-			else if (m_first)
-			{
-				m_first = false;
-				return true;
-			}
-			++ m_current;
-			if (m_current == m_end) return false;
-			return true;
-		}
-
-		typename T::const_reference operator->() const { assert(m_current != m_end); return (*m_current); }
-		typename T::const_reference current() { assert(m_current != m_end); return (*m_current); }
-
-	private:
-		bool m_first;
-		typename T::const_iterator m_current;
-		typename T::const_iterator m_end;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_ENUMERATOR_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_EventPair.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_EventPair.h
deleted file mode 100644
index 8039d83e1d..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_EventPair.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		10/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_EVENT_PAIR_H__
-#define __MYGUI_EVENT_PAIR_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	template <typename EventObsolete, typename Event>
-	class EventPair
-	{
-	public:
-
-		template <typename T>
-		MYGUI_OBSOLETE("use : signature : Event::IDelegate * _delegate")
-		void operator = (T * _delegate)
-		{
-			m_eventObsolete = _delegate;
-			m_event = nullptr;
-		}
-
-		void operator = (typename Event::IDelegate * _delegate)
-		{
-			m_eventObsolete = nullptr;
-			m_event = _delegate;
-		}
-
-		template <typename TP1>
-		void operator()( TP1 p1 )
-		{
-			m_eventObsolete(p1);
-			m_event(p1);
-		}
-
-		template <typename TP1, typename TP2>
-		void operator()( TP1 p1, TP2 p2 )
-		{
-			m_eventObsolete(p1, p2);
-			m_event(p1, p2);
-		}
-
-		template <typename TP1, typename TP2, typename TP3>
-		void operator()( TP1 p1, TP2 p2, TP3 p3 )
-		{
-			m_eventObsolete(p1, p2, p3);
-			m_event(p1, p2, p3);
-		}
-
-		template <typename TP1, typename TP2, typename TP3, typename TP4>
-		void operator()( TP1 p1, TP2 p2, TP3 p3, TP4 p4 )
-		{
-			m_eventObsolete(p1, p2, p3, p4);
-			m_event(p1, p2, p3, p4);
-		}
-
-		template <typename TP1, typename TP2, typename TP3, typename TP4, typename TP5>
-		void operator()( TP1 p1, TP2 p2, TP3 p3, TP4 p4, TP5 p5 )
-		{
-			m_eventObsolete(p1, p2, p3, p4, p5);
-			m_event(p1, p2, p3, p4, p5);
-		}
-
-		template <typename TP1, typename TP2, typename TP3, typename TP4, typename TP5, typename TP6>
-		void operator()( TP1 p1, TP2 p2, TP3 p3, TP4 p4, TP5 p5, TP6 p6 )
-		{
-			m_eventObsolete(p1, p2, p3, p4, p5, p6);
-			m_event(p1, p2, p3, p4, p5, p6);
-		}
-
-		template <typename TP1, typename TP2, typename TP3, typename TP4, typename TP5, typename TP6, typename TP7>
-		void operator()( TP1 p1, TP2 p2, TP3 p3, TP4 p4, TP5 p5, TP6 p6, TP7 p7 )
-		{
-			m_eventObsolete(p1, p2, p3, p4, p5, p6, p7);
-			m_event(p1, p2, p3, p4, p5, p6, p7);
-		}
-
-		template <typename TP1, typename TP2, typename TP3, typename TP4, typename TP5, typename TP6, typename TP7, typename TP8>
-		void operator()( TP1 p1, TP2 p2, TP3 p3, TP4 p4, TP5 p5, TP6 p6, TP7 p7, TP8 p8 )
-		{
-			m_eventObsolete(p1, p2, p3, p4, p5, p6, p7, p8);
-			m_event(p1, p2, p3, p4, p5, p6, p7, p8);
-		}
-
-		bool empty() const
-		{
-			return m_eventObsolete.empty() && m_event.empty();
-		}
-
-	public:
-		EventObsolete m_eventObsolete;
-		Event m_event;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_EVENT_PAIR_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Exception.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Exception.h
deleted file mode 100644
index 07f7201753..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Exception.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_EXCEPTION_H__
-#define __MYGUI_EXCEPTION_H__
-
-#include "MyGUI_Prerequest.h"
-#include <exception>
-#include <string>
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT Exception : public std::exception
-	{
-	protected:
-		std::string mDescription;
-		std::string mSource;
-		std::string mFile;
-		long mLine;
-		mutable std::string mFullDesc;
-
-	public:
-		Exception(const std::string& _description, const std::string& _source, const char* _file, long _line );
-
-		Exception(const Exception& _rhs);
-
-		// Needed for  compatibility with std::exception
-		~Exception() throw() { }
-
-		Exception& operator = (const Exception& _rhs);
-
-		virtual const std::string& getFullDescription() const;
-
-		virtual const std::string &getSource() const { return mSource; }
-
-		virtual const std::string &getFile() const { return mFile; }
-
-		virtual long getLine() const { return mLine; }
-
-		virtual const std::string& getDescription() const { return mDescription; }
-
-		// Override std::exception::what
-		const char* what() const throw() { return getFullDescription().c_str(); }
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_EXCEPTION_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_FactoryManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_FactoryManager.h
deleted file mode 100644
index 172eb4733d..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_FactoryManager.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_FACTORY_MANAGER_H__
-#define __MYGUI_FACTORY_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_IObject.h"
-#include "MyGUI_GenericFactory.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT FactoryManager
-	{
-		MYGUI_INSTANCE_HEADER( FactoryManager )
-
-	public:
-		typedef delegates::CDelegate1<IObject*&> Delegate;
-
-		void initialise();
-		void shutdown();
-
-		void registerFactory(const std::string& _category, const std::string& _type, Delegate::IDelegate* _delegate);
-		void unregisterFactory(const std::string& _category, const std::string& _type);
-		void unregisterFactory(const std::string& _category);
-
-		bool isFactoryExist(const std::string& _category, const std::string& _type);
-
-		template<typename Type>
-		void registerFactory(const std::string& _category)
-		{
-			registerFactory(_category, Type::getClassTypeName(), GenericFactory<Type>::getFactory());
-		}
-
-		template<typename Type>
-		void registerFactory(const std::string& _category, const std::string& _type)
-		{
-			registerFactory(_category, _type, GenericFactory<Type>::getFactory());
-		}
-
-		template<typename Type>
-		void unregisterFactory(const std::string& _category)
-		{
-			unregisterFactory(_category, Type::getClassTypeName());
-		}
-
-		IObject* createObject(const std::string& _category, const std::string& _type);
-		void destroyObject(IObject* _object);
-
-	private:
-		typedef std::map<std::string, Delegate> MapFactoryItem;
-		typedef std::map<std::string, MapFactoryItem> MapRegisterFactoryItem;
-		MapRegisterFactoryItem mRegisterFactoryItems;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_FACTORY_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_FontData.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_FontData.h
deleted file mode 100644
index 95b5b75583..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_FontData.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_FONT_DATA_H__
-#define __MYGUI_FONT_DATA_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	struct MYGUI_EXPORT FontCodeType
-	{
-		enum Enum
-		{
-			Selected = 6,
-			SelectedBack = 7,
-			Cursor = 8,
-			Tab = 9,
-			LF = 0x000A,
-			CR = 0x000D,
-			Space = 0x0020,
-			LatinStart = 0x0021,
-			NEL = 0x0085,
-			LatinEnd = 0x00A6,
-			MAX
-		};
-
-		FontCodeType(Enum _value = MAX) : value(_value) { }
-
-		friend bool operator == (FontCodeType const& a, FontCodeType const& b) { return a.value == b.value; }
-		friend bool operator != (FontCodeType const& a, FontCodeType const& b) { return a.value != b.value; }
-
-	private:
-		Enum value;
-	};
-
-	// ���������� �� ����� �������
-	struct GlyphInfo
-	{
-		FloatRect uvRect;
-		Char codePoint;
-		int width;
-
-		GlyphInfo() : codePoint(0), width(0) { }
-	};
-
-	typedef std::vector<GlyphInfo> VectorGlyphInfo;
-
-	// ���������� �� ���������
-	//FIXME move to std::pair
-	class PairCodePoint
-	{
-	public:
-		PairCodePoint() : first(0), last(0) { }
-		PairCodePoint(Char _first, Char _last) : first(_first), last(_last) { }
-
-		// ��������� ������ �� ������ � ��������
-		bool isExist(Char _code) const { return _code >= first && _code <= last; }
-
-	public:
-		Char first;
-		Char last;
-	};
-
-	// ��������� � ��������� ��������
-	class RangeInfo
-	{
-	public:
-		RangeInfo() : first(0), last(0) { }
-		RangeInfo(Char _first, Char _last) :
-			first(_first),
-			last(_last)
-		{
-			range.resize(last - first + 1);
-		}
-
-		// ��������� ������ �� ������ � ��������
-		bool isExist(Char _code) const { return _code >= first && _code <= last; }
-
-		// ���������� ��������� �� ����, ��� 0, ���� ��� �� ������ � ��������
-		GlyphInfo* getInfo(Char _code) { return isExist(_code) ? &range[_code - first] : nullptr; }
-		void setInfo(Char _code, GlyphInfo* _value) { if (isExist(_code)) range[_code - first] = *_value; }
-
-	public:
-		Char first;
-		Char last;
-		VectorGlyphInfo range;
-	};
-
-	// FIXME move to resource font
-	class PairCodeCoord
-	{
-	public:
-		PairCodeCoord() : code(0) { }
-		PairCodeCoord(Char _code, const IntCoord& _coord) :
-			code(_code),
-			coord(_coord)
-		{
-		}
-
-		bool operator < (const PairCodeCoord& _value) const { return code < _value.code; }
-
-		Char code;
-		IntCoord coord;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_FONT_DATA_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_FontManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_FontManager.h
deleted file mode 100644
index baaad1292c..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_FontManager.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_FONT_MANAGER_H__
-#define __MYGUI_FONT_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Enumerator.h"
-#include "MyGUI_IFont.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_ResourceManager.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT FontManager
-	{
-		MYGUI_INSTANCE_HEADER( FontManager )
-
-	public:
-		void initialise();
-		void shutdown();
-
-		/** Load additional MyGUI *_font.xml file */
-		bool load(const std::string& _file);
-		void _load(xml::ElementPtr _node, const std::string& _file, Version _version);
-
-		const std::string& getDefaultFont() const { return mDefaultName; }
-		void setDefaultFont(const std::string& _value);
-
-		/** Get font resource */
-		IFont* getByName(const std::string& _name) const;
-
-	private:
-		std::string mDefaultName;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_FONT_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_GenericFactory.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_GenericFactory.h
deleted file mode 100644
index 503c61a259..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_GenericFactory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*!
-    @file
-    @author     Albert Semenov
-    @date       06/2009
-    @module
-*/
-#ifndef __MYGUI_GENERIC_FACTORY_H__
-#define __MYGUI_GENERIC_FACTORY_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_Delegate.h"
-
-namespace MyGUI
-{
-
-	template <typename Type>
-	class GenericFactory
-	{
-	public:
-		typedef delegates::CDelegate1<IObject*&> Delegate;
-		static typename Delegate::IDelegate* getFactory()
-		{
-			return newDelegate(createFromFactory);
-		}
-
-	private:
-		static void createFromFactory(IObject*& _instance)
-		{
-			_instance = new Type();
-		}
-	};
-
-}
-
-#endif // __MYGUI_GENERIC_FACTORY_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Gui.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Gui.h
deleted file mode 100644
index 006d283016..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Gui.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_GUI_H__
-#define __MYGUI_GUI_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_IWidgetCreator.h"
-#include "MyGUI_IUnlinkWidget.h"
-#include "MyGUI_Widget.h"
-
-namespace MyGUI
-{
-
-	typedef delegates::CMultiDelegate1<float> FrameEventDelegate;
-
-	class MYGUI_EXPORT Gui : public IWidgetCreator, public IUnlinkWidget
-	{
-		friend class WidgetManager;
-		MYGUI_INSTANCE_HEADER( Gui )
-
-	public:
-		/** Initialise GUI and all GUI Managers
-			@param
-				_core name of core config file for MyGUI (contain main config files with skins, layers, fonts, etc.)
-			@param
-				_logFileName Log file name
-		*/
-		void initialise(const std::string& _core = "core.xml", const std::string& _logFileName = MYGUI_LOG_FILENAME);
-
-		/** Shutdown GUI and all GUI Managers*/
-		void shutdown();
-
-		// methods for creating widgets
-		/** Create widget
-			@param _type widget type
-			@param _skin widget skin
-			@param _coord int coordinates of widget (_left, _top, _width, _height)
-			@param _align widget align (possible values can be found in enum Align)
-			@param _layer layer where widget will be created (all layers usually defined in core.layer file).
-				If your widget will overlap with any other you shoud select _layer with "overlapped" property enabled.
-			@param _name if needed (you can use it for finding widget by name later)
-		*/
-		Widget* createWidgetT(const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name = "")
-		{
-			return baseCreateWidget(WidgetStyle::Overlapped, _type, _skin, _coord, _align, _layer, _name);
-		}
-		/** See Gui::createWidgetT */
-		Widget* createWidgetT(const std::string& _type, const std::string& _skin, int _left, int _top, int _width, int _height, Align _align, const std::string& _layer, const std::string& _name = "")
-		{
-			return createWidgetT(_type, _skin, IntCoord(_left, _top, _width, _height), _align, _layer, _name);
-		}
-		/** Create widget using coordinates relative to parent. see Gui::createWidgetT */
-		Widget* createWidgetRealT(const std::string& _type, const std::string& _skin, const FloatCoord& _coord, Align _align, const std::string& _layer, const std::string& _name = "")
-		{
-			return createWidgetT(_type, _skin, IntCoord((int)(_coord.left*mViewSize.width), (int)(_coord.top*mViewSize.height), (int)(_coord.width*mViewSize.width), (int)(_coord.height*mViewSize.height)), _align, _layer, _name);
-		}
-		/** Create widget using coordinates relative to parent. see Gui::createWidgetT */
-		Widget* createWidgetRealT(const std::string& _type, const std::string& _skin, float _left, float _top, float _width, float _height, Align _align, const std::string& _layer, const std::string& _name = "")
-		{
-			return createWidgetT(_type, _skin, IntCoord((int)(_left*mViewSize.width), (int)(_top*mViewSize.height), (int)(_width*mViewSize.width), (int)(_height*mViewSize.height)), _align, _layer, _name);
-		}
-
-		// templates for creating widgets by type
-		/** Same as Gui::createWidgetT but return T* instead of Widget* */
-		template <typename T>
-		T* createWidget(const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name = "")
-		{
-			return static_cast<T*>(createWidgetT(T::getClassTypeName(), _skin, _coord, _align, _layer, _name));
-		}
-		/** Same as Gui::createWidgetT but return T* instead of Widget* */
-		template <typename T>
-		T* createWidget(const std::string& _skin, int _left, int _top, int _width, int _height, Align _align, const std::string& _layer, const std::string& _name = "")
-		{
-			return static_cast<T*>(createWidgetT(T::getClassTypeName(), _skin, IntCoord(_left, _top, _width, _height), _align, _layer, _name));
-		}
-		/** Same as Gui::createWidgetRealT but return T* instead of Widget* */
-		template <typename T>
-		T* createWidgetReal(const std::string& _skin, const FloatCoord& _coord, Align _align, const std::string& _layer, const std::string& _name = "")
-		{
-			return static_cast<T*>(createWidgetRealT(T::getClassTypeName(), _skin, _coord, _align, _layer, _name));
-		}
-		/** Same as Gui::createWidgetRealT but return T* instead of Widget* */
-		template <typename T>
-		T* createWidgetReal(const std::string& _skin, float _left, float _top, float _width, float _height, Align _align, const std::string& _layer, const std::string& _name = "")
-		{
-			return static_cast<T*>(createWidgetRealT(T::getClassTypeName(), _skin, _left, _top, _width, _height, _align, _layer, _name));
-		}
-
-		/** Get view size of GUI area */
-		const IntSize& getViewSize() const { return mViewSize; }
-
-		int getViewWidth() { return mViewSize.width; }
-		int getViewHeight() { return mViewSize.height; }
-
-		// mirror of InputManager methods
-		/** Inject MouseMove event
-			@return true if event has been processed by GUI
-		*/
-		bool injectMouseMove(int _absx, int _absy, int _absz);
-		/** Inject MousePress event
-			@return true if event has been processed by GUI
-		*/
-		bool injectMousePress(int _absx, int _absy, MouseButton _id);
-		/** Inject MouseRelease event
-			@return true if event has been processed by GUI
-		*/
-		bool injectMouseRelease(int _absx, int _absy, MouseButton _id);
-
-		/** Inject KeyPress event
-			@return true if event has been processed by GUI
-		*/
-		bool injectKeyPress(KeyCode _key, Char _text = 0);
-		/** Inject KeyReleas event
-			@return true if event has been processed by GUI
-		*/
-		bool injectKeyRelease(KeyCode _key);
-
-		/** Destroy any created widget */
-		void destroyWidget(Widget* _widget);
-
-		/** Destroy vector of widgets */
-		void destroyWidgets(VectorWidgetPtr& _widgets);
-
-		/** Destroy Enumerator of widgets */
-		void destroyWidgets(EnumeratorWidgetPtr& _widgets);
-
-		/** Find widget by name
-			If widget is not found the exception will be thrown, or if the second parameter is false the nullptr pointer will be returned
-		*/
-		Widget* findWidgetT(const std::string& _name, bool _throw = true);
-
-		/** Find widget by name and prefix
-			If widget is not found the exception will be thrown, or if the second parameter is false the nullptr pointer will be returned
-		*/
-		Widget* findWidgetT(const std::string& _name, const std::string& _prefix, bool _throw = true)
-		{
-			return findWidgetT(_prefix + _name, _throw);
-		}
-
-		// mirror WidgetManager
-		/** Find widget by name and cast it to T type.
-			If widget not found or T and found widget have different types cause exception, or if the second parameter is false the nullptr pointer will be returned
-		*/
-		template <typename T>
-		T* findWidget(const std::string& _name, bool _throw = true)
-		{
-			Widget* widget = findWidgetT(_name, _throw);
-			if (nullptr == widget) return nullptr;
-			return widget->castType<T>(_throw);
-		}
-
-		/** Find widget by name and prefix and cast it to T type
-			If widget not found or T and found widget have different types cause exception, or if the second parameter is false the nullptr pointer will be returned
-		*/
-		template <typename T>
-		T* findWidget(const std::string& _name, const std::string& _prefix, bool _throw = true)
-		{
-			return findWidget<T>(_prefix + _name, _throw);
-		}
-
-
-		/** Show or hide mouse pointer */
-		void setVisiblePointer(bool _visible);
-		/** Is mouse pointer visible */
-		bool isVisiblePointer();
-
-
-		// mirror ResourceManager
-		/** Load config with any info (file can have different data such other config files that will be loaded, skins, layers, pointers, etc) */
-		bool load(const std::string& _file);
-
-		void resizeWindow(const IntSize& _size);
-
-		/** Destroy child widget or throw exception if this child widget not found */
-		void destroyChildWidget(Widget* _widget) { _destroyChildWidget(_widget); }
-
-		/** Destroy all child widgets */
-		void destroyAllChildWidget() { _destroyAllChildWidget(); }
-
-		/** Get name of Gui ResourceGroup*/
-		//static const std::string& getResourceGroup();
-
-		/** Get root widgets Enumerator */
-		EnumeratorWidgetPtr getEnumerator() { return EnumeratorWidgetPtr(mWidgetChild); }
-
-	/*internal:*/
-
-		/** Inject frame entered event (called be renderer, do not call it manually).
-			This function is called every frame by renderer.
-		*/
-		void _injectFrameEntered(float _time);
-
-	/*event:*/
-		/** Multidelegate for GUI per frame call.\n
-			signature : void method(float _time)\n
-			@param _time Time elapsed since last frame
-		*/
-		FrameEventDelegate eventFrameStart;
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void Gui::destroyWidgets(VectorWidgetPtr &_widgets)")
-		void destroyWidgetsVector(VectorWidgetPtr& _widgets) { destroyWidgets(_widgets); }
-
-		MYGUI_OBSOLETE("use : void Gui::setVisiblePointer(bool _value)")
-		void hidePointer() { setVisiblePointer(false); }
-		MYGUI_OBSOLETE("use : void Gui::setVisiblePointer(bool _value)")
-		void showPointer() { setVisiblePointer(true); }
-		MYGUI_OBSOLETE("use : bool Gui::isVisiblePointer()")
-		bool isShowPointer() { return isVisiblePointer(); }
-		MYGUI_OBSOLETE("called be renderer, do not call it manually")
-		void injectFrameEntered(float _time) { }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	private:
-		// создает виджет
-		virtual Widget* baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name);
-
-		// удяляет неудачника
-		void _destroyChildWidget(Widget* _widget);
-
-		// удаляет всех детей
-		void _destroyAllChildWidget();
-
-		virtual void _unlinkWidget(Widget* _widget);
-
-		// добавляет в список виджет
-		virtual void _linkChildWidget(Widget* _widget);
-
-		// удаляет из списка
-		virtual void _unlinkChildWidget(Widget* _widget);
-
-
-	private:
-		// вектор всех детей виджетов
-		VectorWidgetPtr mWidgetChild;
-
-		// размеры экрана
-		IntSize mViewSize;
-
-		// синглтоны гуя
-		InputManager * mInputManager;
-		SubWidgetManager * mSubWidgetManager;
-		LayerManager* mLayerManager;
-		SkinManager* mSkinManager;
-		WidgetManager* mWidgetManager;
-		FontManager* mFontManager;
-		ControllerManager* mControllerManager;
-		PointerManager* mPointerManager;
-		ClipboardManager* mClipboardManager;
-		LayoutManager* mLayoutManager;
-		DynLibManager* mDynLibManager;
-		PluginManager* mPluginManager;
-		LanguageManager* mLanguageManager;
-		ResourceManager* mResourceManager;
-		FactoryManager* mFactoryManager;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_GUI_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Guid.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Guid.h
deleted file mode 100644
index 72d2534349..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Guid.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_GUID_H__
-#define __MYGUI_GUID_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include <memory.h>
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT Guid
-	{
-	public:
-		Guid() { fast._data1 = fast._data2 = fast._data3 = fast._data4 = 0; }
-		Guid( Guid const& _value ) { *this = _value; }
-		explicit Guid(const std::string& _value) { *this = parse(_value); }
-		explicit Guid(unsigned char(&_id)[16]) { ::memcpy((void*)&vec._data1[0], (void*)&_id[0], 16); }
-
-		bool operator == (Guid const& _comp) const
-		{
-			return _comp.fast._data1 == fast._data1
-				&& _comp.fast._data2 == fast._data2
-				&& _comp.fast._data3 == fast._data3
-				&& _comp.fast._data4 == fast._data4;
-		}
-
-		bool operator != ( Guid const& _comp ) const
-		{
-			return ! (*this == _comp);
-		}
-
-		bool operator < ( Guid const& _comp ) const
-		{
-			if (_comp.fast._data1 < fast._data1) return true;
-			else if (_comp.fast._data1 > fast._data1) return false;
-			if (_comp.fast._data2 < fast._data2) return true;
-			else if (_comp.fast._data2 > fast._data2) return false;
-			if (_comp.fast._data3 < fast._data3) return true;
-			else if (_comp.fast._data3 > fast._data3) return false;
-			if (_comp.fast._data4 < fast._data4) return true;
-			return false;
-		}
-
-		Guid& operator = (Guid const& _rvalue)
-		{
-			fast._data1 = _rvalue.fast._data1;
-			fast._data2 = _rvalue.fast._data2;
-			fast._data3 = _rvalue.fast._data3;
-			fast._data4 = _rvalue.fast._data4;
-			return *this;
-		}
-
-		bool empty() const
-		{
-			return fast._data1 == 0
-				&& fast._data2 == 0
-				&& fast._data3 == 0
-				&& fast._data4 == 0;
-		}
-
-		void clear()
-		{
-			fast._data1 = fast._data2 = fast._data3 = fast._data4 = 0;
-		}
-
-		std::string print() const;
-		static Guid parse(const std::string& _value);
-		static Guid generate();
-
-		friend std::ostream& operator << ( std::ostream& _stream, const Guid&  _value )
-		{
-			_stream << _value.print();
-			return _stream;
-		}
-
-		friend std::istream& operator >> ( std::istream& _stream, Guid&  _value )
-		{
-			std::string value;
-			_stream >> value;
-			if (_stream.fail()) _value.clear();
-			else _value = Guid::parse(value);
-			return _stream;
-		}
-
-	private:
-		// массив для быстрой конвертации
-		static const char convert_hex[64];
-
-		struct _original
-		{
-			uint32 data1;
-			uint16 data2, data3;
-			uint8 data4[8];
-		};
-		struct _fast
-		{
-			uint32 _data1, _data2, _data3, _data4;
-		};
-		struct _vec
-		{
-			unsigned char _data1[16];
-		};
-
-		union
-		{
-			_original original;
-			_fast fast;
-			_vec vec;
-		};
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_GUID_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_HScroll.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_HScroll.h
deleted file mode 100644
index 1f7e47e4e7..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_HScroll.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_HSCROLL_H__
-#define __MYGUI_HSCROLL_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_VScroll.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT HScroll :
-		public VScroll
-	{
-		MYGUI_RTTI_DERIVED( HScroll )
-
-	public:
-		HScroll();
-
-		//! @copydoc VScroll::getLineSize()
-		virtual int getLineSize();
-
-		//! @copydoc VScroll::setTrackSize(int _value)
-		virtual void setTrackSize(int _value);
-		//! @copydoc VScroll::getTrackSize()
-		virtual int getTrackSize();
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	protected:
-		virtual ~HScroll();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-		void TrackMove(int _left, int _top);
-		void updateTrack();
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_HSCROLL_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IBItemInfo.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IBItemInfo.h
deleted file mode 100644
index 1bbda09f49..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IBItemInfo.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_ITEM_INFO_H__
-#define __MYGUI_ITEM_INFO_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	// структура информации об отображении элемента
-	/** Info about ItemBox item*/
-	struct MYGUI_EXPORT IBDrawItemInfo
-	{
-
-		IBDrawItemInfo() :
-			index(ITEM_NONE),
-			update(false),
-			select(false),
-			active(false),
-			drag(false),
-			drop_accept(false),
-			drop_refuse(false)
-		{
-		}
-
-		IBDrawItemInfo(size_t _index, size_t _select, size_t _active, size_t _accept, size_t _refuse, bool _update, bool _drag) :
-			index(_index),
-			update(_update),
-			select(_index == _select),
-			active(_index == _active),
-			drag(_drag),
-			drop_accept(_index == _accept),
-			drop_refuse(_index == _refuse)
-		{
-		}
-
-		/** Index of element */
-		size_t index;
-		/** State and interdan data changed */
-		bool update;
-		/** Is widget selected */
-		bool select;
-		/** Is widget active */
-		bool active;
-		/** Is widget able to be dragged */
-		bool drag;
-		/** Is widget accepting drop */
-		bool drop_accept;
-		/** Is widget refuseing drop */
-		bool drop_refuse;
-	};
-
-	struct MYGUI_EXPORT IBNotifyItemData
-	{
-		enum NotifyItem
-		{
-			MousePressed,
-			MouseReleased,
-			KeyPressed,
-			KeyReleased
-		};
-
-		IBNotifyItemData(size_t _index, NotifyItem _notify, int _x, int _y, MouseButton _id) :
-			index(_index), notify(_notify), x(_x), y(_y), id(_id), code(KeyCode::None), key(0) { }
-
-		IBNotifyItemData(size_t _index, NotifyItem _notify, KeyCode _code, Char _key) :
-			index(_index), notify(_notify), x(0), y(0), id(MouseButton::None), code(_code), key(_key) { }
-
-		IBNotifyItemData(size_t _index, NotifyItem _notify, KeyCode _code) :
-			index(_index), notify(_notify), x(0), y(0), id(MouseButton::None), code(_code), key(KeyCode::None) { }
-
-		/** Item index */
-		size_t index;
-		/** Notify type */
-		NotifyItem notify;
-		/** If Mouse* notify type - mouse x position, else 0 */
-		int x;
-		/** If Mouse* notify type - mouse y position, else 0 */
-		int y;
-		/** If Mouse* notify type - mouse button id position, else 0 */
-		MouseButton id;
-		/** If Key* notify type - key code, else 0 */
-		KeyCode code;
-		/** If Key* notify type - mouse button id position, else 0 */
-		Char key;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_ITEM_INFO_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ICroppedRectangle.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ICroppedRectangle.h
deleted file mode 100644
index 06229d0564..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ICroppedRectangle.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*!
-	@file
-	@author		Georgiy Evmenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_CROPPED_RECTANGLE_H__
-#define __MYGUI_I_CROPPED_RECTANGLE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ICroppedRectangle
-	{
-	public:
-		ICroppedRectangle() :
-			mIsMargin(false),
-			mCroppedParent(nullptr),
-			mVisible(true),
-			mAlign(Align::Default)
-		{ }
-
-		virtual ~ICroppedRectangle() { }
-
-		/** Get parent ICroppedRectangle */
-		ICroppedRectangle * getCroppedParent() { return mCroppedParent; }
-
-		/** Set coordinates (position and size) */
-		virtual void setCoord(const IntCoord& _value) { mCoord = _value; }
-		/** Get coordinates (position and size) */
-		const IntCoord& getCoord() const { return mCoord; }
-
-		/** Set position */
-		virtual void setPosition(const IntPoint& _value) { mCoord.left = _value.left; mCoord.top = _value.top; }
-		/** Get position */
-		IntPoint getPosition() const { return mCoord.point(); }
-
-		/** Set size */
-		virtual void setSize(const IntSize& _value) { mCoord.width = _value.width; mCoord.height = _value.height; }
-		/** Get size */
-		IntSize getSize() const { return mCoord.size(); }
-
-		/** Hide or show */
-		virtual void setVisible(bool _value) { mVisible = _value; }
-		/** Return true if visible */
-		bool isVisible() const { return mVisible; }
-
-		/** Get position in screen coordinates */
-		const IntPoint& getAbsolutePosition() const { return mAbsolutePosition; }
-		/** Get rectangle in screen coordinates */
-		IntRect getAbsoluteRect() const { return IntRect(mAbsolutePosition.left, mAbsolutePosition.top, mAbsolutePosition.left+mCoord.width, mAbsolutePosition.top+mCoord.height); }
-		/** Get coordinate in screen coordinates */
-		IntCoord getAbsoluteCoord() const { return IntCoord(mAbsolutePosition.left, mAbsolutePosition.top, mCoord.width, mCoord.height); }
-
-		/** Get X in screen coordinates */
-		int getAbsoluteLeft() const { return mAbsolutePosition.left; }
-		/** Get Y in screen coordinates */
-		int getAbsoluteTop() const { return mAbsolutePosition.top; }
-
-		/** Set align */
-		virtual void setAlign(Align _value) { mAlign = _value; }
-		/** Get align */
-		Align getAlign() const { return mAlign; }
-
-		/** Get left x-coordinate */
-		int getLeft() const { return mCoord.left; }
-		/** Get right x-coordinate */
-		int getRight() const { return mCoord.right(); }
-		/** Get top y-coordinate */
-		int getTop() const { return mCoord.top; }
-		/** Get bottom y-coordinate */
-		int getBottom() const { return mCoord.bottom(); }
-		/** Get width */
-		int getWidth() const { return mCoord.width; }
-		/** Get height */
-		int getHeight() const { return mCoord.height; }
-
-
-	/*internal:*/
-		/** True if rectangle is cropped by parent rectangle */
-		bool _isMargin() const { return mIsMargin; }
-
-		// Get cropped by parent rectangle coordinates
-		int _getViewLeft() const { return mCoord.left + mMargin.left; }
-		int _getViewRight() const { return mCoord.right() - mMargin.right; }
-		int _getViewTop() const { return mCoord.top + mMargin.top; }
-		int _getViewBottom() const { return mCoord.bottom() - mMargin.bottom; }
-		int _getViewWidth() const { return mCoord.width - mMargin.left - mMargin.right; }
-		int _getViewHeight() const { return mCoord.height - mMargin.top - mMargin.bottom; }
-
-		virtual void _updateView() { }
-		virtual void _correctView() { }
-		virtual void _setAlign(const IntSize& _oldsize, bool _update)  { }
-		virtual void _setAlign(const IntCoord& _oldcoord, bool _update) { }
-
-		void _setCroppedParent(ICroppedRectangle* _parent) { mCroppedParent = _parent; }
-
-		const IntRect& _getMargin() const { return mMargin; }
-		int _getMarginLeft() const { return mMargin.left; }
-		int _getMarginRight() const { return mMargin.right; }
-		int _getMarginTop() const { return mMargin.top; }
-		int _getMarginBottom() const { return mMargin.bottom; }
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void ICroppedRectangle::setVisible(bool _visible)")
-		void show() { setVisible(true); }
-		MYGUI_OBSOLETE("use : void ICroppedRectangle::setVisible(bool _visible)")
-		void hide() { setVisible(false); }
-		MYGUI_OBSOLETE("use : bool ICroppedRectangle::isVisible()")
-		bool isShow() { return isVisible(); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	protected:
-		bool _checkPoint(int _left, int _top)
-		{
-			return ! ((_getViewLeft() > _left) || (_getViewTop() > _top) || (_getViewRight() < _left) || (_getViewBottom() < _top));
-		}
-
-		bool _checkMargin()
-		{
-			bool margin = false;
-			//вылезли ли налево
-			if (getLeft() < mCroppedParent->mMargin.left)
-			{
-				mMargin.left = mCroppedParent->mMargin.left - getLeft();
-				margin = true;
-			}
-			else
-			{
-				mMargin.left = 0;
-			}
-
-			//вылезли ли направо
-			if (getRight() > mCroppedParent->getWidth() - mCroppedParent->mMargin.right)
-			{
-				mMargin.right = getRight() - (mCroppedParent->getWidth() - mCroppedParent->mMargin.right);
-				margin = true;
-			}
-			else
-			{
-				mMargin.right = 0;
-			}
-
-			//вылезли ли вверх
-			if (getTop() < mCroppedParent->mMargin.top)
-			{
-				mMargin.top = mCroppedParent->mMargin.top - getTop();
-				margin = true;
-			}
-			else
-			{
-				mMargin.top = 0;
-			}
-
-			//вылезли ли вниз
-			if (getBottom() > mCroppedParent->getHeight() - mCroppedParent->mMargin.bottom)
-			{
-				mMargin.bottom = getBottom() - (mCroppedParent->getHeight() - mCroppedParent->mMargin.bottom);
-				margin = true;
-			}
-			else
-			{
-				mMargin.bottom = 0;
-			}
-
-			return margin;
-		}
-
-		bool _checkOutside() // проверка на полный выход за границу
-		{
-			return ( (getRight() < mCroppedParent->mMargin.left ) || // совсем уехали налево
-				(getLeft() > mCroppedParent->getWidth() - mCroppedParent->mMargin.right ) || // совсем уехали направо
-				(getBottom() < mCroppedParent->mMargin.top  ) || // совсем уехали вверх
-				(getTop() > mCroppedParent->getHeight() - mCroppedParent->mMargin.bottom ) );  // совсем уехали вниз
-		}
-
-	protected:
-		bool mIsMargin;
-		IntRect mMargin; // перекрытие
-		IntCoord mCoord; // координаты
-		IntPoint mAbsolutePosition; // обсолютные координаты
-
-		ICroppedRectangle * mCroppedParent;
-		bool mVisible;
-		Align mAlign;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_CROPPED_RECTANGLE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IDataStream.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IDataStream.h
deleted file mode 100644
index b404808506..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IDataStream.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		08/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_DATA_STREAM_H__
-#define __MYGUI_I_DATA_STREAM_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT IDataStream
-	{
-	public:
-		virtual ~IDataStream() { }
-
-		virtual bool eof() = 0;
-		virtual size_t size() = 0;
-		virtual void readline(std::string& _source, Char _delim = '\n') = 0;
-		virtual size_t read(void* _buf, size_t _count) = 0;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_DATA_STREAM_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IFont.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IFont.h
deleted file mode 100644
index 14357714e8..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IFont.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_FONT_H__
-#define __MYGUI_I_FONT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_ISerializable.h"
-#include "MyGUI_IResource.h"
-#include "MyGUI_FontData.h"
-
-namespace MyGUI
-{
-
-	class ITexture;
-
-	class MYGUI_EXPORT IFont : public IResource
-	{
-		MYGUI_RTTI_DERIVED( IFont )
-
-	public:
-		IFont() { }
-		virtual ~IFont() { }
-
-		virtual GlyphInfo* getGlyphInfo(Char _id) = 0;
-
-		virtual ITexture* getTextureFont() = 0;
-
-		virtual int getDefaultHeight() = 0;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_FONT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ILayer.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ILayer.h
deleted file mode 100644
index 2f45bccac1..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ILayer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_LAYER_H__
-#define __MYGUI_I_LAYER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_IRenderTarget.h"
-#include "MyGUI_ILayerNode.h"
-#include "MyGUI_ISerializable.h"
-
-namespace MyGUI
-{
-
-	class ILayerItem;
-
-	class MYGUI_EXPORT ILayer : public ISerializable
-	{
-		MYGUI_RTTI_DERIVED( ILayer )
-
-	public:
-		ILayer() { }
-		virtual ~ILayer() { }
-
-		// ��� �����
-		const std::string& getName() const { return mName; }
-
-		// ������� �������� ���
-		virtual ILayerNode* createChildItemNode() = 0;
-		// ������� �������� ���
-		virtual void destroyChildItemNode(ILayerNode* _node) = 0;
-
-		// ��������� �������� ���
-		virtual void upChildItemNode(ILayerNode* _node) = 0;
-
-		// ������ �����
-		virtual EnumeratorILayerNode getEnumerator() = 0;
-
-		// ���������� ������ �� �������
-		virtual ILayerItem* getLayerItemByPoint(int _left, int _top) = 0;
-
-		// ���������� ������� � ����������� �����
-		virtual IntPoint getPosition(int _left, int _top) const = 0;
-
-		// ���������� ������ �����
-		virtual const IntSize& getSize() const = 0;
-
-		// ������ ����
-		virtual void renderToTarget(IRenderTarget* _target, bool _update) = 0;
-
-		virtual void dumpStatisticToLog() { }
-
-	protected:
-		std::string mName;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_LAYER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ILayerItem.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ILayerItem.h
deleted file mode 100644
index b7705b1639..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ILayerItem.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_LAYER_ITEM_H__
-#define __MYGUI_I_LAYER_ITEM_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	class ILayer;
-	class ILayerNode;
-
-	class MYGUI_EXPORT ILayerItem
-	{
-	public:
-		virtual ~ILayerItem() { }
-
-		virtual ILayerItem * getLayerItemByPoint(int _left, int _top) = 0;
-		virtual const IntCoord& getLayerItemCoord() = 0;
-
-		virtual void attachItemToNode(ILayer* _layer, ILayerNode* _node) = 0;
-		virtual void detachFromLayer() = 0;
-		virtual void upLayerItem() = 0;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_LAYER_ITEM_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ILayerNode.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ILayerNode.h
deleted file mode 100644
index 7a4e67748f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ILayerNode.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_LAYER_NODE_H__
-#define __MYGUI_I_LAYER_NODE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Enumerator.h"
-#include "MyGUI_IObject.h"
-#include "MyGUI_IRenderTarget.h"
-
-namespace MyGUI
-{
-
-	class ILayer;
-	class ILayerItem;
-	class ILayerNode;
-
-	class RenderItem;
-	class ISubWidget;
-
-	typedef std::vector<ILayerNode*> VectorILayerNode;
-	typedef Enumerator<VectorILayerNode> EnumeratorILayerNode;
-
-	class MYGUI_EXPORT ILayerNode : public IObject
-	{
-		MYGUI_RTTI_DERIVED( ILayerNode )
-
-	public:
-		virtual ~ILayerNode() { }
-
-		// ����, �������� �� �����������
-		virtual ILayer* getLayer() = 0;
-
-		// ���������� ���� ��� nullptr
-		virtual ILayerNode* getParent() = 0;
-
-		// ������� �������� ���
-		virtual ILayerNode* createChildItemNode() = 0;
-		// ������� �������� ���
-		virtual void destroyChildItemNode(ILayerNode* _node) = 0;
-
-		// ��������� �������� ���
-		virtual void upChildItemNode(ILayerNode* _node) = 0;
-
-		// ������ �����
-		virtual EnumeratorILayerNode getEnumerator() = 0;
-
-
-		// ��������� ����� � ����
-		virtual void attachLayerItem(ILayerItem* _item) = 0;
-		// ������� ����� �� ����
-		virtual void detachLayerItem(ILayerItem* _root) = 0;
-
-		// ��������� ��� ����� � ���������� ������ �����
-		virtual RenderItem* addToRenderItem(ITexture* _texture, ISubWidget* _item) = 0;
-		// ���������� ���������� ����
-		virtual void outOfDate(RenderItem* _item) = 0;
-
-		// ���������� ������ �� �������
-		virtual ILayerItem* getLayerItemByPoint(int _left, int _top) = 0;
-
-		// ������ ����
-		virtual void renderToTarget(IRenderTarget* _target, bool _update) = 0;
-
-		virtual void dumpStatisticToLog(size_t _level) { }
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_LAYER_NODE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IObject.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IObject.h
deleted file mode 100644
index 6364afae76..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IObject.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_OBJECT_H__
-#define __MYGUI_I_OBJECT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_RTTI.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT IObject
-	{
-		MYGUI_RTTI_BASE( IObject )
-
-	public:
-		virtual ~IObject() { }
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_OBJECT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IPointer.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IPointer.h
deleted file mode 100644
index 7092478181..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IPointer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_POINTER_H__
-#define __MYGUI_I_POINTER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_IResource.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT IPointer : public IResource
-	{
-		MYGUI_RTTI_DERIVED( IPointer )
-
-	public:
-		IPointer() { }
-		virtual ~IPointer() { }
-
-		virtual void setImage(StaticImage* _image) = 0;
-		virtual void setPosition(StaticImage* _image, const IntPoint& _point) = 0;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_POINTER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IRenderTarget.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IRenderTarget.h
deleted file mode 100644
index 38094fac58..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IRenderTarget.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_RENDER_TARGET_H__
-#define __MYGUI_I_RENDER_TARGET_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_RenderTargetInfo.h"
-
-namespace MyGUI
-{
-
-	class ITexture;
-	class IVertexBuffer;
-
-	class MYGUI_EXPORT IRenderTarget
-	{
-	public:
-		IRenderTarget() { }
-		virtual ~IRenderTarget() { }
-
-		virtual void begin() = 0;
-		virtual void end() = 0;
-
-		virtual void doRender(IVertexBuffer* _buffer, ITexture* _texture, size_t _count) = 0;
-
-		virtual const RenderTargetInfo& getInfo() = 0;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_RENDER_TARGET_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IResource.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IResource.h
deleted file mode 100644
index b296b684c5..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IResource.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_RESOURCE_H__
-#define __MYGUI_I_RESOURCE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_Guid.h"
-#include "MyGUI_Version.h"
-#include "MyGUI_ISerializable.h"
-#include "MyGUI_ResourceHolder.h"
-
-namespace MyGUI
-{
-
-	class IResource;
-	typedef IResource * IResourcePtr;
-
-	class ResourceManager;
-
-	class MYGUI_EXPORT IResource : public ISerializable
-	{
-		// для серелизации
-		friend class ResourceManager;
-		// для удаления
-		friend class ResourceHolder<IResource>;
-
-		MYGUI_RTTI_DERIVED( IResource )
-
-	public:
-		const std::string& getResourceName() { return mResourceName; }
-		const Guid& getResourceID() { return mResourceID; }
-
-	protected:
-		IResource() { }
-	private:
-		// constructors and operator =, without implementation, just for private
-		IResource(IResource const &);
-		IResource& operator = (IResource const &);
-
-	protected:
-		virtual void deserialization(xml::ElementPtr _node, Version _version)
-		{
-			mResourceID = Guid::parse(_node->findAttribute("id"));
-			mResourceName = _node->findAttribute("name");
-		}
-
-		virtual ~IResource() { }
-
-	private:
-		std::string mResourceName;
-		Guid mResourceID;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_RESOURCE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ISerializable.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ISerializable.h
deleted file mode 100644
index 69b5cfa02f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ISerializable.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_SERIALIZABLE_H__
-#define __MYGUI_I_SERIALIZABLE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_IObject.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_Version.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ISerializable : public IObject
-	{
-		MYGUI_RTTI_DERIVED( ISerializable )
-
-	public:
-		ISerializable() { }
-		virtual ~ISerializable() { }
-
-		virtual void serialization(xml::ElementPtr _node, Version _version) { }
-		virtual void deserialization(xml::ElementPtr _node, Version _version) { }
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_SERIALIZABLE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IStateInfo.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IStateInfo.h
deleted file mode 100644
index 4785221441..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IStateInfo.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_STATE_INFO_H__
-#define __MYGUI_I_STATE_INFO_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_ISerializable.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT IStateInfo : public ISerializable
-	{
-		MYGUI_RTTI_DERIVED( IStateInfo )
-
-	public:
-		virtual ~IStateInfo() { }
-
-	};
-
-	typedef std::vector<IStateInfo*> VectorStateInfo;
-	typedef std::map<std::string, IStateInfo*> MapStateInfo;
-	typedef std::map<std::string, VectorStateInfo> MapWidgetStateInfo;
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_STATE_INFO_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ISubWidget.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ISubWidget.h
deleted file mode 100644
index c213eb700f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ISubWidget.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_SUB_WIDGET_H__
-#define __MYGUI_I_SUB_WIDGET_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_ICroppedRectangle.h"
-#include "MyGUI_ILayerNode.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_IRenderTarget.h"
-#include "MyGUI_IStateInfo.h"
-#include "MyGUI_IObject.h"
-
-namespace MyGUI
-{
-
-	class ISubWidget;
-	typedef std::vector<ISubWidget*> VectorSubWidget;
-
-	class MYGUI_EXPORT ISubWidget :
-		public ICroppedRectangle,
-		public IObject
-	{
-		MYGUI_RTTI_DERIVED( ISubWidget )
-
-	public:
-		virtual ~ISubWidget() { }
-
-		virtual void createDrawItem(ITexture* _texture, ILayerNode* _node) = 0;
-		virtual void destroyDrawItem() = 0;
-
-		virtual void setAlpha(float _alpha) { }
-
-		virtual void setStateData(IStateInfo* _data) { }
-
-		virtual void doRender() = 0;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_SUB_WIDGET_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ISubWidgetRect.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ISubWidgetRect.h
deleted file mode 100644
index 57fe40ac02..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ISubWidgetRect.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_SUB_WIDGET_RECT_H__
-#define __MYGUI_I_SUB_WIDGET_RECT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_ISubWidget.h"
-#include "MyGUI_Colour.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ISubWidgetRect : public ISubWidget
-	{
-		MYGUI_RTTI_DERIVED( ISubWidgetRect )
-
-	public:
-		virtual ~ISubWidgetRect() { }
-
-		virtual void _setUVSet(const FloatRect& _rect) { }
-		virtual void _setColour(const Colour& _value) { }
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_SUB_WIDGET_RECT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ISubWidgetText.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ISubWidgetText.h
deleted file mode 100644
index a90783401c..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ISubWidgetText.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_SUB_WIDGET_TEXT_H__
-#define __MYGUI_I_SUB_WIDGET_TEXT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_ISubWidget.h"
-#include "MyGUI_Colour.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ISubWidgetText : public ISubWidget
-	{
-		MYGUI_RTTI_DERIVED( ISubWidgetText )
-
-	public:
-		virtual ~ISubWidgetText()  { }
-
-		/** Get index of start of selection */
-		virtual size_t getTextSelectionStart() { return 0; }
-		/** Get index of end of selection */
-		virtual size_t getTextSelectionEnd() { return 0; }
-		/** Set text selection */
-		virtual void setTextSelection(size_t _start, size_t _end) { }
-
-		// интенсивность выделенного текста
-		virtual bool getSelectBackground() { return true; }
-		virtual void setSelectBackground(bool _normal) { }
-
-		// нужно ли инвертировать выделение
-		virtual bool getInvertSelected() { return true; }
-		virtual void setInvertSelected(bool _value) { }
-
-		// управление видимостью курсора
-		virtual bool isVisibleCursor() { return false; }
-		virtual void setVisibleCursor(bool _value) { }
-
-		// управление положением курсора
-		virtual size_t getCursorPosition() { return 0; }
-		virtual void setCursorPosition(size_t _index) { }
-
-		virtual void setWordWrap(bool _value) { }
-
-		// возвращает положение курсора по произвольному положению
-		// позиция абсолютная, без учета смещений
-		virtual size_t getCursorPosition(const IntPoint& _point) { return 0; }
-
-		// возвращает положение курсора в обсолютных координатах
-		virtual IntCoord getCursorCoord(size_t _position) { return IntCoord(); }
-
-		// возвращает положение курсора в обсолютных координатах
-		IntPoint getCursorPoint(size_t _position)
-		{
-			const IntCoord& coord = getCursorCoord(_position);
-			return IntPoint(coord.left + coord.width / 2, coord.top + coord.height / 2);
-		}
-
-		// возвращает положение курсора в обсолютных координатах
-		IntRect getCursorRect(size_t _position)
-		{
-			const IntCoord& coord = getCursorCoord(_position);
-			return IntRect(coord.left, coord.top, coord.left + coord.width, coord.top + coord.height);
-		}
-
-		// возвращает размер текста в пикселях
-		virtual IntSize getTextSize() { return IntSize(); }
-
-		// устанавливает смещение текста в пикселях
-		virtual void setViewOffset(const IntPoint& _point) { }
-		virtual IntPoint getViewOffset() { return IntPoint(); }
-
-		virtual void setCaption(const UString& _value) { }
-		virtual const UString& getCaption() { static UString caption; return caption; }
-
-		virtual void setTextColour(const Colour& _value) { }
-		virtual const Colour& getTextColour() { return Colour::Zero; }
-
-		virtual void setFontName(const std::string& _value) { }
-		virtual const std::string& getFontName() { static std::string name; return name; }
-
-		virtual void setFontHeight(int _value) { }
-		virtual int getFontHeight() { return 0; }
-
-		virtual void setTextAlign(Align _value) { }
-		virtual Align getTextAlign() { return Align::Default; }
-
-		virtual void setShiftText(bool _value) { }
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_SUB_WIDGET_TEXT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ITexture.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ITexture.h
deleted file mode 100644
index fdf093f2f9..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ITexture.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_TEXTURE_H__
-#define __MYGUI_I_TEXTURE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_IRenderTarget.h"
-#include "MyGUI_RenderFormat.h"
-#include <string>
-
-namespace MyGUI
-{
-	class ITexture;
-
-	class MYGUI_EXPORT ITextureInvalidateListener
-	{
-	public:
-		virtual void textureInvalidate(ITexture* _texture) = 0;
-	};
-
-	class MYGUI_EXPORT ITexture
-	{
-	public:
-		virtual ~ITexture() { }
-
-		virtual const std::string& getName() const = 0;
-
-		virtual void createManual(int _width, int _height, TextureUsage _usage, PixelFormat _format) = 0;
-		virtual void loadFromFile(const std::string& _filename) = 0;
-		virtual void saveToFile(const std::string& _filename) = 0;
-
-		virtual void setInvalidateListener(ITextureInvalidateListener* _listener) { }
-
-		virtual void destroy() = 0;
-
-		virtual void* lock(TextureUsage _access) = 0;
-		virtual void unlock() = 0;
-		virtual bool isLocked() = 0;
-
-		virtual int getWidth() = 0;
-		virtual int getHeight() = 0;
-
-		virtual PixelFormat getFormat() = 0;
-		virtual TextureUsage getUsage() = 0;
-		virtual size_t getNumElemBytes() = 0;
-
-		virtual IRenderTarget* getRenderTarget() { return nullptr; }
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_TEXTURE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IUnlinkWidget.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IUnlinkWidget.h
deleted file mode 100644
index f890e435ab..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IUnlinkWidget.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_UNLINK_WIDGET_H__
-#define __MYGUI_UNLINK_WIDGET_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_WidgetDefines.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT IUnlinkWidget
-	{
-	public:
-		virtual ~IUnlinkWidget() { }
-		virtual void _unlinkWidget(Widget* _widget) = 0;
-	};
-
-	typedef std::vector<IUnlinkWidget*> VectorIUnlinkWidget;
-
-} // namespace MyGUI
-
-#endif // __MYGUI_UNLINK_WIDGET_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IVertexBuffer.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IVertexBuffer.h
deleted file mode 100644
index 7533e9fcdd..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IVertexBuffer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_VERTEX_BUFFER_H__
-#define __MYGUI_I_VERTEX_BUFFER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_VertexData.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT IVertexBuffer
-	{
-	public:
-		virtual ~IVertexBuffer() { }
-
-		virtual void setVertextCount(size_t _value) = 0;
-		virtual size_t getVertextCount() = 0;
-
-		virtual Vertex* lock() = 0;
-		virtual void unlock() = 0;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_I_VERTEX_BUFFER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IWidgetCreator.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IWidgetCreator.h
deleted file mode 100644
index d82e4ac36b..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IWidgetCreator.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		03/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_WIDGET_CREATOR_H__
-#define __MYGUI_WIDGET_CREATOR_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_WidgetStyle.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT IWidgetCreator
-	{
-		friend class WidgetManager;
-
-	public:
-		virtual ~IWidgetCreator() { }
-
-	protected:
-		virtual Widget* baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name) = 0;
-
-		// удяляет неудачника
-		virtual void _destroyChildWidget(Widget* _widget) = 0;
-
-		// удаляет всех детей
-		virtual void _destroyAllChildWidget() = 0;
-
-		// удаляет виджет с закрытым конструктором
-		void _deleteWidget(Widget* _widget);
-
-	public:
-		// добавляет в список виджет
-		// имплементировать только для рутовых креаторов
-		virtual void _linkChildWidget(Widget* _widget) { }
-		// удаляет из списка
-		// имплементировать только для рутовых креаторов
-		virtual void _unlinkChildWidget(Widget* _widget) { }
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_WIDGET_CREATOR_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IWidgetFactory.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IWidgetFactory.h
deleted file mode 100644
index d3929375fc..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_IWidgetFactory.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_I_WIDGET_FACTORY_H__
-#define __MYGUI_I_WIDGET_FACTORY_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_WidgetStyle.h"
-#include "MyGUI_WidgetDefines.h"
-#include "MyGUI_ICroppedRectangle.h"
-
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_SkinManager.h"
-
-namespace MyGUI
-{
-
-	//OBSOLETE
-	class MYGUI_EXPORT IWidgetFactory
-	{
-	public:
-		virtual ~IWidgetFactory() { }
-
-		virtual const std::string& getTypeName() = 0;
-		virtual Widget* createWidget(WidgetStyle _style, const std::string& _skin, const IntCoord& _coord, Align _align, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name) = 0;
-	};
-
-	namespace factory
-	{
-
-		//OBSOLETE
-		template <typename T>
-		class MYGUI_EXPORT BaseWidgetFactory : public IWidgetFactory
-		{
-		public:
-			BaseWidgetFactory()
-			{
-				// регестрируем себя
-				MyGUI::WidgetManager& manager = MyGUI::WidgetManager::getInstance();
-				manager.registerFactory(this);
-			}
-
-			~BaseWidgetFactory()
-			{
-				// удаляем себя
-				MyGUI::WidgetManager& manager = MyGUI::WidgetManager::getInstance();
-				manager.unregisterFactory(this);
-			}
-
-			const std::string& getTypeName()
-			{
-				return T::getClassTypeName();
-			}
-
-			Widget* createWidget(WidgetStyle _style, const std::string& _skin, const IntCoord& _coord, Align _align, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-			{
-				T* instance = new T(_style, _coord, _align, SkinManager::getInstance().getByName(_skin), _parent, _croppedParent, _creator, _name);
-				return instance;
-			}
-
-			bool isFalseType(Widget* _ptr, const std::string &_key)
-			{
-				if (!_ptr->isType<T>())
-				{
-					MYGUI_LOG(Error, "Property '" << _key << "' is not supported by '" << _ptr->getTypeName() << "' widget");
-					return true;
-				}
-				return false;
-			}
-		};
-
-	} // namespace factory
-} // namespace MyGUI
-
-#endif // __MYGUI_I_WIDGET_FACTORY_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ImageInfo.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ImageInfo.h
deleted file mode 100644
index 9f6e5a0906..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ImageInfo.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_IMAGE_INFO_H__
-#define __MYGUI_IMAGE_INFO_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	struct ImageItem
-	{
-		ImageItem() : frame_rate(0) { }
-
-		float frame_rate;
-		std::vector<FloatRect> images;
-	};
-
-	typedef std::vector<ImageItem> VectorImages;
-
-	struct ImageIndexInfo
-	{
-		ImageIndexInfo(
-			const std::string& _texture,
-			const IntSize& _size,
-			const float _rate,
-			const std::vector<IntPoint>& _frames
-			) :
-			texture(_texture),
-			size(_size),
-			rate(_rate),
-			frames(_frames)
-		{
-		}
-
-		const std::string& texture;
-		const IntSize& size;
-		const float rate;
-		const std::vector<IntPoint>& frames;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_IMAGE_INFO_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_InputDefine.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_InputDefine.h
deleted file mode 100644
index 7ecd43d884..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_InputDefine.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		03/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_INPUT_DEFINE_H__
-#define __MYGUI_INPUT_DEFINE_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	struct MYGUI_EXPORT MouseButton
-	{
-		enum Enum
-		{
-			Left = 0,
-			Right,
-			Middle,
-
-			Button0 = 0,
-			Button1,
-			Button2,
-			Button3,
-			Button4,
-			Button5,
-			Button6,
-			Button7,
-
-			None = -1
-		};
-
-		MouseButton(Enum _value = None) : value(_value) { }
-
-		friend bool operator == (MouseButton const& a, MouseButton const& b) { return a.value == b.value; }
-		friend bool operator != (MouseButton const& a, MouseButton const& b) { return a.value != b.value; }
-
-		int toValue() const { return (int)value; }
-
-	private:
-		Enum value;
-	};
-
-	struct MYGUI_EXPORT KeyCode
-	{
-		enum Enum
-		{
-			None          = 0x00,
-			Escape          = 0x01,
-			One             = 0x02,
-			Two             = 0x03,
-			Three           = 0x04,
-			Four            = 0x05,
-			Five            = 0x06,
-			Six             = 0x07,
-			Seven           = 0x08,
-			Eight           = 0x09,
-			Nine            = 0x0A,
-			Zero            = 0x0B,
-			Minus           = 0x0C,    /* - on main keyboard */
-			Equals			= 0x0D,
-			Backspace		= 0x0E,    /* Backspace */
-			Tab				= 0x0F,
-			Q               = 0x10,
-			W               = 0x11,
-			E               = 0x12,
-			R               = 0x13,
-			T               = 0x14,
-			Y               = 0x15,
-			U               = 0x16,
-			I               = 0x17,
-			O               = 0x18,
-			P               = 0x19,
-			LeftBracket     = 0x1A,
-			RightBracket    = 0x1B,
-			Return			= 0x1C,    /* Enter on main keyboard */
-			LeftControl		= 0x1D,
-			A               = 0x1E,
-			S               = 0x1F,
-			D               = 0x20,
-			F               = 0x21,
-			G               = 0x22,
-			H               = 0x23,
-			J               = 0x24,
-			K               = 0x25,
-			L               = 0x26,
-			Semicolon       = 0x27,
-			Apostrophe		= 0x28,
-			Grave           = 0x29,    /* Accent grave ( ~ ) */
-			LeftShift       = 0x2A,
-			Backslash       = 0x2B,
-			Z               = 0x2C,
-			X               = 0x2D,
-			C               = 0x2E,
-			V               = 0x2F,
-			B               = 0x30,
-			N               = 0x31,
-			M               = 0x32,
-			Comma           = 0x33,
-			Period          = 0x34,    /* . on main keyboard */
-			Slash           = 0x35,    /* '/' on main keyboard */
-			RightShift      = 0x36,
-			Multiply        = 0x37,    /* * on numeric keypad */
-			LeftAlt        = 0x38,    /* Left Alt */
-			Space           = 0x39,
-			Capital         = 0x3A,
-			F1              = 0x3B,
-			F2              = 0x3C,
-			F3              = 0x3D,
-			F4              = 0x3E,
-			F5              = 0x3F,
-			F6              = 0x40,
-			F7              = 0x41,
-			F8              = 0x42,
-			F9              = 0x43,
-			F10             = 0x44,
-			NumLock         = 0x45,
-			ScrollLock      = 0x46,    /* Scroll Lock */
-			Numpad7         = 0x47,
-			Numpad8         = 0x48,
-			Numpad9         = 0x49,
-			Subtract        = 0x4A,    /* - on numeric keypad */
-			Numpad4         = 0x4B,
-			Numpad5         = 0x4C,
-			Numpad6         = 0x4D,
-			Add				= 0x4E,    /* + on numeric keypad */
-			Numpad1         = 0x4F,
-			Numpad2         = 0x50,
-			Numpad3         = 0x51,
-			Numpad0         = 0x52,
-			Decimal			= 0x53,    /* . on numeric keypad */
-			OEM_102         = 0x56,    /* < > | on UK/Germany keyboards */
-			F11             = 0x57,
-			F12             = 0x58,
-			F13             = 0x64,    /*                     (NEC PC98) */
-			F14             = 0x65,    /*                     (NEC PC98) */
-			F15             = 0x66,    /*                     (NEC PC98) */
-			Kana            = 0x70,    /* (Japanese keyboard)            */
-			ABNT_C1         = 0x73,    /* / ? on Portugese (Brazilian) keyboards */
-			Convert         = 0x79,    /* (Japanese keyboard)            */
-			NoConvert       = 0x7B,    /* (Japanese keyboard)            */
-			Yen             = 0x7D,    /* (Japanese keyboard)            */
-			ABNT_C2         = 0x7E,    /* Numpad . on Portugese (Brazilian) keyboards */
-			NumpadEquals    = 0x8D,    /* = on numeric keypad (NEC PC98) */
-			PrevTrack       = 0x90,    /* Previous Track (KC_CIRCUMFLEX on Japanese keyboard) */
-			At              = 0x91,    /*                     (NEC PC98) */
-			Colon           = 0x92,    /*                     (NEC PC98) */
-			Underline       = 0x93,    /*                     (NEC PC98) */
-			Kanji           = 0x94,    /* (Japanese keyboard)            */
-			Stop            = 0x95,    /*                     (NEC PC98) */
-			AX              = 0x96,    /*                     (Japan AX) */
-			Unlabeled       = 0x97,    /*                        (J3100) */
-			NextTrack       = 0x99,    /* Next Track */
-			NumpadEnter     = 0x9C,    /* Enter on numeric keypad */
-			RightControl    = 0x9D,
-			Mute            = 0xA0,
-			Calculator      = 0xA1,
-			PlayPause       = 0xA2,    /* Play / Pause */
-			MediaStop       = 0xA4,    /* Media Stop */
-			VolumeDown      = 0xAE,    /* Volume - */
-			VolumeUp        = 0xB0,    /* Volume + */
-			WebHome         = 0xB2,    /* Web home */
-			NumpadComma     = 0xB3,    /* , on numeric keypad (NEC PC98) */
-			Divide          = 0xB5,    /* / on numeric keypad */
-			SysRq           = 0xB7,
-			RightAlt        = 0xB8,    /* Right Alt */
-			Pause           = 0xC5,
-			Home            = 0xC7,    /* Home on arrow keypad */
-			ArrowUp         = 0xC8,    /* UpArrow on arrow keypad */
-			PageUp          = 0xC9,    /* PgUp on arrow keypad */
-			ArrowLeft       = 0xCB,    /* LeftArrow on arrow keypad */
-			ArrowRight      = 0xCD,    /* RightArrow on arrow keypad */
-			End             = 0xCF,    /* End on arrow keypad */
-			ArrowDown       = 0xD0,    /* DownArrow on arrow keypad */
-			PageDown		= 0xD1,    /* PgDn on arrow keypad */
-			Insert          = 0xD2,    /* Insert on arrow keypad */
-			Delete          = 0xD3,    /* Delete on arrow keypad */
-			LeftWindows     = 0xDB,    /* Left Windows key */
-			RightWindow     = 0xDC,    /* Right Windows key */
-			RightWindows    = 0xDC,    /* Right Windows key - Correct spelling :) */
-			AppMenu         = 0xDD,    /* AppMenu key */
-			Power           = 0xDE,    /* System Power */
-			Sleep           = 0xDF,    /* System Sleep */
-			Wake			= 0xE3,    /* System Wake */
-			WebSearch		= 0xE5,
-			WebFavorites	= 0xE6,
-			WebRefresh		= 0xE7,
-			WebStop			= 0xE8,
-			WebForward		= 0xE9,
-			WebBack			= 0xEA,
-			MyComputer		= 0xEB,
-			Mail			= 0xEC,
-			MediaSelect		= 0xED
-		};
-
-		KeyCode(Enum _value = None) : value(_value) { }
-
-		friend bool operator == (KeyCode const& a, KeyCode const& b) { return a.value == b.value; }
-		friend bool operator != (KeyCode const& a, KeyCode const& b) { return a.value != b.value; }
-
-		int toValue() const { return (int)value; }
-
-	private:
-		Enum value;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_INPUT_DEFINE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_InputManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_InputManager.h
deleted file mode 100644
index bb7a6bc782..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_InputManager.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_INPUT_MANAGER_H__
-#define __MYGUI_INPUT_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Macros.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_WidgetDefines.h"
-#include "MyGUI_IUnlinkWidget.h"
-#include "MyGUI_WidgetDefines.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_InputDefine.h"
-#include "MyGUI_Timer.h"
-#include "MyGUI_ILayer.h"
-#include "MyGUI_Delegate.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT InputManager : public IUnlinkWidget
-	{
-		MYGUI_INSTANCE_HEADER( InputManager )
-
-	public:
-		void initialise();
-		void shutdown();
-
-		/** Inject MouseMove event
-			@return true if event has been processed by GUI
-		*/
-		bool injectMouseMove(int _absx, int _absy, int _absz);
-		/** Inject MousePress event
-			@return true if event has been processed by GUI
-		*/
-		bool injectMousePress(int _absx, int _absy, MouseButton _id);
-		/** Inject MouseRelease event
-			@return true if event has been processed by GUI
-		*/
-		bool injectMouseRelease(int _absx, int _absy, MouseButton _id);
-
-		/** Inject KeyPress event
-			@return true if event has been processed by GUI
-		*/
-		bool injectKeyPress(KeyCode _key, Char _text = 0);
-		/** Inject KeyRelease event
-			@return true if event has been processed by GUI
-		*/
-		bool injectKeyRelease(KeyCode _key);
-
-		/** Is any widget have mouse focus */
-		bool isFocusMouse() { return mWidgetMouseFocus != nullptr; }
-		/** Is any widget have key focus */
-		bool isFocusKey() { return mWidgetKeyFocus != nullptr; }
-		/** Is any widget captured mouse */
-		bool isCaptureMouse() { return mIsWidgetMouseCapture; }
-
-		/** Set key focus for _widget */
-		void setKeyFocusWidget(Widget* _widget);
-		/** Drop key focus for _widget */
-		void resetKeyFocusWidget(Widget* _widget);
-		/** Drop any key focus */
-		void resetKeyFocusWidget() { setKeyFocusWidget(nullptr); }
-
-		/** Get mouse focused widget */
-		Widget* getMouseFocusWidget() { return mWidgetMouseFocus; }
-		/** Get key focused widget */
-		Widget* getKeyFocusWidget() { return mWidgetKeyFocus; }
-		/** Get position of last left mouse button press */
-		const IntPoint& getLastLeftPressed() { return mLastLeftPressed; }
-		/** Get current mouse position */
-		const IntPoint& getMousePosition() { return mMousePosition; }
-
-		IntPoint getMousePositionByLayer();
-
-		// тестовый вариант, очистка фокуса мыши
-		/** Drop any mouse focus */
-		void resetMouseFocusWidget();
-
-		// работа с модальными окнами
-		/** Add modal widget - all other widgets inaccessible while modal widget exist */
-		void addWidgetModal(Widget* _widget);
-		/** Remove modal widget */
-		void removeWidgetModal(Widget* _widget);
-
-		/** Return true if any modal widget exist */
-		bool isModalAny() { return !mVectorModalRootWidget.empty(); }
-
-		/** Is control button pressed */
-		bool isControlPressed() { return mIsControlPressed; }
-		/** Is shift button pressed */
-		bool isShiftPressed() { return mIsShiftPressed; }
-
-		/** Reset mouse capture (for example when we dragging and application
-			lost focus you should call this)
-		*/
-		void resetMouseCaptureWidget() { mIsWidgetMouseCapture = false; }
-
-		void unlinkWidget(Widget* _widget) { _unlinkWidget(_widget); }
-
-		/** Event :\n
-			signature : void method(MyGUI::Widget* _widget)\n
-			@param _widget
-		*/
-		delegates::CMultiDelegate1<Widget*>
-			eventChangeMouseFocus;
-
-		/** Event :\n
-			signature : void method(MyGUI::Widget* _widget)\n
-			@param _widget
-		*/
-		delegates::CMultiDelegate1<Widget*>
-			eventChangeKeyFocus;
-
-	private:
-		// удаляем данный виджет из всех возможных мест
-		void _unlinkWidget(Widget* _widget);
-
-		void frameEntered(float _frame);
-
-		void firstEncoding(KeyCode _key, bool bIsKeyPressed);
-
-		// запоминает клавишу для поддержки повторения
-		void storeKey(KeyCode _key, Char _text);
-
-		// сбрасывает клавишу повторения
-		void resetKey();
-
-	private:
-		// виджеты которым принадлежит фокус
-		Widget* mWidgetMouseFocus;
-		Widget* mWidgetKeyFocus;
-		ILayer* mLayerMouseFocus;
-		// захватил ли мышь активный виджет
-		bool mIsWidgetMouseCapture;
-		// таймер для двойного клика
-	    Timer mTimer; //used for double click timing
-
-		// нажат ли шифт
-		bool mIsShiftPressed;
-		// нажат ли контрол
-		bool mIsControlPressed;
-		// там где была последний раз нажата левая кнопка
-		IntPoint mLastLeftPressed;
-		IntPoint mMousePosition;
-		// клавиша для повтора
-		KeyCode mHoldKey;
-		Char mHoldChar;
-		bool mFirstPressKey;
-		float mTimerKey;
-		int mOldAbsZ;
-
-		// список виджетов с модальным режимом
-		VectorWidgetPtr mVectorModalRootWidget;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_INPUT_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Instance.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Instance.h
deleted file mode 100644
index 8f6d79cdee..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Instance.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_INSTANCE_H__
-#define __MYGUI_INSTANCE_H__
-
-#define MYGUI_INSTANCE_HEADER(type) \
-	private: \
-		static type* msInstance; \
-		bool mIsInitialise; \
-	public: \
-		type();\
-		~type();\
-		static type& getInstance(); \
-		static type* getInstancePtr();
-
-
-#define MYGUI_INSTANCE_IMPLEMENT(type) \
-	const std::string INSTANCE_TYPE_NAME(#type); \
-	type* type::msInstance = nullptr; \
-	type* type::getInstancePtr() { return msInstance; } \
-	type& type::getInstance() { MYGUI_ASSERT(0 != msInstance, "instance " << INSTANCE_TYPE_NAME << " was not created"); return (*msInstance); } \
-	type::type() : mIsInitialise(false) { MYGUI_ASSERT(0 == msInstance, "instance " << INSTANCE_TYPE_NAME << " is exsist"); msInstance = this; } \
-	type::~type() { msInstance = nullptr; }
-
-#endif // __MYGUI_INSTANCE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ItemBox.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ItemBox.h
deleted file mode 100644
index f3ad3f8c7e..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ItemBox.h
+++ /dev/null
@@ -1,368 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_ITEM_BOX_H__
-#define __MYGUI_ITEM_BOX_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_DDContainer.h"
-#include "MyGUI_IBItemInfo.h"
-#include "MyGUI_Any.h"
-#include "MyGUI_EventPair.h"
-#include "MyGUI_ScrollViewBase.h"
-
-namespace MyGUI
-{
-
-	typedef delegates::CDelegate2<ItemBox*, Widget*> EventHandle_ItemBoxPtrWidgetPtr;
-	typedef delegates::CDelegate3<ItemBox*, IntCoord&, bool> EventHandle_ItemBoxPtrIntCoordRefBool;
-	typedef delegates::CDelegate3<ItemBox*, Widget*, const IBDrawItemInfo &> EventHandle_ItemBoxPtrWidgetPtrCIBCellDrawInfoRef;
-	typedef delegates::CDelegate2<ItemBox*, size_t> EventHandle_ItemBoxPtrSizeT;
-	typedef delegates::CDelegate2<ItemBox*, const IBNotifyItemData &> EventHandle_ItemBoxPtrCIBNotifyCellDataRef;
-
-	class MYGUI_EXPORT ItemBox :
-		public DDContainer,
-		protected ScrollViewBase
-	{
-		MYGUI_RTTI_DERIVED( ItemBox )
-
-	public:
-		ItemBox();
-
-		//------------------------------------------------------------------------------//
-		// манипуляции айтемами
-
-		//! Get number of items
-		size_t getItemCount() const { return mItemsInfo.size(); }
-
-		//! Insert an item into a array at a specified position
-		void insertItemAt(size_t _index, Any _data = Any::Null);
-
-		//! Add an item to the end of a array
-		void addItem(Any _data = Any::Null) { insertItemAt(ITEM_NONE, _data); }
-
-		//! Remove item at a specified position
-		void removeItemAt(size_t _index);
-
-		//! Remove all items
-		void removeAllItems();
-
-		//! Redraw at a specified position
-		void redrawItemAt(size_t _index);
-
-		//! Redraw all items
-		void redrawAllItems();
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции выделениями
-
-		//! Get index of selected item (ITEM_NONE if none selected)
-		size_t getIndexSelected() { return mIndexSelect; }
-
-		//! Select specified _index
-		void setIndexSelected(size_t _index);
-
-		//! Clear item selection
-		void clearIndexSelected() { setIndexSelected(ITEM_NONE); }
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции данными
-
-		//! Replace an item data at a specified position
-		void setItemDataAt(size_t _index, Any _data);
-
-		//! Clear an item data at a specified position
-		void clearItemDataAt(size_t _index) { setItemDataAt(_index, Any::Null); }
-
-		//! Get item data from specified position
-		template <typename ValueType>
-		ValueType * getItemDataAt(size_t _index, bool _throw = true)
-		{
-			MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ItemBox::getItemDataAt");
-			return mItemsInfo[_index].data.castType<ValueType>(_throw);
-		}
-
-
-		/** Set vertical alignment grid mode */
-		void setItemBoxAlignVert(bool _value);
-		/** Get vertical alignment grid mode flag */
-		bool getItemBoxAlignVert() { return mAlignVert; }
-
-		/** Get item index by item Widget pointer */
-		size_t getIndexByWidget(Widget* _widget);
-
-		/** Get widget created for drop */
-		Widget* getWidgetDrag() { return mItemDrag; }
-
-		/** Get item Widget pointer by item index if it is visible
-			@note returned widget can be deleted, so this pointer
-			is valid only at time when you got it and can be invalid
-			next frame
-		*/
-		Widget* getWidgetByIndex(size_t _index);
-
-		/** Interrupt drag as if widget was dropped into empty space */
-		void resetDrag();
-
-		//! @copydoc Widget::setPosition(const IntPoint& _value)
-		virtual void setPosition(const IntPoint& _value);
-		//! @copydoc Widget::setSize(const IntSize& _value)
-		virtual void setSize(const IntSize& _value);
-		//! @copydoc Widget::setCoord(const IntCoord& _value)
-		virtual void setCoord(const IntCoord& _value);
-
-		/** @copydoc Widget::setPosition(int _left, int _top) */
-		void setPosition(int _left, int _top) { setPosition(IntPoint(_left, _top)); }
-		/** @copydoc Widget::setSize(int _width, int _height) */
-		void setSize(int _width, int _height) { setSize(IntSize(_width, _height)); }
-		/** @copydoc Widget::setCoord(int _left, int _top, int _width, int _height) */
-		void setCoord(int _left, int _top, int _width, int _height) { setCoord(IntCoord(_left, _top, _width, _height)); }
-
-	/*event:*/
-		/** Event : request for creating new item
-			signature : void method(MyGUI::ItemBox* _sender, MyGUI::Widget* _item)
-			@param _sender widget that called this event
-			@param _item widget item pointer
-		*/
-		EventHandle_ItemBoxPtrWidgetPtr requestCreateWidgetItem;
-
-		/** Event : request for item coordinate
-			signature : void method(MyGUI::ItemBox* _sender, MyGUI::IntCoord& _coord, bool _drag)
-			@param _sender widget that called this event
-			@param _coord write heer item coordinate
-			@param _drag is this item dragging
-		*/
-		EventHandle_ItemBoxPtrIntCoordRefBool requestCoordItem;
-
-		/** Event : request for item redraw
-			signature : void method(MyGUI::ItemBox* _sender, MyGUI::Widget* _item, const MyGUI::IBDrawItemInfo& _info)
-			@param _sender widget that called this event
-			@param _item widget item pointer
-			@param _info item info
-		*/
-		EventHandle_ItemBoxPtrWidgetPtrCIBCellDrawInfoRef requestDrawItem;
-
-		/** Event : doubleclick or enter pressed on item
-			signature : void method(MyGUI::ItemBox* _sender, size_t _index)
-			@param _sender widget that called this event
-			@param _index item index
-		*/
-		EventHandle_ItemBoxPtrSizeT eventSelectItemAccept;
-
-		/** Event : position of selected item was changed
-			signature : void method(MyGUI::ItemBox* _sender, size_t _index)
-			@param _sender widget that called this event
-			@param _index item index
-		*/
-		EventHandle_ItemBoxPtrSizeT eventChangeItemPosition;
-
-		/** Event : click on item
-			signature : void method(MyGUI::ItemBox* _sender, size_t _index)
-			@param _sender widget that called this event
-			@param _index item index
-		*/
-		EventHandle_ItemBoxPtrSizeT eventMouseItemActivate;
-
-		/** Event : notify about event in item widget
-			signature : void method(MyGUI::ItemBox* _sender, const MyGUI::IBNotifyItemData& _info)
-			@param _sender widget that called this event
-			@param _info info about item notify
-		*/
-		EventHandle_ItemBoxPtrCIBNotifyCellDataRef eventNotifyItem;
-
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void Widget::setCoord(const IntCoord& _coord)")
-		void setPosition(const IntCoord& _coord) { setCoord(_coord); }
-		MYGUI_OBSOLETE("use : void Widget::setCoord(int _left, int _top, int _width, int _height)")
-		void setPosition(int _left, int _top, int _width, int _height) { setCoord(_left, _top, _width, _height); }
-
-		MYGUI_OBSOLETE("use : size_t ItemBox::getItemIndexSelected()")
-		size_t getItemIndexSelected() { return getIndexSelected(); }
-		MYGUI_OBSOLETE("use : void ItemBox::setIndexSelected(size_t _index)")
-		void setItemSelectedAt(size_t _index) { setIndexSelected(_index); }
-		MYGUI_OBSOLETE("use : void ItemBox::clearIndexSelected()")
-		void clearItemSelected() { clearIndexSelected(); }
-
-		MYGUI_OBSOLETE("use : void ItemBox::insertItemAt(size_t _index, Any _data)")
-		void insertItem(size_t _index, Any _data = Any::Null) { insertItemAt(_index, _data); }
-		MYGUI_OBSOLETE("use : void ItemBox::setItemDataAt(size_t _index, Any _data)")
-		void setItemData(size_t _index, Any _data) { setItemDataAt(_index, _data); }
-		MYGUI_OBSOLETE("use : void ItemBox::removeItemAt(size_t _index)")
-		void deleteItem(size_t _index) { removeItemAt(_index); }
-		MYGUI_OBSOLETE("use : void ItemBox::removeAllItems()")
-		void deleteAllItems() { removeAllItems(); }
-		MYGUI_OBSOLETE("use : size_t ItemBox::getIndexSelected()")
-		size_t getItemSelect() { return getIndexSelected(); }
-		MYGUI_OBSOLETE("use : void ItemBox::clearIndexSelected()")
-		void resetItemSelect() { clearIndexSelected(); }
-		MYGUI_OBSOLETE("use : void ItemBox::setIndexSelected(size_t _index)")
-		void setItemSelect(size_t _index) { setIndexSelected(_index); }
-
-		MYGUI_OBSOLETE("use : Widget* ItemBox::getWidgetDrag()")
-		Widget* getWidgetDrop() { return getWidgetDrag(); }
-		MYGUI_OBSOLETE("use : void ItemBox::resetDrag()")
-		void resetDrop() { resetDrag(); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-
-	protected:
-		virtual ~ItemBox();
-
-		struct ItemDataInfo
-		{
-			ItemDataInfo(Any _data) :
-				data(_data) { }
-			Any data;
-		};
-		typedef std::vector<ItemDataInfo> VectorItemInfo;
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		virtual void onMouseButtonPressed(int _left, int _top, MouseButton _id);
-		virtual void onMouseButtonReleased(int _left, int _top, MouseButton _id);
-		virtual void onMouseDrag(int _left, int _top);
-
-		virtual void onMouseWheel(int _rel);
-		virtual void onKeyLostFocus(Widget* _new);
-		virtual void onKeySetFocus(Widget* _old);
-
-		void notifyKeyButtonPressed(Widget* _sender, KeyCode _key, Char _char);
-		void notifyKeyButtonReleased(Widget* _sender, KeyCode _key);
-		void notifyScrollChangePosition(VScroll* _sender, size_t _index);
-		void notifyMouseWheel(Widget* _sender, int _rel);
-		void notifyRootMouseChangeFocus(Widget* _sender, bool _focus);
-		void notifyMouseButtonDoubleClick(Widget* _sender);
-		void _requestGetContainer(Widget* _sender, Widget*& _container, size_t& _index);
-		void notifyMouseDrag(Widget* _sender, int _left, int _top);
-		void notifyMouseButtonPressed(Widget* _sender, int _left, int _top, MouseButton _id);
-		void notifyMouseButtonReleased(Widget* _sender, int _left, int _top, MouseButton _id);
-
-
-		virtual void removeDropItems();
-		virtual void updateDropItems();
-		virtual void updateDropItemsState(const DDWidgetState& _state);
-
-		// Обновляет данные о айтемах, при изменении размеров
-		void updateMetrics();
-
-		// просто обновляет все виджеты что видны
-		void _updateAllVisible(bool _redraw);
-
-		void updateFromResize();
-
-		// возвращает следующий айтем, если нет его, то создается
-		// запросы только последовательно
-		Widget* getItemWidget(size_t _index);
-
-		void _setContainerItemInfo(size_t _index, bool _set, bool _accept);
-
-		// сбрасываем старую подсветку
-		void resetCurrentActiveItem();
-		// ищет и устанавливает подсвеченный айтем
-		void findCurrentActiveItem();
-
-		// запрашиваем у конейтера айтем по позиции мыши
-		virtual size_t _getContainerIndex(const IntPoint& _point);
-
-		// сбрасывает зависимости, при любом колличественном изменении
-		virtual void _resetContainer(bool _update);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-		size_t calcIndexByWidget(Widget* _widget);
-
-		void requestItemSize();
-
-		virtual IntSize getContentSize();
-		virtual IntPoint getContentPosition();
-		virtual IntSize getViewSize() const;
-		virtual void eraseContent();
-		virtual size_t getHScrollPage();
-		virtual size_t getVScrollPage();
-		virtual Align getContentAlign();
-		virtual void setContentPosition(const IntPoint& _point);
-
-		IntRect _getClientAbsoluteRect();
-		Widget* _getClientWidget();
-		const Widget* _getClientWidget() const;
-
-	private:
-		// наши дети в строках
-		VectorWidgetPtr mVectorItems;
-
-		// размер одного айтема
-		IntSize mSizeItem;
-
-		// размерность скролла в пикселях
-		IntSize mContentSize;
-		// позиция скролла п пикселях
-		IntPoint mContentPosition;
-
-		// колличество айтемов в одной строке
-		int mCountItemInLine;
-		// колличество линий
-		int mCountLines;
-
-		// самая верхняя строка
-		int mFirstVisibleIndex;
-		// текущее смещение верхнего элемента в пикселях
-		// сколько его пикселей не видно сверху
-		int mFirstOffsetIndex;
-
-		// текущий выделенный элемент или ITEM_NONE
-		size_t mIndexSelect;
-		// подсвеченный элемент или ITEM_NONE
-		size_t mIndexActive;
-		// индекс со свойством приема или ITEM_NONE
-		size_t mIndexAccept;
-		// индекс со свойством отказа или ITEM_NONE
-		size_t mIndexRefuse;
-
-		// имеем ли мы фокус ввода
-		bool mIsFocus;
-
-		// структура данных об айтеме
-		VectorItemInfo mItemsInfo;
-
-		Widget* mItemDrag;
-		IntPoint mPointDragOffset;
-
-		bool mAlignVert;
-
-		std::string mDragLayer;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_ITEM_BOX_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LanguageManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LanguageManager.h
deleted file mode 100644
index 3ad168022d..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LanguageManager.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_LANGUAGE_MANAGER_H__
-#define __MYGUI_LANGUAGE_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_Delegate.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT LanguageManager
-	{
-		MYGUI_INSTANCE_HEADER( LanguageManager )
-
-	public:
-		void initialise();
-		void shutdown();
-
-		/** Load additional MyGUI *_language.xml file */
-		bool load(const std::string& _file);
-
-		void _load(xml::ElementPtr _node, const std::string& _file, Version _version);
-
-		/** Set current language for replacing #{} tags */
-		void setCurrentLanguage(const std::string& _name);
-		/** Get current language */
-		const std::string& getCurrentLanguage();
-
-		/** Replace all tags #{tagname} in _line with appropriate string dependent
-		on current language or keep #{tagname} if 'tagname' not found found */
-		UString replaceTags(const UString& _line);
-
-		/** Get tag value */
-		UString getTag(const UString& _tag);
-
-		/** Add user tag */
-		void addUserTag(const UString& _tag, const UString& _replace);
-
-		/** Delete all user tags */
-		void clearUserTags();
-
-		bool loadUserTags(const std::string& _file);
-
-		/** Event : Change current language.\n
-			signature : void method(const std::string& _language);
-			@param _language Current language.
-		*/
-		delegates::CMultiDelegate1<const std::string &> eventChangeLanguage;
-
-	private:
-		//bool loadResourceLanguage(const std::string& _name);
-		bool loadLanguage(const std::string& _file, bool _user = false);
-		void _loadLanguage(IDataStream* _stream, bool _user);
-		void _loadLanguageXML(IDataStream* _stream, bool _user);
-		//void _loadSource(xml::ElementPtr _node, const std::string& _file, Version _version);
-
-	private:
-		typedef std::map<UString, UString> MapLanguageString;
-
-		MapLanguageString mMapLanguage;
-		MapLanguageString mUserMapLanguage;
-
-		std::string mCurrentLanguageName;
-
-		typedef std::vector<std::string> VectorString;
-		typedef std::map<std::string, VectorString> MapListString;
-		MapListString mMapFile;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_LANGUAGE_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LayerItem.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LayerItem.h
deleted file mode 100644
index 59098f7d34..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LayerItem.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_LAYER_ITEM_H__
-#define __MYGUI_LAYER_ITEM_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_ILayer.h"
-#include "MyGUI_ILayerNode.h"
-#include "MyGUI_ILayerItem.h"
-#include "MyGUI_ISubWidget.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT LayerItem : public ILayerItem
-	{
-	public:
-		LayerItem();
-		virtual ~LayerItem() { }
-
-	public:
-		ILayer* getLayer() { return mLayer; }
-
-		virtual void attachItemToNode(ILayer* _layer, ILayerNode* _node);
-		virtual void detachFromLayer();
-		virtual void upLayerItem();
-
-		void setRenderItemTexture(ITexture* _texture);
-
-		void addChildItem(LayerItem* _item);
-		void removeChildItem(LayerItem* _item);
-
-		void addChildNode(LayerItem* _item);
-		void removeChildNode(LayerItem* _item);
-
-		void addRenderItem(ISubWidget* _item);
-		void removeAllRenderItems();
-
-		void saveLayerItem();
-		void restoreLayerItem();
-
-	protected:
-		void attachToLayerItemNode(ILayerNode* _node, bool _deep);
-		void detachFromLayerItemNode(bool _deep);
-
-	private:
-		// актуально для рутового виджета
-		ILayer* mLayer;
-		// конкретный айтем находящийся в слое
-		ILayerNode * mLayerNode;
-		ILayerNode * mSaveLayerNode;
-
-		typedef std::vector<LayerItem*> VectorLayerItem;
-		// список наших детей айтемов
-		VectorLayerItem mLayerItems;
-		// список наших узлов
-		VectorLayerItem mLayerNodes;
-
-		// вектор всех детей сабскинов
-		VectorSubWidget mDrawItems;
-
-		ITexture* mTexture;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_LAYER_ITEM_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LayerManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LayerManager.h
deleted file mode 100644
index b5413c3ff1..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LayerManager.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_LAYER_MANAGER_H__
-#define __MYGUI_LAYER_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_Enumerator.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_IUnlinkWidget.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_ILayer.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT LayerManager :
-		public IUnlinkWidget
-	{
-		MYGUI_INSTANCE_HEADER( LayerManager )
-
-	public:
-		typedef std::vector<ILayer*> VectorLayer;
-		typedef Enumerator<VectorLayer> EnumeratorLayer;
-
-	public:
-		void initialise();
-		void shutdown();
-
-		/** Attach widget to specific layer
-			@param _name Layer name
-			@param _item Widget pointer
-		*/
-		void attachToLayerNode(const std::string& _name, Widget* _item);
-		/** Detach widget from layer
-			@param _item Widget pointer
-		*/
-		void detachFromLayer(Widget* _item);
-
-		/** Up widget to be on top of its layer
-			@param _item Widget pointer
-		*/
-		void upLayerItem(Widget* _item);
-
-		/** Load additional MyGUI *_layer.xml file */
-		bool load(const std::string& _file);
-		void _load(xml::ElementPtr _node, const std::string& _file, Version _version);
-
-		/** Check is layer exist */
-		bool isExist(const std::string& _name) const;
-		/** Get layer nodes Enumerator */
-		EnumeratorLayer getEnumerator() { return EnumeratorLayer(mLayerNodes); }
-
-		ILayer* getByName(const std::string& _name, bool _throw = true) const;
-
-		/** Get top visible and enabled widget at specified position */
-		Widget* getWidgetFromPoint(int _left, int _top);
-
-		void renderToTarget(IRenderTarget* _target, bool _update);
-
-		virtual void dumpStatisticToLog();
-
-	private:
-		// удаляем данный виджет из всех возможных мест
-		void _unlinkWidget(Widget* _widget);
-
-		void clear();
-
-		void merge(VectorLayer& _layers);
-		void destroy(ILayer* _layer);
-
-	private:
-		VectorLayer mLayerNodes;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_LAYER_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LayerNode.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LayerNode.h
deleted file mode 100644
index 36ad2b8d1c..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LayerNode.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_LAYER_NODE_H__
-#define __MYGUI_LAYER_NODE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_ILayer.h"
-#include "MyGUI_ILayerNode.h"
-#include "MyGUI_RenderItem.h"
-
-namespace MyGUI
-{
-
-	class LayerItem;
-	typedef std::vector<RenderItem*> VectorRenderItem;
-	typedef std::vector<ILayerItem*> VectorLayerItem;
-
-	class MYGUI_EXPORT LayerNode : public ILayerNode
-	{
-		MYGUI_RTTI_DERIVED( LayerNode )
-
-	public:
-		explicit LayerNode(ILayer* _layer, ILayerNode * _parent = nullptr);
-		virtual ~LayerNode();
-
-		// леер, которому мы принадлежим
-		virtual ILayer* getLayer() { return mLayer; }
-
-		// возвращает отца или nullptr
-		virtual ILayerNode* getParent() { return mParent; }
-
-		// создаем дочерний нод
-		virtual ILayerNode* createChildItemNode();
-		// удаляем дочерний нод
-		virtual void destroyChildItemNode(ILayerNode* _node);
-
-		// поднимаем дочерний нод
-		virtual void upChildItemNode(ILayerNode* _node);
-
-		// список детей
-		virtual EnumeratorILayerNode getEnumerator();
-
-		// добавляем айтем к ноду
-		virtual void attachLayerItem(ILayerItem* _item);
-		// удаляем айтем из нода
-		virtual void detachLayerItem(ILayerItem* _item);
-
-		// добавляет саб айтем и возвращает рендер айтем
-		virtual RenderItem* addToRenderItem(ITexture* _texture, ISubWidget* _item);
-		// необходимо обновление нода
-		virtual void outOfDate(RenderItem* _item);
-
-		// возвращает виджет по позиции
-		virtual ILayerItem* getLayerItemByPoint(int _left, int _top);
-
-		// рисует леер
-		virtual void renderToTarget(IRenderTarget* _target, bool _update);
-
-		virtual void dumpStatisticToLog(size_t _level);
-
-		bool isOutOfDate() { return mOutOfDate; }
-
-	protected:
-		void updateCompression();
-
-	protected:
-		// список двух очередей отрисовки, для сабскинов и текста
-		VectorRenderItem mFirstRenderItems;
-		VectorRenderItem mSecondRenderItems;
-
-		// список всех рутовых виджетов
-		// у перекрывающегося слоя здесь только один
-		VectorLayerItem mLayerItems;
-
-		// список такиж как мы, для построения дерева
-		VectorILayerNode mChildItems;
-
-		ILayerNode * mParent;
-		ILayer* mLayer;
-		bool mOutOfDate;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_LAYER_NODE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LayoutManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LayoutManager.h
deleted file mode 100644
index ff57a917b9..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LayoutManager.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_LAYOUT_MANAGER_H__
-#define __MYGUI_LAYOUT_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_WidgetDefines.h"
-#include "MyGUI_Gui.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT LayoutManager
-	{
-		MYGUI_INSTANCE_HEADER( LayoutManager )
-
-	public:
-		void initialise();
-		void shutdown();
-
-		/** Load layout file
-			@param _file name of layout
-			@return Return vector of pointers of loaded root widgets (root == without parents)
-		*/
-		VectorWidgetPtr& load(const std::string& _file);
-		void _load(xml::ElementPtr _node, const std::string& _file, Version _version);
-
-		/** Load layout file
-			@param _file name of layout
-			@param _prefix will be added to all loaded widgets names
-			@param _parent widget to load on
-			@return Return vector of pointers of loaded root widgets (root == without parents)
-		*/
-		VectorWidgetPtr& loadLayout(const std::string& _file, const std::string& _prefix = "", Widget* _parent = nullptr);
-
-		/** Unload layout file */
-		void unloadLayout(VectorWidgetPtr& _widgets);
-
-	private:
-		void parseLayout(VectorWidgetPtr& _widgets, xml::ElementPtr _root);
-		void parseWidget(VectorWidgetPtr& _widgets, xml::ElementEnumerator& _widget, Widget* _parent);
-
-	private:
-		// для возврата последней загрузки
-		VectorWidgetPtr mVectorWidgetPtr;
-
-		// префикс при загрузке лейаута
-		std::string layoutPrefix;
-		// префикс при загрузке лейаута
-		Widget* layoutParent;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_LAYOUT_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_List.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_List.h
deleted file mode 100644
index 6a6cbeb1a5..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_List.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_LIST_H__
-#define __MYGUI_LIST_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_Any.h"
-#include "MyGUI_EventPair.h"
-
-namespace MyGUI
-{
-
-	typedef delegates::CDelegate2<List*, size_t> EventHandle_ListPtrSizeT;
-
-	class MYGUI_EXPORT List :
-		public Widget
-	{
-		MYGUI_RTTI_DERIVED( List )
-
-	public:
-		List();
-
-		//------------------------------------------------------------------------------//
-		// манипуляции айтемами
-
-		//! Get number of items
-		size_t getItemCount() const { return mItemsInfo.size(); }
-
-		//! Insert an item into a array at a specified position
-		void insertItemAt(size_t _index, const UString& _name, Any _data = Any::Null);
-
-		//! Add an item to the end of a array
-		void addItem(const UString& _name, Any _data = Any::Null) { insertItemAt(ITEM_NONE, _name, _data); }
-
-		//! Remove item at a specified position
-		void removeItemAt(size_t _index);
-
-		//! Remove all items
-		void removeAllItems();
-
-		//! Swap items at a specified positions
-		void swapItemsAt(size_t _index1, size_t _index2);
-
-
-		//! Search item, returns the position of the first occurrence in array or ITEM_NONE if item not found
-		size_t findItemIndexWith(const UString& _name);
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции выделениями
-
-		/** Get index of selected item (ITEM_NONE if none selected) */
-		size_t getIndexSelected() { return mIndexSelect; }
-
-		/** Select specified _index */
-		void setIndexSelected(size_t _index);
-
-		/** Clear item selection */
-		void clearIndexSelected() { setIndexSelected(ITEM_NONE); }
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции данными
-
-		//! Replace an item data at a specified position
-		void setItemDataAt(size_t _index, Any _data);
-
-		//! Clear an item data at a specified position
-		void clearItemDataAt(size_t _index) { setItemDataAt(_index, Any::Null); }
-
-		//! Get item data from specified position
-		template <typename ValueType>
-		ValueType * getItemDataAt(size_t _index, bool _throw = true)
-		{
-			MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "List::getItemDataAt");
-			return mItemsInfo[_index].second.castType<ValueType>(_throw);
-		}
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции отображением
-
-		//! Replace an item name at a specified position
-		void setItemNameAt(size_t _index, const UString& _name);
-
-		//! Get item name from specified position
-		const UString& getItemNameAt(size_t _index);
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции выдимостью
-
-		//! Move all elements so specified becomes visible
-		void beginToItemAt(size_t _index);
-
-		//! Move all elements so first becomes visible
-		void beginToItemFirst() { if (getItemCount()) beginToItemAt(0); }
-
-		//! Move all elements so last becomes visible
-		void beginToItemLast() { if (getItemCount()) beginToItemAt(getItemCount() - 1); }
-
-		//! Move all elements so selected becomes visible
-		void beginToItemSelected() { if (getIndexSelected() != ITEM_NONE) beginToItemAt(getIndexSelected()); }
-
-		//------------------------------------------------------------------------------//
-
-		// видим ли мы элемент, полностью или нет
-		/** Return true if item visible
-			@param
-				_index of item
-			@param
-				_fill false: function return true when whole item is visible
-				      true: function return true when at least part of item is visible
-		*/
-		bool isItemVisibleAt(size_t _index, bool _fill = true);
-		//! Same as List::isItemVisible for selected item
-		bool isItemSelectedVisible(bool _fill = true) { return isItemVisibleAt(mIndexSelect, _fill); }
-
-
-		//! Set scroll visible when it needed
-		void setScrollVisible(bool _visible);
-		//! Set scroll position
-		void setScrollPosition(size_t _position);
-
-		//------------------------------------------------------------------------------------//
-
-		//! @copydoc Widget::setPosition(const IntPoint& _value)
-		virtual void setPosition(const IntPoint& _value);
-		//! @copydoc Widget::setSize(const IntSize& _value)
-		virtual void setSize(const IntSize& _value);
-		//! @copydoc Widget::setCoord(const IntCoord& _value)
-		virtual void setCoord(const IntCoord& _value);
-
-		/** @copydoc Widget::setPosition(int _left, int _top) */
-		void setPosition(int _left, int _top) { setPosition(IntPoint(_left, _top)); }
-		/** @copydoc Widget::setSize(int _width, int _height) */
-		void setSize(int _width, int _height) { setSize(IntSize(_width, _height)); }
-		/** @copydoc Widget::setCoord(int _left, int _top, int _width, int _height) */
-		void setCoord(int _left, int _top, int _width, int _height) { setCoord(IntCoord(_left, _top, _width, _height)); }
-
-		// возвращает максимальную высоту вмещающую все строки и родительский бордюр
-		//! Return optimal height to fit all items in List
-		int getOptimalHeight();
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*event:*/
-		/** Event : Enter pressed or double click.\n
-			signature : void method(MyGUI::List* _sender, size_t _index)\n
-			@param _sender widget that called this event
-			@param _index of selected item
-		*/
-		EventPair<EventHandle_WidgetSizeT, EventHandle_ListPtrSizeT> eventListSelectAccept;
-
-		/** Event : Selected item position changed.\n
-			signature : void method(MyGUI::List* _sender, size_t _index)\n
-			@param _sender widget that called this event
-			@param _index of new item
-		*/
-		EventPair<EventHandle_WidgetSizeT, EventHandle_ListPtrSizeT> eventListChangePosition;
-
-		/** Event : Item was selected by mouse.\n
-			signature : void method(MyGUI::List* _sender, size_t _index)\n
-			@param _sender widget that called this event
-			@param _index of selected item
-		*/
-		EventPair<EventHandle_WidgetSizeT, EventHandle_ListPtrSizeT> eventListMouseItemActivate;
-
-		/** Event : Mouse is over item.\n
-			signature : void method(MyGUI::List* _sender, size_t _index)\n
-			@param _sender widget that called this event
-			@param _index of focused item
-		*/
-		EventPair<EventHandle_WidgetSizeT, EventHandle_ListPtrSizeT> eventListMouseItemFocus;
-
-		/** Event : Position of scroll changed.\n
-			signature : void method(MyGUI::List* _sender, size_t _position)\n
-			@param _sender widget that called this event
-			@param _position of scroll
-		*/
-		EventPair<EventHandle_WidgetSizeT, EventHandle_ListPtrSizeT> eventListChangeScroll;
-
-	/*internal:*/
-		// дебажная проверка на правильность выравнивания списка
-		void _checkAlign();
-
-		// вспомогательные методы для составных списков
-		void _setItemFocus(size_t _position, bool _focus);
-		void _sendEventChangeScroll(size_t _position);
-
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void Widget::setCoord(const IntCoord& _coord)")
-		void setPosition(const IntCoord& _coord) { setCoord(_coord); }
-		MYGUI_OBSOLETE("use : void Widget::setCoord(int _left, int _top, int _width, int _height)")
-		void setPosition(int _left, int _top, int _width, int _height) { setCoord(_left, _top, _width, _height); }
-
-		MYGUI_OBSOLETE("use : size_t List::getIndexSelected()")
-		size_t getItemIndexSelected() { return getIndexSelected(); }
-		MYGUI_OBSOLETE("use : void List::setIndexSelected(size_t _index)")
-		void setItemSelectedAt(size_t _index) { setIndexSelected(_index); }
-		MYGUI_OBSOLETE("use : void List::clearIndexSelected()")
-		void clearItemSelected() { clearIndexSelected(); }
-
-		MYGUI_OBSOLETE("use : void List::insertItemAt(size_t _index, const UString& _name)")
-		void insertItem(size_t _index, const UString& _item) { insertItemAt(_index, _item); }
-		MYGUI_OBSOLETE("use : void List::setItemNameAt(size_t _index, const UString& _name)")
-		void setItem(size_t _index, const UString& _item) { setItemNameAt(_index, _item); }
-		MYGUI_OBSOLETE("use : const UString& List::getItemNameAt(size_t _index)")
-		const UString& getItem(size_t _index) { return getItemNameAt(_index); }
-		MYGUI_OBSOLETE("use : void List::removeItemAt(size_t _index)")
-		void deleteItem(size_t _index) { removeItemAt(_index); }
-		MYGUI_OBSOLETE("use : void List::removeAllItems()")
-		void deleteAllItems() { removeAllItems(); }
-		MYGUI_OBSOLETE("use : size_t List::findItemIndexWith(const UString& _name)")
-		size_t findItem(const UString& _item) { return findItemIndexWith(_item); }
-		MYGUI_OBSOLETE("use : size_t List::getIndexSelected()")
-		size_t getItemSelect() { return getIndexSelected(); }
-		MYGUI_OBSOLETE("use : void List::clearIndexSelected()")
-		void resetItemSelect() { clearIndexSelected(); }
-		MYGUI_OBSOLETE("use : void List::setIndexSelected(size_t _index)")
-		void setItemSelect(size_t _index) { setIndexSelected(_index); }
-		MYGUI_OBSOLETE("use : void List::beginToItemAt(size_t _index)")
-		void beginToIndex(size_t _index) { beginToItemAt(_index); }
-		MYGUI_OBSOLETE("use : void List::beginToItemFirst()")
-		void beginToStart() { beginToItemFirst(); }
-		MYGUI_OBSOLETE("use : void List::beginToItemLast()")
-		void beginToEnd() { beginToItemLast(); }
-		MYGUI_OBSOLETE("use : void List::beginToItemSelected()")
-		void beginToSelect() { beginToItemSelected(); }
-		MYGUI_OBSOLETE("use : bool List::isItemVisibleAt(size_t _index, bool _fill)")
-		bool isItemVisible(size_t _index, bool _fill = true) { return isItemVisibleAt(_index, _fill); }
-		MYGUI_OBSOLETE("use : bool List::isItemSelectedVisible(bool _fill)")
-		bool isItemSelectVisible(bool _fill = true) { return isItemSelectedVisible(_fill); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	protected:
-		virtual ~List();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		void onMouseWheel(int _rel);
-		void onKeyLostFocus(Widget* _new);
-		void onKeySetFocus(Widget* _old);
-		void onKeyButtonPressed(KeyCode _key, Char _char);
-
-		void notifyScrollChangePosition(VScroll* _sender, size_t _rel);
-		void notifyMousePressed(Widget* _sender, int _left, int _top, MouseButton _id);
-		void notifyMouseDoubleClick(Widget* _sender);
-		void notifyMouseWheel(Widget* _sender, int _rel);
-		void notifyMouseSetFocus(Widget* _sender, Widget* _old);
-		void notifyMouseLostFocus(Widget* _sender, Widget* _new);
-
-		void updateScroll();
-		void updateLine(bool _reset = false);
-		void _setScrollView(size_t _position);
-
-		// перерисовывает от индекса до низа
-		void _redrawItemRange(size_t _start = 0);
-
-		// перерисовывает индекс
-		void _redrawItem(size_t _index);
-
-		// ищет и выделяет елемент
-		void _selectIndex(size_t _index, bool _select);
-
-		void _updateState() { setState(mIsFocus ? "pushed" : "normal"); }
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-		void _checkMapping(const std::string& _owner);
-
-		Widget* _getClientWidget();
-		const Widget* _getClientWidget() const;
-
-	private:
-		std::string mSkinLine;
-		VScroll* mWidgetScroll;
-
-		// наши дети в строках
-		VectorWidgetPtr mWidgetLines;
-
-		int mHeightLine; // высота одной строки
-		int mTopIndex; // индекс самого верхнего элемента
-		int mOffsetTop; // текущее смещение
-		int mRangeIndex; // размерность скрола
-		size_t mLastRedrawLine; // последняя перерисованная линия
-
-		size_t mIndexSelect; // текущий выделенный элемент или ITEM_NONE
-		size_t mLineActive; // текущий виджет над которым мыша
-
-		typedef std::pair<UString, Any> PairItem;
-		typedef std::vector<PairItem> VectorItemInfo;
-		VectorItemInfo mItemsInfo;
-
-		// имеем ли мы фокус ввода
-		bool mIsFocus;
-		bool mNeedVisibleScroll;
-
-		IntSize mOldSize;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_LIST_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ListBox.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ListBox.h
deleted file mode 100644
index a090eb498d..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ListBox.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_LIST_BOX_H__
-#define __MYGUI_LIST_BOX_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_ListCtrl.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ListBox :
-		public ListCtrl
-	{
-		MYGUI_RTTI_DERIVED( ListBox )
-
-	public:
-		ListBox();
-
-		//------------------------------------------------------------------------------//
-		// ����������� ��������
-
-		//! Get number of items
-		size_t getItemCount() const { return mItemsInfo.size(); }
-
-		//! Insert an item into a array at a specified position
-		void insertItemAt(size_t _index, const UString& _name, Any _data = Any::Null);
-
-		//! Add an item to the end of a array
-		void addItem(const UString& _name, Any _data = Any::Null) { insertItemAt(ITEM_NONE, _name, _data); }
-
-		//! Remove item at a specified position
-		void removeItemAt(size_t _index);
-
-		//! Remove all items
-		void removeAllItems();
-
-		//! Swap items at a specified positions
-		void swapItemsAt(size_t _index1, size_t _index2);
-
-		//! Search item, returns the position of the first occurrence in array or ITEM_NONE if item not found
-		size_t findItemIndexWith(const UString& _name);
-
-
-		//------------------------------------------------------------------------------//
-		// ����������� �����������
-
-		/** Get index of selected item (ITEM_NONE if none selected) */
-		size_t getIndexSelected() { return Base::getIndexSelected(); }
-
-		/** Select specified _index */
-		void setIndexSelected(size_t _index) { Base::setIndexSelected(_index); }
-
-		/** Clear item selection */
-		void clearIndexSelected() { Base::clearIndexSelected(); }
-
-
-		//------------------------------------------------------------------------------//
-		// ����������� �������
-
-		//! Replace an item data at a specified position
-		void setItemDataAt(size_t _index, Any _data) { Base::setItemDataAt(_index, _data); }
-
-		//! Clear an item data at a specified position
-		void clearItemDataAt(size_t _index) { Base::clearItemDataAt(_index); }
-
-		//! Get item data from specified position
-		template <typename ValueType>
-		ValueType * getItemDataAt(size_t _index, bool _throw = true)
-		{
-			return Base::getItemDataAt<ValueType>(_index, _throw);
-		}
-
-
-		//------------------------------------------------------------------------------//
-		// ����������� ������������
-
-		//! Replace an item name at a specified position
-		void setItemNameAt(size_t _index, const UString& _name);
-
-		//! Get item name from specified position
-		const UString& getItemNameAt(size_t _index);
-
-
-		//------------------------------------------------------------------------------//
-		// ����������� ����������
-
-		//! Move all elements so specified becomes visible
-		void beginToItemAt(size_t _index);
-
-		//! Move all elements so first becomes visible
-		void beginToItemFirst() { if (getItemCount()) beginToItemAt(0); }
-
-		//! Move all elements so last becomes visible
-		void beginToItemLast() { if (getItemCount()) beginToItemAt(getItemCount() - 1); }
-
-		//! Move all elements so selected becomes visible
-		void beginToItemSelected() { if (getIndexSelected() != ITEM_NONE) beginToItemAt(getIndexSelected()); }
-
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	protected:
-		virtual ~ListBox();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-		void notifyCreateWidgetItem(MyGUI::ListCtrl* _sender, MyGUI::Widget* _item);
-		void notifyDrawItem(MyGUI::ListCtrl* _sender, MyGUI::Widget* _item, const MyGUI::IBDrawItemInfo& _info, MyGUI::IntCoord& _coord);
-
-	private:
-		std::string mSkinLine;
-		int mHeightLine;
-
-		typedef std::vector<UString> VectorUTFString;
-		VectorUTFString mItemsInfo;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_LIST_BOX_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ListCtrl.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ListCtrl.h
deleted file mode 100644
index ad235966c9..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ListCtrl.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_LIST_CTRL_H__
-#define __MYGUI_LIST_CTRL_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_DDContainer.h"
-#include "MyGUI_IBItemInfo.h"
-#include "MyGUI_Any.h"
-#include "MyGUI_EventPair.h"
-#include "MyGUI_ScrollViewBase.h"
-
-namespace MyGUI
-{
-
-	typedef delegates::CDelegate2<ListCtrl*, Widget*> EventHandle_ListCtrlPtrWidgetPtr;
-	typedef delegates::CDelegate4<ListCtrl*, Widget*, const IBDrawItemInfo &, IntCoord&> EventHandle_ListCtrlPtrWidgetPtrCIBCellDrawInfoRef;
-	typedef delegates::CDelegate2<ListCtrl*, size_t> EventHandle_ListCtrlPtrSizeT;
-	typedef delegates::CDelegate2<ListCtrl*, const IBNotifyItemData &> EventHandle_ListCtrlPtrCIBNotifyCellDataRef;
-
-	class MYGUI_EXPORT ListCtrl :
-		public DDContainer,
-		protected ScrollViewBase
-	{
-		MYGUI_RTTI_DERIVED( ListCtrl )
-
-	public:
-		ListCtrl();
-
-		//------------------------------------------------------------------------------//
-		// манипуляции айтемами
-
-		//! Get number of items
-		size_t getItemCount() const { return mItemsInfo.size(); }
-
-		//! Insert an item into a array at a specified position
-		void insertItemAt(size_t _index, Any _data = Any::Null);
-
-		//! Add an item to the end of a array
-		void addItem(Any _data = Any::Null) { insertItemAt(ITEM_NONE, _data); }
-
-		//! Remove item at a specified position
-		void removeItemAt(size_t _index);
-
-		//! Remove all items
-		void removeAllItems();
-
-		//! Redraw at a specified position
-		void redrawItemAt(size_t _index);
-
-		//! Redraw all items
-		void redrawAllItems() { _updateAllVisible(ITEM_NONE, true, true); }
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции выделениями
-
-		//! Get index of selected item (ITEM_NONE if none selected)
-		size_t getIndexSelected() { return mIndexSelect; }
-
-		//! Select specified _index
-		void setIndexSelected(size_t _index);
-
-		//! Clear item selection
-		void clearIndexSelected() { setIndexSelected(ITEM_NONE); }
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции данными
-
-		//! Replace an item data at a specified position
-		void setItemDataAt(size_t _index, Any _data);
-
-		//! Clear an item data at a specified position
-		void clearItemDataAt(size_t _index) { setItemDataAt(_index, Any::Null); }
-
-		//! Get item data from specified position
-		template <typename ValueType>
-		ValueType * getItemDataAt(size_t _index, bool _throw = true)
-		{
-			MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ListCtrl::getItemDataAt");
-			return mItemsInfo[_index].data.castType<ValueType>(_throw);
-		}
-
-
-		/** Get item index by item Widget pointer */
-		size_t getIndexByWidget(Widget* _widget);
-
-		/** Get widget created for drop */
-		Widget* getWidgetDrag() { return mItemDrag; }
-
-		/** Get item Widget pointer by item index if it is visible
-			@note returned widget can be deleted, so this pointer
-			is valid only at time when you got it and can be invalid
-			next frame
-		*/
-		Widget* getWidgetByIndex(size_t _index);
-
-		/** Interrupt drag as if widget was dropped into empty space */
-		void resetDrag();
-
-		//! @copydoc Widget::setPosition(const IntPoint& _value)
-		virtual void setPosition(const IntPoint& _value);
-		//! @copydoc Widget::setSize(const IntSize& _value)
-		virtual void setSize(const IntSize& _value);
-		//! @copydoc Widget::setCoord(const IntCoord& _value)
-		virtual void setCoord(const IntCoord& _value);
-
-		/** @copydoc Widget::setPosition(int _left, int _top) */
-		void setPosition(int _left, int _top) { setPosition(IntPoint(_left, _top)); }
-		/** @copydoc Widget::setSize(int _width, int _height) */
-		void setSize(int _width, int _height) { setSize(IntSize(_width, _height)); }
-		/** @copydoc Widget::setCoord(int _left, int _top, int _width, int _height) */
-		void setCoord(int _left, int _top, int _width, int _height) { setCoord(IntCoord(_left, _top, _width, _height)); }
-
-
-	/*event:*/
-		/** Event : request for creating new item
-			signature : void method(MyGUI::ListCtrl* _sender, MyGUI::Widget* _item)
-			@param _sender widget that called this event
-			@param _item widget item pointer
-		*/
-		EventHandle_ListCtrlPtrWidgetPtr requestCreateWidgetItem;
-
-		/** Event : request for item redraw
-			signature : void method(MyGUI::ListCtrl* _sender, MyGUI::Widget* _item, const MyGUI::IBDrawItemInfo& _info)
-			@param _sender widget that called this event
-			@param _item widget item pointer
-			@param _info item info
-		*/
-		EventHandle_ListCtrlPtrWidgetPtrCIBCellDrawInfoRef requestDrawItem;
-
-		/** Event : doubleclick or enter pressed on item
-			signature : void method(MyGUI::ListCtrl* _sender, size_t _index)
-			@param _sender widget that called this event
-			@param _index item index
-		*/
-		EventHandle_ListCtrlPtrSizeT eventSelectItemAccept;
-
-		/** Event : position of selected item was changed
-			signature : void method(MyGUI::ListCtrl* _sender, size_t _index)
-			@param _sender widget that called this event
-			@param _index item index
-		*/
-		EventHandle_ListCtrlPtrSizeT eventChangeItemPosition;
-
-		/** Event : click on item
-			signature : void method(MyGUI::ListCtrl* _sender, size_t _index)
-			@param _sender widget that called this event
-			@param _index item index
-		*/
-		EventHandle_ListCtrlPtrSizeT eventMouseItemActivate;
-
-		/** Event : notify about event in item widget
-			signature : void method(MyGUI::ListCtrl* _sender, const MyGUI::IBNotifyItemData& _info)
-			@param _sender widget that called this event
-			@param _info info about item notify
-		*/
-		EventHandle_ListCtrlPtrCIBNotifyCellDataRef eventNotifyItem;
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	protected:
-		virtual ~ListCtrl();
-
-		struct ItemDataInfo
-		{
-			ItemDataInfo(Any _data) :
-				data(_data) { }
-			Any data;
-			IntSize size;
-		};
-		typedef std::vector<ItemDataInfo> VectorItemInfo;
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		virtual void onMouseButtonPressed(int _left, int _top, MouseButton _id);
-		virtual void onMouseButtonReleased(int _left, int _top, MouseButton _id);
-		virtual void onMouseDrag(int _left, int _top);
-
-		virtual void onMouseWheel(int _rel);
-		virtual void onKeyLostFocus(Widget* _new);
-		virtual void onKeySetFocus(Widget* _old);
-
-		void notifyKeyButtonPressed(Widget* _sender, KeyCode _key, Char _char);
-		void notifyKeyButtonReleased(Widget* _sender, KeyCode _key);
-		void notifyScrollChangePosition(VScroll* _sender, size_t _index);
-		void notifyMouseWheel(Widget* _sender, int _rel);
-		void notifyRootMouseChangeFocus(Widget* _sender, bool _focus);
-		void notifyMouseButtonDoubleClick(Widget* _sender);
-		void _requestGetContainer(Widget* _sender, Widget*& _container, size_t& _index);
-		void notifyMouseDrag(Widget* _sender, int _left, int _top);
-		void notifyMouseButtonPressed(Widget* _sender, int _left, int _top, MouseButton _id);
-		void notifyMouseButtonReleased(Widget* _sender, int _left, int _top, MouseButton _id);
-
-
-		virtual void removeDropItems();
-		virtual void updateDropItems();
-		virtual void updateDropItemsState(const DDWidgetState& _state);
-
-		// Обновляет данные о айтемах, при изменении размеров
-		void updateMetrics();
-
-		// просто обновляет все виджеты что видны
-		void _updateAllVisible(size_t _index, bool _needUpdateContetntSize, bool _update);
-
-		void updateFromResize();
-
-		// возвращает следующий айтем, если нет его, то создается
-		// запросы только последовательно
-		Widget* getItemWidget(size_t _index);
-
-		void _setContainerItemInfo(size_t _index, bool _set, bool _accept);
-
-		// сбрасываем старую подсветку
-		void resetCurrentActiveItem();
-		// ищет и устанавливает подсвеченный айтем
-		void findCurrentActiveItem();
-
-		// запрашиваем у конейтера айтем по позиции мыши
-		virtual size_t _getContainerIndex(const IntPoint& _point);
-
-		// сбрасывает зависимости, при любом колличественном изменении
-		virtual void _resetContainer(bool _update);
-
-		void _setScrollViewPage(size_t _size) { mScrollViewPage = _size; }
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-		size_t calcIndexByWidget(Widget* _widget) { return *_widget->_getInternalData<size_t>(); }
-
-		virtual IntSize getContentSize();
-		virtual IntPoint getContentPosition();
-		virtual IntSize getViewSize() const;
-		virtual void eraseContent();
-		virtual size_t getHScrollPage();
-		virtual size_t getVScrollPage();
-		virtual Align getContentAlign();
-		virtual void setContentPosition(const IntPoint& _point);
-
-		Widget* _getClientWidget();
-		const Widget* _getClientWidget() const;
-
-	private:
-		// наши дети в строках
-		VectorWidgetPtr mVectorItems;
-
-		// размерность скролла в пикселях
-		IntSize mContentSize;
-		// позиция скролла п пикселях
-		IntPoint mContentPosition;
-
-		// текущий выделенный элемент или ITEM_NONE
-		size_t mIndexSelect;
-		// подсвеченный элемент или ITEM_NONE
-		size_t mIndexActive;
-		// индекс со свойством приема или ITEM_NONE
-		size_t mIndexAccept;
-		// индекс со свойством отказа или ITEM_NONE
-		size_t mIndexRefuse;
-
-		// имеем ли мы фокус ввода
-		bool mIsFocus;
-
-		// структура данных об айтеме
-		VectorItemInfo mItemsInfo;
-
-		Widget* mItemDrag;
-		IntPoint mPointDragOffset;
-
-		std::string mDragLayer;
-
-		size_t mScrollViewPage;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_LIST_CTRL_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LogManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LogManager.h
deleted file mode 100644
index 83edeffe0e..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LogManager.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_LOG_MANAGER_H__
-#define __MYGUI_LOG_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_LogStream.h"
-#include <map>
-
-namespace MyGUI
-{
-
-	#define MYGUI_LOGGING(section, level, text) \
-		MyGUI::LogManager::out(section, MyGUI::LogManager::level) \
-		<< text \
-		<< MyGUI::LogManager::info(__FILE__, __LINE__) \
-		<< MyGUI::LogManager::end()
-
-	class MYGUI_EXPORT LogManager
-	{
-
-	public:
-		enum LogLevel
-		{
-			Info,
-			Warning,
-			Error,
-			Critical,
-			EndLogLevel
-		};
-
-	public:
-		static void shutdown();
-		static void initialise();
-
-		static void registerSection(const std::string& _section, const std::string& _file);
-		static void unregisterSection(const std::string& _section);
-
-		static LogStream& out(const std::string& _section, LogLevel _level);
-		static const std::string& info(const char * _file /* = __FILE__*/, int _line /* = __LINE__*/);
-
-		static const LogStream::LogStreamEnd& end();
-
-		// set logging enabled on std output device
-		static void setSTDOutputEnabled(bool _enable);
-		static bool getSTDOutputEnabled();
-
-	private:
-		LogManager();
-		~LogManager();
-
-	public:
-		static const std::string General;
-		static const std::string separator;
-
-		static LogStream::LogStreamEnd endl;
-		static const std::string LevelsName[EndLogLevel];
-
-	private:
-		static LogManager * msInstance;
-		typedef std::map<std::string, LogStream*>  MapLogStream;
-		MapLogStream mMapSectionFileName;
-		bool mSTDOut;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_LOG_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LogStream.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LogStream.h
deleted file mode 100644
index de168caedf..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_LogStream.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_LOG_STREAM_H__
-#define __MYGUI_LOG_STREAM_H__
-
-#include "MyGUI_Prerequest.h"
-#include <fstream>
-#include <iostream>
-#include <string>
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT LogStream
-	{
-		friend class LogManager;
-
-	public:
-		struct LogStreamEnd { };
-
-	public:
-		LogStream& operator<<(const LogStreamEnd& _endl);
-
-		template <typename T>
-		inline LogStream& operator<<(T _value)
-		{
-			if (getSTDOutputEnabled()) std::cout << _value;
-			if (mStream.is_open()) mStream << _value;
-			return *this;
-		}
-
-		const std::string& getFileName() const { return mFileName; }
-
-	private:
-		LogStream();
-		~LogStream();
-
-		LogStream(const std::string& _file);
-
-		void start(const std::string& _section, const std::string& _level);
-
-		bool getSTDOutputEnabled();
-
-		void lock() const { }
-		void release() const { }
-
-	private:
-		std::ofstream mStream;
-		std::string mFileName;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_LOG_STREAM_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Macros.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Macros.h
deleted file mode 100644
index 23f3573a24..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Macros.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_MACROS_H__
-#define __MYGUI_MACROS_H__
-
-namespace MyGUI
-{
-
-	const size_t ITEM_NONE = ~(size_t)0;
-	const int DEFAULT ((int)-1);
-	const float ALPHA_MAX = 1.0f;
-	const float ALPHA_MIN = 0.0f;
-
-	//FIXME �������� �� �������
-	#define MYGUI_FLAG_NONE  0
-	#define MYGUI_FLAG(num)  (1<<(num))
-
-} // namespace MyGUI
-
-
-#endif // __MYGUI_MACROS_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MainSkin.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MainSkin.h
deleted file mode 100644
index 2164c5c9b9..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MainSkin.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_MAIN_SKIN_H__
-#define __MYGUI_MAIN_SKIN_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_SubSkin.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT MainSkin : public SubSkin
-	{
-		MYGUI_RTTI_DERIVED( MainSkin )
-
-	public:
-		MainSkin();
-		virtual ~MainSkin();
-
-	/*internal:*/
-		void _setAlign(const IntSize& _oldsize, bool _update);
-		void _setAlign(const IntCoord& _oldsize, bool _update) { SubSkin::_setAlign(_oldsize, _update); }
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_SUB_SKIN_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MaskPickInfo.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MaskPickInfo.h
deleted file mode 100644
index dda95375a9..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MaskPickInfo.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_MASK_PICK_INFO_H__
-#define __MYGUI_MASK_PICK_INFO_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT MaskPickInfo
-	{
-	public:
-		MaskPickInfo() : width(0), height(0) { }
-
-		bool load(const std::string& _file);
-
-		bool pick(const IntPoint& _point, const IntCoord& _coord) const
-		{
-			if ((0 == _coord.width) || (0 == _coord.height)) return false;
-
-			int x = ((_point.left * width)-1) / _coord.width;
-			int y = ((_point.top * height)-1) / _coord.height;
-
-			return 0 != data[(size_t)(y * width + x)];
-		}
-
-		bool empty() const
-		{
-			return data.empty();
-		}
-
-	private:
-		std::vector<uint8> data;
-		int width, height;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_MASK_PICK_INFO_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MenuBar.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MenuBar.h
deleted file mode 100644
index e56d2ac4b9..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MenuBar.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_MENU_BAR_H__
-#define __MYGUI_MENU_BAR_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_MenuCtrl.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT MenuBar :
-		public MenuCtrl
-	{
-		MYGUI_RTTI_DERIVED( MenuBar )
-
-	public:
-		MenuBar();
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	protected:
-		virtual ~MenuBar();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_MENU_BAR_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MenuCtrl.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MenuCtrl.h
deleted file mode 100644
index 48297606d1..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MenuCtrl.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_MENU_CTRL_H__
-#define __MYGUI_MENU_CTRL_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_MenuItemType.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_Any.h"
-#include "MyGUI_EventPair.h"
-#include "MyGUI_MenuItemType.h"
-#include "MyGUI_ControllerFadeAlpha.h"
-
-namespace MyGUI
-{
-
-	typedef delegates::CDelegate2<MenuCtrl*, MenuItem*> EventHandle_MenuCtrlPtrMenuItemPtr;
-	typedef delegates::CDelegate1<MenuCtrl*> EventHandle_MenuCtrlPtr;
-
-	class MYGUI_EXPORT MenuCtrl :
-		public Widget
-	{
-		MYGUI_RTTI_DERIVED( MenuCtrl )
-
-	public:
-		MenuCtrl();
-
-		enum ItemImage
-		{
-			ItemImageNone,
-			ItemImagePopup
-		};
-
-		struct ItemInfo
-		{
-			ItemInfo(MenuItem* _item, const UString& _name, MenuItemType _type, MenuCtrl* _submenu, const std::string& _id, Any _data) :
-				item(_item),
-				name(_name),
-				type(_type),
-				submenu(_submenu),
-				id(_id),
-				data(_data),
-				width(0)
-			{
-			}
-
-			/** Item */
-			MenuItem* item;
-			/** Item name*/
-			UString name;
-			/** Widget have separator after item */
-			MenuItemType type;
-			/** Sub menu (or nullptr if no submenu) */
-			MenuCtrl* submenu;
-			/** Item id*/
-			std::string id;
-			/** User data */
-			Any data;
-			/** Item width */
-			int width;
-		};
-
-		typedef std::vector<ItemInfo> VectorMenuItemInfo;
-
-	public:
-		/** @copydoc Widget::setVisible */
-		virtual void setVisible(bool _value);
-
-		/** Hide or show Menu smooth */
-		void setVisibleSmooth(bool _value);
-
-		//------------------------------------------------------------------------------//
-		// манипуляции айтемами
-
-		//! Get number of items
-		size_t getItemCount() const { return mItemsInfo.size(); }
-
-		//! Insert an item into a array at a specified position
-		MenuItem* insertItemAt(size_t _index, const UString& _name, MenuItemType _type = MenuItemType::Normal, const std::string& _id = "", Any _data = Any::Null);
-		//! Insert an item into a array
-		MenuItem* insertItem(MenuItem* _to, const UString& _name, MenuItemType _type = MenuItemType::Normal, const std::string& _id = "", Any _data = Any::Null);
-
-		//! Add an item to the end of a array
-		MenuItem* addItem(const UString& _name, MenuItemType _type = MenuItemType::Normal, const std::string& _id = "", Any _data = Any::Null);
-
-		//! Remove item at a specified position
-		void removeItemAt(size_t _index);
-		//! Remove item
-		void removeItem(MenuItem* _item);
-
-		//! Remove all items
-		void removeAllItems();
-
-
-		//! Get item from specified position
-		MenuItem* getItemAt(size_t _index);
-
-		//! Get item index
-		size_t getItemIndex(MenuItem* _item);
-
-		//! Search item, returns the position of the first occurrence in array or ITEM_NONE if item not found
-		size_t findItemIndex(MenuItem* _item);
-
-		//! Search item, returns the item of the first occurrence in array or nullptr if item not found
-		MenuItem* findItemWith(const UString& _name);
-
-		//------------------------------------------------------------------------------//
-		// манипуляции данными
-
-		//! Replace an item data at a specified position
-		void setItemDataAt(size_t _index, Any _data);
-		//! Replace an item data
-		void setItemData(MenuItem* _item, Any _data) { setItemDataAt(getItemIndex(_item), _data); }
-
-		//! Clear an item data at a specified position
-		void clearItemDataAt(size_t _index) { setItemDataAt(_index, Any::Null); }
-		//! Clear an item data
-		void clearItemData(MenuItem* _item) { clearItemDataAt(getItemIndex(_item)); }
-
-		//! Get item data from specified position
-		template <typename ValueType>
-		ValueType * getItemDataAt(size_t _index, bool _throw = true)
-		{
-			MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::getItemDataAt");
-			return mItemsInfo[_index].data.castType<ValueType>(_throw);
-		}
-		//! Get item data
-		template <typename ValueType>
-		ValueType * getItemData(MenuItem* _item, bool _throw = true)
-		{
-			return getItemDataAt<ValueType>(getItemIndex(_item), _throw);
-		}
-
-		//! Replace an item id at a specified position
-		void setItemIdAt(size_t _index, const std::string& _id);
-		//! Replace an item id
-		void setItemId(MenuItem* _item, const std::string& _id) { setItemIdAt(getItemIndex(_item), _id); }
-
-		//! Get item id from specified position
-		const std::string& getItemIdAt(size_t _index);
-		//! Get item id
-		const std::string& getItemId(MenuItem* _item) { return getItemIdAt(getItemIndex(_item)); }
-
-		/** Get item by id */
-		MenuItem* getItemById(const std::string& _id);
-
-		/** Get item index by id */
-		size_t getItemIndexById(const std::string& _id);
-		//------------------------------------------------------------------------------//
-		// манипуляции отображением
-
-		//! Replace an item name at a specified position
-		void setItemNameAt(size_t _index, const UString& _name);
-		//! Replace an item name
-		void setItemName(MenuItem* _item, const UString& _name) { setItemNameAt(getItemIndex(_item), _name); }
-
-		//! Get item from specified position
-		const UString& getItemNameAt(size_t _index);
-		//! Get item from specified position
-		const UString& getItemName(MenuItem* _item) { return getItemNameAt(getItemIndex(_item)); }
-
-		//! Search item, returns the position of the first occurrence in array or ITEM_NONE if item not found
-		size_t findItemIndexWith(const UString& _name);
-
-		/** Show or hide item (submenu) at a specified position */
-		void setItemChildVisibleAt(size_t _index, bool _visible);
-		/** Show or hide item (submenu) */
-		void setItemChildVisible(MenuItem* _item, bool _visible) { setItemChildVisibleAt(getItemIndex(_item), _visible); }
-
-		//------------------------------------------------------------------------------//
-		// остальные манипуляции
-
-		/** Create specific type child item (submenu) for item by index */
-		template <typename Type>
-		Type * createItemChildTAt(size_t _index)
-		{
-			return static_cast<Type*>(createItemChildByType(_index, Type::getClassTypeName()));
-		}
-
-		/** Create specific type child item (submenu) for item */
-		template <typename Type>
-		Type * createItemChildT(MenuItem* _item) { return createItemChildTAt<Type>(getItemIndex(_item)); }
-
-		/** Get child item (submenu) from item by index */
-		MenuCtrl* getItemChildAt(size_t _index);
-
-		/** Get child item (submenu) from item */
-		MenuCtrl* getItemChild(MenuItem* _item) { return getItemChildAt(getItemIndex(_item)); }
-
-		/** Create child item (submenu) for item by index */
-		MenuCtrl* createItemChildAt(size_t _index) { return createItemChildTAt<MenuCtrl>(_index); }
-
-		/** Create child item (submenu) for item */
-		MenuCtrl* createItemChild(MenuItem* _item) { return createItemChildAt(getItemIndex(_item)); }
-
-		/** Remove child item (submenu) for item by index */
-		void removeItemChildAt(size_t _index);
-
-		/** Remove child item (submenu) for item */
-		void removeItemChild(MenuItem* _item) { removeItemChildAt(getItemIndex(_item)); }
-
-
-		/** Get item type (see MenuItemType) from item by index */
-		MenuItemType getItemTypeAt(size_t _index);
-
-		/** Get item type (see MenuItemType) from item */
-		MenuItemType getItemType(MenuItem* _item) { return getItemTypeAt(getItemIndex(_item)); }
-
-		/** Set item type (see MenuItemType) from item by index */
-		void setItemTypeAt(size_t _index, MenuItemType _type);
-		/** Set item type (see MenuItemType) from item */
-		void setItemType(MenuItem* _item, MenuItemType _type) { setItemTypeAt(getItemIndex(_item), _type); }
-
-		/** Set mode when clicking on item with submenu generate eventMenuCtrlAccept and closes menu */
-		void setPopupAccept(bool _value) { mPopupAccept = _value; }
-		/** Get mode when clicking on item with submenu generate eventMenuCtrlAccept and closes menu */
-		bool getPopupAccept() { return mPopupAccept; }
-
-		/** Get parent menu item or nullptr if no item */
-		MenuItem* getMenuItemParent() { return mOwner; }
-
-
-	/*event:*/
-		/** Event : Enter pressed or mouse clicked.\n
-			signature : void method(MyGUI::MenuCtrl* _sender, MyGUI::MenuItem* _item)\n
-			@param _sender widget that called this event
-			@param _item Selected item
-		*/
-		EventHandle_MenuCtrlPtrMenuItemPtr eventMenuCtrlAccept;
-
-		/** Event : Menu was closed by select or focus change.\n
-			signature : void method(MyGUI::MenuCtrl* _sender)\n
-			@param _sender widget that called this event
-		*/
-		EventHandle_MenuCtrlPtr eventMenuCtrlClose;
-
-
-	/*internal:*/
-		void _notifyDeleteItem(MenuItem* _item);
-		void _notifyUpdateName(MenuItem* _item);
-		void _wrapItemChild(MenuItem* _item, MenuCtrl* _widget);
-
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void Widget::setVisible(bool _value)")
-		void showMenu() { setVisible(true); }
-		MYGUI_OBSOLETE("use : void Widget::setVisible(bool _value)")
-		void hideMenu() { setVisible(false); }
-		MYGUI_OBSOLETE("use : bool Widget::isVisible()")
-		bool isShowMenu() { return isVisible(); }
-
-		MYGUI_OBSOLETE("use : void setItemChildVisibleAt(size_t _index, bool _visible)")
-		void showItemChildAt(size_t _index) { setItemChildVisibleAt(_index, true); }
-		MYGUI_OBSOLETE("use : void setItemChildVisible(MenuItem* _item, bool _visible)")
-		void showItemChild(MenuItem* _item) { setItemChildVisible(_item, true); }
-		MYGUI_OBSOLETE("use : void setItemChildVisibleAt(size_t _index, bool _visible)")
-		void hideItemChildAt(size_t _index) { setItemChildVisibleAt(_index, false); }
-		MYGUI_OBSOLETE("use : void setItemChildVisible(MenuItem* _item, bool _visible)")
-		void hideItemChild(MenuItem* _item) { setItemChildVisible(_item, false); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	protected:
-		virtual ~MenuCtrl();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		// переопределяем для особого обслуживания
-		virtual Widget* baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name);
-
-		virtual void onKeyChangeRootFocus(bool _focus);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-		void notifyRootKeyChangeFocus(Widget* _sender, bool _focus);
-		void notifyMouseButtonClick(Widget* _sender);
-		void notifyMouseSetFocus(Widget* _sender, Widget* _new);
-
-		const std::string& getSkinByType(MenuItemType _type)
-		{
-			return _type == MenuItemType::Separator ? mSeparatorSkin : mSkinLine;
-		}
-
-		size_t getIconIndexByType(MenuItemType _type)
-		{
-			return _type == MenuItemType::Popup ? ItemImagePopup : ItemImageNone;
-		}
-
-		void update();
-
-		void setButtonImageIndex(Button* _button, size_t _index);
-
-		MenuItemType getItemType(bool _submenu, bool _separator)
-		{
-			if (_submenu) return MenuItemType::Popup;
-			else if (_separator)  return MenuItemType::Separator;
-			return MenuItemType::Normal;
-		}
-
-		void notifyMenuCtrlAccept(MenuItem* _item);
-
-		Widget* createItemChildByType(size_t _index, const std::string& _type);
-
-		void _wrapItem(MenuItem* _item, size_t _index, const UString& _name, MenuItemType _type, const std::string& _id, Any _data);
-
-		ControllerFadeAlpha* createControllerFadeAlpha(float _alpha, float _coef, bool _enable);
-
-		Widget* _getClientWidget();
-		const Widget* _getClientWidget() const;
-
-	protected:
-		bool mHideByAccept;
-		// нужно ли выбрасывать по нажатию
-		bool mMenuDropMode;
-		bool mIsMenuDrop;
-		bool mHideByLostKey;
-
-	private:
-		VectorMenuItemInfo mItemsInfo;
-
-		int mHeightLine;
-		std::string mSkinLine;
-
-		int mSubmenuImageSize;
-
-		std::string mSubMenuSkin;
-		std::string mSubMenuLayer;
-
-		// флаг, чтобы отсеч уведомления от айтемов, при общем шутдауне виджета
-		bool mShutdown;
-
-		int mSeparatorHeight;
-		std::string mSeparatorSkin;
-
-		bool mAlignVert;
-		int mDistanceButton;
-		bool mPopupAccept;
-		MenuItem* mOwner;
-		bool mAnimateSmooth;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_MENU_CTRL_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MenuItem.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MenuItem.h
deleted file mode 100644
index f91fa496f1..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MenuItem.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_MENU_ITEM_H__
-#define __MYGUI_MENU_ITEM_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Button.h"
-#include "MyGUI_MenuCtrl.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT MenuItem :
-		public Button
-	{
-		MYGUI_RTTI_DERIVED( MenuItem )
-
-	public:
-		MenuItem();
-
-		/** @copydoc Widget::setCaption(const UString& _value) */
-		virtual void setCaption(const UString& _value);
-
-		//! Replace an item name
-		void setItemName(const UString& _value);
-		//! Get item name
-		const UString& getItemName();
-
-		//! Replace an item name
-		void setItemData(Any _value);
-
-		//! Get item data
-		template <typename ValueType>
-		ValueType* getItemData(bool _throw = true)
-		{
-			return mOwner->getItemData<ValueType>(this, _throw);
-		}
-
-		//! Remove item
-		void removeItem();
-
-		//! Replace an item id at a specified position
-		void setItemId(const std::string& _value);
-		//! Get item id from specified position
-		const std::string& getItemId();
-
-		//! Get item index
-		size_t getItemIndex();
-
-		/** Create child item (submenu), MenuItem can have only one child */
-		MenuCtrl* createItemChild();
-
-		/** Create specific type child item (submenu), MenuItem can have only one child */
-		template <typename Type>
-		Type * createItemChildT()
-		{
-			return mOwner->createItemChildT<Type>(this);
-		}
-
-		/** Set item type (see MenuItemType) */
-		void setItemType(MenuItemType _value);
-		/** Get item type (see MenuItemType) */
-		MenuItemType getItemType();
-
-		/** Hide or show child item (submenu) */
-		void setItemChildVisible(bool _value);
-
-		/** Get parent MenuCtrl */
-		MenuCtrl* getMenuCtrlParent() { return mOwner; }
-
-		/** Get child item (submenu) */
-		MenuCtrl* getItemChild();
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void setItemChildVisible(bool _visible)")
-		void showItemChild() { setItemChildVisible(true); }
-		MYGUI_OBSOLETE("use : void setItemChildVisible(bool _visible)")
-		void hideItemChild() { setItemChildVisible(false); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	protected:
-		virtual ~MenuItem();
-
-		virtual Widget* baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name);
-
-		virtual void baseChangeWidgetSkin(ResourceSkin* _info);
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-	private:
-		virtual void onMouseButtonPressed(int _left, int _top, MouseButton _id);
-		virtual void onMouseButtonReleased(int _left, int _top, MouseButton _id);
-
-	private:
-		MenuCtrl* mOwner;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_MENU_ITEM_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MenuItemType.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MenuItemType.h
deleted file mode 100644
index 9a7214a0e1..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MenuItemType.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_MENU_ITEM_TYPE_H__
-#define __MYGUI_MENU_ITEM_TYPE_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	struct MYGUI_EXPORT MenuItemType
-	{
-		enum Enum
-		{
-			Normal,
-			Popup,
-			Separator,
-			MAX
-		};
-
-		static MenuItemType parse(const std::string& _value)
-		{
-			MenuItemType type;
-			int value = 0;
-			while (true)
-			{
-				const char * name = type.getValueName(value);
-				if (strcmp(name, "") == 0 || name == _value) break;
-				value++;
-			}
-			type.value = MenuItemType::Enum(value);
-			return type;
-		}
-
-		MenuItemType(Enum _value = MAX) : value(_value) { }
-
-		friend bool operator == (MenuItemType const& a, MenuItemType const& b) { return a.value == b.value; }
-		friend bool operator != (MenuItemType const& a, MenuItemType const& b) { return a.value != b.value; }
-
-		friend std::ostream& operator << ( std::ostream& _stream, const MenuItemType&  _value )
-		{
-			_stream << _value.getValueName(_value.value);
-			return _stream;
-		}
-
-		friend std::istream& operator >> ( std::istream& _stream, MenuItemType&  _value )
-		{
-			std::string value;
-			_stream >> value;
-			_value = MenuItemType::parse(value);
-			return _stream;
-		}
-
-		std::string print() const { return getValueName(value); }
-
-	private:
-		const char * getValueName(int _index) const
-		{
-			static const char * values[MAX + 1] = { "Normal", "Popup", "Separator", "" };
-			return values[(_index < MAX && _index >= 0) ? _index : MAX];
-		}
-
-	private:
-		Enum value;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_MENU_ITEM_TYPE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Message.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Message.h
deleted file mode 100644
index aa1be2ba08..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Message.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_MESSAGE_H__
-#define __MYGUI_MESSAGE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Window.h"
-#include "MyGUI_ResourceImageSet.h"
-#include "MyGUI_EventPair.h"
-#include "MyGUI_MessageStyle.h"
-#include "MyGUI_ControllerFadeAlpha.h"
-
-namespace MyGUI
-{
-
-	typedef delegates::CDelegate2<Message*, MessageBoxStyle> EventHandle_MessagePtrMessageStyle;
-
-	class MYGUI_EXPORT Message :
-		public Window
-	{
-		MYGUI_RTTI_DERIVED( Message )
-
-	public:
-		Message();
-
-		/** Set message text*/
-		void setMessageText(const UString& _value);
-
-		/** Create button with specific name*/
-		MessageBoxStyle addButtonName(const UString& _name);
-
-		/** Set smooth message showing*/
-		void setSmoothShow(bool _value);
-
-		/** Get name of default layer for Message*/
-		const std::string& getDefaultLayer() { return mDefaultLayer; }
-
-		/** Set message icon*/
-		void setMessageIcon(MessageBoxStyle _value);
-		/** Set fade under message*/
-		void setWindowFade(bool _value);
-
-		void endMessage(MessageBoxStyle _result);
-		void endMessage();
-
-		/** Create button using MessageBoxStyle*/
-		void setMessageButton(MessageBoxStyle _value);
-
-		/** Set message style (button and icon)*/
-		void setMessageStyle(MessageBoxStyle _value);
-
-		void setMessageModal(bool _value);
-
-		/** Static method for creating message with one command
-			@param
-				_modal if true all other GUI elements will be blocked untill message is closed
-			@param
-				_style any combination of flags from ViewValueInfo
-			@param
-				_button1 ... _button4 specific buttons names
-		*/
-		static MyGUI::Message* createMessageBox(
-			const std::string& _skin,
-			const UString& _caption,
-			const UString& _message,
-			MessageBoxStyle _style = MessageBoxStyle::Ok | MessageBoxStyle::IconDefault,
-			const std::string& _layer = "",
-			bool _modal = true,
-			const std::string& _button1 = "",
-			const std::string& _button2 = "",
-			const std::string& _button3 = "",
-			const std::string& _button4 = "");
-
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*event:*/
-		/** Event : button on message window pressed.\n
-			signature : void method(MyGUI::Message* _sender, MyGUI::MessageBoxStyle _result)\n
-			@param _sender widget that called this event
-			@param _result - id of pressed button
-		*/
-		EventHandle_MessagePtrMessageStyle eventMessageBoxResult;
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	protected:
-		virtual ~Message();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		void updateSize();
-		void notifyButtonClick(MyGUI::Widget* _sender);
-		void clearButton();
-
-		void onKeyButtonPressed(KeyCode _key, Char _char);
-		void _destroyMessage(MessageBoxStyle _result);
-
-		UString getButtonName(MessageBoxStyle _style);
-		const char * getIconName(size_t _index);
-		const char * getButtonName(size_t _index);
-		const char * getButtonTag(size_t _index);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-		ControllerFadeAlpha* createControllerFadeAlpha(float _alpha, float _coef, bool _enable);
-
-	private:
-		IntSize mOffsetText;
-		Widget* mWidgetText;
-
-		std::string mButtonSkin, mButtonType;
-		IntSize mButtonSize, mButtonOffset;
-
-		VectorWidgetPtr mVectorButton;
-		MessageBoxStyle mInfoOk;
-		MessageBoxStyle mInfoCancel;
-		bool mSmoothShow;
-
-		std::string mDefaultLayer, mDefaultCaption;
-		std::string mFadeSkin, mFadeLayer;
-		Widget* mWidgetFade;
-		StaticImage* mIcon;
-		int mLeftOffset1;
-		int mLeftOffset2;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_MESSAGE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MessageStyle.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MessageStyle.h
deleted file mode 100644
index 85171feee0..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MessageStyle.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		08/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_MESSAGE_BOX_STYLE_H__
-#define __MYGUI_MESSAGE_BOX_STYLE_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-
-	struct MYGUI_EXPORT MessageBoxStyle
-	{
-
-		enum Enum
-		{
-			None = MYGUI_FLAG_NONE,
-			Ok = MYGUI_FLAG(0),
-			Yes = MYGUI_FLAG(1),
-			No = MYGUI_FLAG(2),
-			Abort = MYGUI_FLAG(3),
-			Retry = MYGUI_FLAG(4),
-			Ignore = MYGUI_FLAG(5),
-			Cancel = MYGUI_FLAG(6),
-			Try = MYGUI_FLAG(7),
-			Continue = MYGUI_FLAG(8),
-
-			_IndexUserButton1 = 9, // ������ ������ ������ �����
-
-			Button1 = MYGUI_FLAG(_IndexUserButton1),
-			Button2 = MYGUI_FLAG(_IndexUserButton1 + 1),
-			Button3 = MYGUI_FLAG(_IndexUserButton1 + 2),
-			Button4 = MYGUI_FLAG(_IndexUserButton1 + 3),
-
-			_CountUserButtons = 4, // ����������� ������ �����
-			_IndexIcon1 = _IndexUserButton1 + _CountUserButtons, // ������ ������ ������
-
-			IconDefault = MYGUI_FLAG(_IndexIcon1),
-
-			IconInfo = MYGUI_FLAG(_IndexIcon1),
-			IconQuest = MYGUI_FLAG(_IndexIcon1 + 1),
-			IconError = MYGUI_FLAG(_IndexIcon1 + 2),
-			IconWarning = MYGUI_FLAG(_IndexIcon1 + 3),
-
-			Icon1 = MYGUI_FLAG(_IndexIcon1),
-			Icon2 = MYGUI_FLAG(_IndexIcon1 + 1),
-			Icon3 = MYGUI_FLAG(_IndexIcon1 + 2),
-			Icon4 = MYGUI_FLAG(_IndexIcon1 + 3),
-			Icon5 = MYGUI_FLAG(_IndexIcon1 + 4),
-			Icon6 = MYGUI_FLAG(_IndexIcon1 + 5),
-			Icon7 = MYGUI_FLAG(_IndexIcon1 + 6),
-			Icon8 = MYGUI_FLAG(_IndexIcon1 + 7)
-		};
-
-		MessageBoxStyle(Enum _value = None) : value(_value) { }
-
-		MessageBoxStyle& operator |= (MessageBoxStyle const& _other) { value = Enum(int(value) | int(_other.value)); return *this; }
-		friend MessageBoxStyle operator | (Enum const& a, Enum const& b) { return MessageBoxStyle(Enum(int(a) | int(b))); }
-		MessageBoxStyle operator | (Enum const& a) { return MessageBoxStyle(Enum(int(value) | int(a))); }
-
-		friend bool operator == (MessageBoxStyle const& a, MessageBoxStyle const& b) { return a.value == b.value; }
-		friend bool operator != (MessageBoxStyle const& a, MessageBoxStyle const& b) { return a.value != b.value; }
-
-		friend std::ostream& operator << ( std::ostream& _stream, const MessageBoxStyle&  _value )
-		{
-			//_stream << _value.print();
-			return _stream;
-		}
-
-		friend std::istream& operator >> ( std::istream& _stream, MessageBoxStyle&  _value )
-		{
-			std::string value;
-			_stream >> value;
-			_value = MessageBoxStyle::parse(value);
-			return _stream;
-		}
-
-		// ���������� ������ ������
-		size_t getIconIndex()
-		{
-			size_t index = 0;
-			int num = value >> _IndexIcon1;
-
-			while (num != 0)
-			{
-				if ((num & 1) == 1) return index;
-
-				++index;
-				num >>= 1;
-			}
-
-			return ITEM_NONE;
-		}
-
-		// ���������� ������ ������
-		size_t getButtonIndex()
-		{
-			size_t index = 0;
-			int num = value;
-
-			while (num != 0)
-			{
-				if ((num & 1) == 1) return index;
-
-				++index;
-				num >>= 1;
-			}
-
-			return ITEM_NONE;
-		}
-
-		// ���������� ������ ������
-		std::vector<MessageBoxStyle> getButtons()
-		{
-			std::vector<MessageBoxStyle> buttons;
-
-			size_t index = 0;
-			int num = value;
-			while (index < _IndexIcon1)
-			{
-				if ((num & 1) == 1)
-				{
-					buttons.push_back( MessageBoxStyle::Enum( MYGUI_FLAG(index) ) );
-				}
-
-				++index;
-				num >>= 1;
-			}
-
-			return buttons;
-		}
-
-		typedef std::map<std::string, int> MapAlign;
-
-		static MessageBoxStyle parse(const std::string& _value)
-		{
-			MessageBoxStyle result(MessageBoxStyle::Enum(0));
-			const MapAlign& map_names = result.getValueNames();
-			const std::vector<std::string>& vec = utility::split(_value);
-			for (size_t pos=0; pos<vec.size(); pos++)
-			{
-				MapAlign::const_iterator iter = map_names.find(vec[pos]);
-				if (iter != map_names.end())
-				{
-					result.value = Enum(int(result.value) | int(iter->second));
-				}
-				else
-				{
-					MYGUI_LOG(Warning, "Cannot parse type '" << vec[pos] << "'");
-				}
-			}
-			return result;
-		}
-
-	private:
-		const MapAlign& getValueNames()
-		{
-			static MapAlign map_names;
-
-			if (map_names.empty())
-			{
-				MYGUI_REGISTER_VALUE(map_names, None);
-				MYGUI_REGISTER_VALUE(map_names, Ok);
-				MYGUI_REGISTER_VALUE(map_names, Yes);
-				MYGUI_REGISTER_VALUE(map_names, No);
-				MYGUI_REGISTER_VALUE(map_names, Abort);
-				MYGUI_REGISTER_VALUE(map_names, Retry);
-				MYGUI_REGISTER_VALUE(map_names, Ignore);
-				MYGUI_REGISTER_VALUE(map_names, Cancel);
-				MYGUI_REGISTER_VALUE(map_names, Try);
-				MYGUI_REGISTER_VALUE(map_names, Continue);
-
-				MYGUI_REGISTER_VALUE(map_names, Button1);
-				MYGUI_REGISTER_VALUE(map_names, Button2);
-				MYGUI_REGISTER_VALUE(map_names, Button3);
-				MYGUI_REGISTER_VALUE(map_names, Button4);
-
-				MYGUI_REGISTER_VALUE(map_names, IconDefault);
-
-				MYGUI_REGISTER_VALUE(map_names, IconInfo);
-				MYGUI_REGISTER_VALUE(map_names, IconQuest);
-				MYGUI_REGISTER_VALUE(map_names, IconError);
-				MYGUI_REGISTER_VALUE(map_names, IconWarning);
-
-				MYGUI_REGISTER_VALUE(map_names, Icon1);
-				MYGUI_REGISTER_VALUE(map_names, Icon2);
-				MYGUI_REGISTER_VALUE(map_names, Icon3);
-				MYGUI_REGISTER_VALUE(map_names, Icon4);
-				MYGUI_REGISTER_VALUE(map_names, Icon5);
-				MYGUI_REGISTER_VALUE(map_names, Icon6);
-				MYGUI_REGISTER_VALUE(map_names, Icon7);
-				MYGUI_REGISTER_VALUE(map_names, Icon8);
-			}
-
-			return map_names;
-		}
-
-	private:
-		Enum value;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_MESSAGE_BOX_STYLE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MultiList.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MultiList.h
deleted file mode 100644
index 9f4cc81b66..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_MultiList.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_MULTI_LIST_H__
-#define __MYGUI_MULTI_LIST_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_List.h"
-#include "MyGUI_Any.h"
-#include "MyGUI_BiIndexBase.h"
-#include "MyGUI_EventPair.h"
-
-namespace MyGUI
-{
-
-	//OBSOLETE
-	typedef delegates::CDelegate5<Widget*, size_t, const UString &, const UString &, bool &> EventHandle_WidgetIntUTFStringUTFStringBool;
-
-	typedef delegates::CDelegate5<MultiList*, size_t, const UString &, const UString &, bool &> EventHandle_MultiListPtrSizeTCUTFStringRefCUTFStringRefBoolRef;
-	typedef delegates::CDelegate2<MultiList*, size_t> EventHandle_MultiListPtrSizeT;
-
-	class MYGUI_EXPORT MultiList :
-		public Widget,
-		public BiIndexBase
-	{
-		MYGUI_RTTI_DERIVED( MultiList )
-
-	public:
-		MultiList();
-
-		//------------------------------------------------------------------------------//
-		// Methods for work with columns (RU:методы для работы со столбцами)
-		//------------------------------------------------------------------------------//
-		// манипуляции айтемами
-
-		//! Get number of columns
-		size_t getColumnCount() { return mVectorColumnInfo.size(); }
-
-		/** Insert new column
-			@param _column New column will be inserted before _column
-			@param _name Name of new column
-			@param _width Width of new column
-		*/
-		void insertColumnAt(size_t _column, const UString& _name, int _width, Any _data = Any::Null);
-
-		/** Add new column at last position
-			@param _width Width of new column
-			@param _name Name of new column
-		*/
-		void addColumn(const UString& _name, int _width, Any _data = Any::Null) { insertColumnAt(ITEM_NONE, _name, _width, _data); }
-
-		/** Delete column */
-		void removeColumnAt(size_t _column);
-
-		/** Delete all columns */
-		void removeAllColumns();
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции отображением
-
-		/** Set column name
-			@param _column Index of column
-			@param _name New name of column
-		*/
-		void setColumnNameAt(size_t _column, const UString& _name);
-
-		/** Set column width
-			@param _column Index of column
-			@param _name New width of column
-		*/
-		void setColumnWidthAt(size_t _column, int _width);
-
-		/** Get _column name */
-		const UString& getColumnNameAt(size_t _column);
-
-		/** Get _column width */
-		int getColumnWidthAt(size_t _column);
-
-		/** Sort multilist by column */
-		void sortByColumn(size_t _column, bool _backward = false);
-
-		//------------------------------------------------------------------------------//
-		// манипуляции данными
-
-		//! Replace an item data at a specified position
-		void setColumnDataAt(size_t _index, Any _data);
-
-		//! Clear an item data at a specified position
-		void clearColumnDataAt(size_t _index) { setColumnDataAt(_index, Any::Null); }
-
-		//! Get item data from specified position
-		template <typename ValueType>
-		ValueType * getColumnDataAt(size_t _index, bool _throw = true)
-		{
-			MYGUI_ASSERT_RANGE(_index, mVectorColumnInfo.size(), "MultiList::getItemDataAt");
-			return mVectorColumnInfo[_index].data.castType<ValueType>(_throw);
-		}
-
-		//------------------------------------------------------------------------------//
-		// Methods for work with lines (RU:методы для работы со строками)
-		/** @note
-		All indexes used here is indexes of unsorted Multilist. Even if you sorted
-			it - all items indexes will be same as before sort.
-		*/
-
-		//------------------------------------------------------------------------------//
-		// манипуляции айтемами
-
-		/** Get number of items (lines) */
-		size_t getItemCount() const;
-
-		/** Insert new item before _index line */
-		void insertItemAt(size_t _index, const UString& _name, Any _data = Any::Null);
-
-		/** Add new item at the end */
-		void addItem(const UString& _name, Any _data = Any::Null) { insertItemAt(ITEM_NONE, _name, _data); }
-
-		//! Remove item at a specified position
-		void removeItemAt(size_t _index);
-
-		/** Delete all items */
-		void removeAllItems();
-
-		//! Swap items at a specified positions
-		void swapItemsAt(size_t _index1, size_t _index2);
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции отображением
-
-		//! Replace an item name
-		void setItemNameAt(size_t _index, const UString& _name) { setSubItemNameAt(0, _index, _name); }
-
-		//! Get item name from specified position
-		const UString& getItemNameAt(size_t _index) { return getSubItemNameAt(0, _index); }
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции выделениями
-
-		/** Get index of selected item (ITEM_NONE if none selected) */
-		size_t getIndexSelected() { return mItemSelected; }
-
-		/** Select specified _index */
-		void setIndexSelected(size_t _index);
-
-		/** Clear item selection */
-		void clearIndexSelected() { setIndexSelected(ITEM_NONE); }
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции данными
-
-		//! Replace an item data at a specified position
-		void setItemDataAt(size_t _index, Any _data) { setSubItemDataAt(0, _index, _data); }
-
-		//! Clear an item data at a specified position
-		void clearItemDataAt(size_t _index) { setItemDataAt(_index, Any::Null); }
-
-		//! Get item data from specified position
-		template <typename ValueType>
-		ValueType * getItemDataAt(size_t _index, bool _throw = true)
-		{
-			return getSubItemDataAt<ValueType>(0, _index, _throw);
-		}
-
-
-		//------------------------------------------------------------------------------//
-		// Methods for work with sub lines (RU:методы для работы со саб строками)
-		//------------------------------------------------------------------------------//
-		// манипуляции данными
-
-		/** Set sub item
-			@param _column Index of column
-			@param _index Index of line
-			@param _name New sub item value
-		*/
-		void setSubItemNameAt(size_t _column, size_t _index, const UString& _name);
-
-		/** Get sub item name*/
-		const UString& getSubItemNameAt(size_t _column, size_t _index);
-
-		/** Search item in specified _column, returns index of the first occurrence in column or ITEM_NONE if item not found */
-		size_t findSubItemWith(size_t _column, const UString& _name);
-
-		//------------------------------------------------------------------------------//
-		// манипуляции данными
-
-		//! Replace an item data at a specified position
-		void setSubItemDataAt(size_t _column, size_t _index, Any _data);
-
-		//! Clear an item data at a specified position
-		void clearSubItemDataAt(size_t _column, size_t _index) { setSubItemDataAt(_column, _index, Any::Null); }
-
-		//! Get item data from specified position
-		template <typename ValueType>
-		ValueType * getSubItemDataAt(size_t _column, size_t _index, bool _throw = true)
-		{
-			MYGUI_ASSERT_RANGE(_column, mVectorColumnInfo.size(), "MultiList::getSubItemDataAt");
-			MYGUI_ASSERT_RANGE(_index, mVectorColumnInfo.begin()->list->getItemCount(), "MultiList::getSubItemDataAt");
-
-			size_t index = BiIndexBase::convertToBack(_index);
-			return mVectorColumnInfo[_column].list->getItemDataAt<ValueType>(index, _throw);
-		}
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	/*event:*/
-		/** Event : Enter pressed or double click.\n
-			signature : void method(MyGUI::MultiList* _sender, size_t _index)\n
-			@param _sender widget that called this event
-			@param _index of selected item
-		*/
-		EventPair<EventHandle_WidgetSizeT, EventHandle_MultiListPtrSizeT> eventListSelectAccept;
-
-		/** Event : Selected item position changed.\n
-			signature : void method(MyGUI::MultiList* _sender, size_t _index)\n
-			@param _sender widget that called this event
-			@param _index of new item
-		*/
-		EventPair<EventHandle_WidgetSizeT, EventHandle_MultiListPtrSizeT> eventListChangePosition;
-
-		/** Event : Less than operator for sort multilist by columns.\n
-			signature : void method(MyGUI::MultiList* _sender, size_t _column, const UString& _firstItem, const UString& _secondItem, bool& _less)\n
-			@param _sender widget that called this event
-			@param _column Index of column
-			@param _firstItem Strings for compare
-			@param _secondItem Strings for compare
-			@param _less Comparsion result (write your value here)
-		*/
-		EventHandle_MultiListPtrSizeTCUTFStringRefCUTFStringRefBoolRef requestOperatorLess;
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : size_t MultiList::getIndexSelected()")
-		size_t getItemIndexSelected() { return getIndexSelected(); }
-		MYGUI_OBSOLETE("use : void MultiList::setIndexSelected(size_t _index)")
-		void setItemSelectedAt(size_t _index) { setIndexSelected(_index); }
-		MYGUI_OBSOLETE("use : void MultiList::clearIndexSelected()")
-		void clearItemSelected() { clearIndexSelected(); }
-
-		MYGUI_OBSOLETE("use : size_t MultiList::findSubItemWith(size_t _column, const UString& _name)")
-		size_t findItem(size_t _column, const UString& _name) { return findSubItemWith(_column, _name); }
-		MYGUI_OBSOLETE("use : const UString& MultiList::getSubItemNameAt(size_t _column, size_t _index)")
-		const UString& getSubItem(size_t _column, size_t _index) { return getSubItemNameAt(_column, _index); }
-		MYGUI_OBSOLETE("use : void MultiList::setSubItemNameAt(size_t _column, size_t _index, const UString& _name)")
-		void setSubItem(size_t _column, size_t _index, const UString& _name) { setSubItemNameAt(_column, _index, _name); }
-		MYGUI_OBSOLETE("use : void MultiList::removeColumnAt(size_t _column)")
-		void deleteColumn(size_t _column) { removeColumnAt(_column); }
-		MYGUI_OBSOLETE("use : void MultiList::removeAllColumns()")
-		void deleteAllColumns() { removeAllColumns(); }
-		MYGUI_OBSOLETE("use : int MultiList::getColumnWidthAt(size_t _column)")
-		int getColumnWidth(size_t _column) { return getColumnWidthAt(_column); }
-		MYGUI_OBSOLETE("use : const UString& MultiList::getColumnNameAt(size_t _column)")
-		const UString& getColumnName(size_t _column) { return getColumnNameAt(_column); }
-		MYGUI_OBSOLETE("use : void MultiList::setColumnWidthAt(size_t _column, int _width)")
-		void setColumnWidth(size_t _column, int _width) { setColumnWidthAt(_column, _width); }
-		MYGUI_OBSOLETE("use : void MultiList::addColumn(const UString& _name, int _width, Any _data)")
-		void addColumn(int _width, const UString& _name) { addColumn(_name, _width); }
-		MYGUI_OBSOLETE("use : void MultiList::setColumnNameAt(size_t _column, const UString& _name)")
-		void setColumnName(size_t _column, const UString& _name) { setColumnNameAt(_column, _name); }
-		MYGUI_OBSOLETE("use : void MultiList::insertColumnAt(size_t _column, const UString& _name, int _width, Any _data)")
-		void insertColumn(size_t _column, int _width, const UString& _name) { insertColumnAt(_column, _name, _width); }
-		MYGUI_OBSOLETE("use : size_t MultiList::getIndexSelected()")
-		size_t getItemSelect() { return getIndexSelected(); }
-		MYGUI_OBSOLETE("use : void MultiList::clearIndexSelected()")
-		void resetItemSelect() { clearIndexSelected(); }
-		MYGUI_OBSOLETE("use : void MultiList::setIndexSelected(size_t _index)")
-		void setItemSelect(size_t _index) { setIndexSelected(_index); }
-		MYGUI_OBSOLETE("use : void MultiList::insertItemAt(size_t _index, const UString& _name, Any _data)")
-		void insertItem(size_t _index, const UString& _name) { insertItemAt(_index, _name); }
-		MYGUI_OBSOLETE("use : void MultiList::setItemNameAt(size_t _index, const UString& _name)")
-		void setItem(size_t _index, const UString& _name) { setItemNameAt(_index, _name); }
-		MYGUI_OBSOLETE("use : const UString& MultiList::getItemNameAt(size_t _index)")
-		const UString& getItem(size_t _index) { return getItemNameAt(_index); }
-		MYGUI_OBSOLETE("use : void MultiList::removeItemAt(size_t _index)")
-		void deleteItem(size_t _index) { removeItemAt(_index); }
-		MYGUI_OBSOLETE("use : void MultiList::removeAllItems()")
-		void deleteAllItems() { removeAllItems(); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	protected:
-		virtual ~MultiList();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		void notifyListChangePosition(List* _sender, size_t _position);
-		void notifyListChangeFocus(List* _sender, size_t _position);
-		void notifyListChangeScrollPosition(List* _sender, size_t _position);
-		void notifyButtonClick(Widget* _sender);
-		void notifyListSelectAccept(List* _sender, size_t _position);
-
-		void updateColumns();
-		void redrawButtons();
-		void updateOnlyEmpty();
-
-		bool compare(List* _list, size_t _left, size_t _right);
-		void sortList();
-		void flipList();
-
-		Widget* getSeparator(size_t _index);
-
-		void setButtonImageIndex(Button* _button, size_t _index);
-
-		void updateBackSelected(size_t _index);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-		void frameEntered(float _frame);
-
-		void frameAdvise(bool _advise);
-
-	private:
-		struct ColumnInfo
-		{
-			List* list;
-			Button* button;
-			int width;
-			UString name;
-			Any data;
-		};
-
-		typedef std::vector<ColumnInfo> VectorColumnInfo;
-
-		enum ImageSort
-		{
-			SORT_NONE,
-			SORT_UP,
-			SORT_DOWN
-		};
-
-	private:
-		int mHeightButton;
-		int mWidthBar;
-		std::string mSkinButton, mSkinList;
-		Button* mButtonMain;
-
-		VectorColumnInfo mVectorColumnInfo;
-
-		VectorWidgetPtr mSeparators;
-
-		size_t mLastMouseFocusIndex;
-
-		bool mSortUp;
-		size_t mSortColumnIndex;
-
-		int mWidthSeparator;
-		std::string mSkinSeparator;
-		int mOffsetButtonSeparator;
-
-		size_t mItemSelected;
-
-		bool mFrameAdvise;
-		Widget* mClient;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_MULTI_LIST_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_OverlappedLayer.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_OverlappedLayer.h
deleted file mode 100644
index bf5e580303..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_OverlappedLayer.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_OVERLAPPED_LAYER_H__
-#define __MYGUI_OVERLAPPED_LAYER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_ILayer.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT OverlappedLayer :
-		public ILayer
-	{
-		MYGUI_RTTI_DERIVED( OverlappedLayer )
-
-	public:
-		OverlappedLayer();
-		virtual ~OverlappedLayer();
-
-		virtual void deserialization(xml::ElementPtr _node, Version _version);
-
-		// ������� �������� ���
-		virtual ILayerNode* createChildItemNode();
-		// ������� �������� ���
-		virtual void destroyChildItemNode(ILayerNode* _node);
-
-		// ��������� �������� ���
-		virtual void upChildItemNode(ILayerNode* _node);
-
-		// ������ �����
-		virtual EnumeratorILayerNode getEnumerator();
-
-		// ���������� ������ �� �������
-		virtual ILayerItem* getLayerItemByPoint(int _left, int _top);
-
-		virtual IntPoint getPosition(int _left, int _top) const;
-
-		virtual const IntSize& getSize() const;
-
-		// ������ ����
-		virtual void renderToTarget(IRenderTarget* _target, bool _update);
-
-		virtual void dumpStatisticToLog();
-
-	protected:
-		bool mIsPick;
-		VectorILayerNode mChildItems;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_OVERLAPPED_LAYER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Platform.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Platform.h
deleted file mode 100644
index 9f8b59b93a..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Platform.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*!
-	@file
-	@author		Denis Koronchik
-	@author		Georgiy Evmenov
-	@author		Albert Semenov
-	@date		09/2007
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __MYGUI_PLATFORM_H__
-#define __MYGUI_PLATFORM_H__
-
-// Definnition of platforms
-#define MYGUI_PLATFORM_WIN32		1
-#define MYGUI_PLATFORM_LINUX		2
-#define MYGUI_PLATFORM_APPLE		3
-
-// Definition of compilers
-#define MYGUI_COMPILER_MSVC 1
-#define MYGUI_COMPILER_GNUC 2
-
-
-// Find platform
-#if defined (__WIN32__) || defined (_WIN32)
-#	define MYGUI_PLATFORM MYGUI_PLATFORM_WIN32
-#elif defined (__APPLE_CC__)
-#	define MYGUI_PLATFORM MYGUI_PLATFORM_APPLE
-#else
-#	define MYGUI_PLATFORM MYGUI_PLATFORM_LINUX
-#endif
-
-// Find compiler
-#if defined( _MSC_VER )
-#	define MYGUI_COMPILER MYGUI_COMPILER_MSVC
-#	define MYGUI_COMP_VER _MSC_VER
-
-#elif defined( __GNUC__ )
-#	define MYGUI_COMPILER MYGUI_COMPILER_GNUC
-#	define MYGUI_COMP_VER (((__GNUC__)*100) + \
-        (__GNUC_MINOR__*10) + \
-        __GNUC_PATCHLEVEL__)
-#else
-#	pragma error "Unknown compiler! Stop building!!!"
-#endif
-
-// See if we can use __forceinline or if we need to use __inline instead
-#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
-#	if MYGUI_COMP_VER >= 1200
-#		define MYGUI_FORCEINLINE __forceinline
-#	endif
-#elif defined(__MINGW32__)
-#	if !defined(MYGUI_FORCEINLINE)
-#		define MYGUI_FORCEINLINE __inline
-#	endif
-#else
-#	define MYGUI_FORCEINLINE __inline
-#endif
-
-
-// Windows settings
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-#
-#	if defined( MYGUI_STATIC )
-#		define MYGUI_EXPORT
-#	elif defined( MYGUI_BUILD )
-#		define MYGUI_EXPORT __declspec( dllexport )
-#	else
-#		if defined( __MINGW32__ )
-#			define MYGUI_EXPORT
-#		else
-#			define MYGUI_EXPORT __declspec( dllimport )
-#		endif
-#	endif
-#
-#	if defined( MYGUI_STATIC )
-#		define MYGUI_EXPORT_DLL
-#	elif defined( MYGUI_BUILD_DLL )
-#		define MYGUI_EXPORT_DLL __declspec( dllexport )
-#	else
-#		if defined( __MINGW32__ )
-#			define MYGUI_EXPORT_DLL
-#		else
-#			define MYGUI_EXPORT_DLL __declspec( dllimport )
-#		endif
-#	endif
-#
-#// Win32 compilers use _DEBUG for specifying debug builds.
-#	ifdef _DEBUG
-#		define MYGUI_DEBUG_MODE 1
-#	else
-#		define MYGUI_DEBUG_MODE 0
-#	endif
-#endif
-
-
-// Linux/Apple Settings
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_LINUX || MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
-#
-// Add -fvisibility=hidden to compiler options. With -fvisibility=hidden, you are telling
-// GCC that every declaration not explicitly marked with a visibility attribute (MYGUI_EXPORT)
-// has a hidden visibility (like in windows).
-#	if __GNUC__ >= 4
-#		define MYGUI_EXPORT  __attribute__ ((visibility("default")))
-#	else
-#		define MYGUI_EXPORT
-#	endif
-#
-#	if __GNUC__ >= 4
-#		define MYGUI_EXPORT_DLL  __attribute__ ((visibility("default")))
-#	else
-#		define MYGUI_EXPORT_DLL
-#	endif
-#
-// A quick define to overcome different names for the same function
-#   define stricmp strcasecmp
-#
-// Unlike the Win32 compilers, Linux compilers seem to use DEBUG for when
-// specifying a debug build.
-// (??? this is wrong, on Linux debug builds aren't marked in any way unless
-// you mark it yourself any way you like it -- zap ???)
-#	ifdef DEBUG
-#		define MYGUI_DEBUG_MODE 1
-#	else
-#		define MYGUI_DEBUG_MODE 0
-#	endif
-
-#	if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
-#		define MYGUI_PLATFORM_LIB "MYGUIPlatform.bundle"
-#	else // if MYGUI_PLATFORM_LINUX
-#		define MYGUI_PLATFORM_LIB "libMYGUIPlatform.so"
-#	endif
-
-#endif
-
-
-#endif // __MYGUI_PLATFORM_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Plugin.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Plugin.h
deleted file mode 100644
index b06681c7ee..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Plugin.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*!
-	@file
-	@author		Denis Koronchik
-	@date		09/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_PLUGIN_H__
-#define __MYGUI_PLUGIN_H__
-
-#include "MyGUI_Prerequest.h"
-#include <string>
-
-namespace MyGUI
-{
-
-	/*!	\brief Base plugin class
-	*/
-	class MYGUI_EXPORT IPlugin
-	{
-	public:
-		IPlugin() { }
-
-		virtual ~IPlugin() { }
-
-		/*!	Get the name of the plugin.
-			@remarks An implementation must be supplied for this method to uniquely
-			identify the plugin
-		*/
-		virtual const std::string& getName() const = 0;
-
-		/*!	Perform the plugin initial installation sequence
-		*/
-		virtual void install() = 0;
-
-		/*! Perform any tasks the plugin needs to perform on full system
-			initialisation.
-		*/
-		virtual void initialize() = 0;
-
-		/*!	Perform any tasks the plugin needs to perform when the system is shut down
-		*/
-		virtual void shutdown() = 0;
-
-		/*!	Perform the final plugin uninstallation sequence
-		*/
-		virtual void uninstall() = 0;
-	};
-
-}
-
-#endif // __MYGUI_PLUGIN_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_PluginManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_PluginManager.h
deleted file mode 100644
index 61df0029de..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_PluginManager.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*!
-	@file
-	@author		Denis Koronchik
-	@date		09/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_PLUGIN_MANAGER_H__
-#define __MYGUI_PLUGIN_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_Plugin.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_Version.h"
-#include <set>
-
-namespace MyGUI
-{
-
-	/*!	\brief Plugin manager. Load/unload and register plugins.
-	*/
-	class MYGUI_EXPORT PluginManager
-	{
-		MYGUI_INSTANCE_HEADER( PluginManager )
-
-	public:
-		typedef void (*DLL_START_PLUGIN)(void);
-		typedef void (*DLL_STOP_PLUGIN)(void);
-
-	public:
-		void initialise();
-		void shutdown();
-
-	public:
-		//!	Load plugin
-		bool loadPlugin(const std::string& _file);
-
-		//!	Unload plugin
-		void unloadPlugin(const std::string& _file);
-
-		/** Load additional MyGUI *_plugin.xml file */
-		bool load(const std::string& _file);
-		void _load(xml::ElementPtr _node, const std::string& _file, Version _version);
-
-		/*!	Install plugin
-			@remarks Calls from plugin
-		*/
-		void installPlugin(IPlugin* _plugin);
-
-		/*!	Uninstall plugin
-			@remarks Calls from plugin
-		*/
-		void uninstallPlugin(IPlugin* _plugin);
-
-		//!	Unload all plugins
-		void unloadAllPlugins();
-
-	private:
-		//!	List of dynamic libraries
-		typedef std::map <std::string, DynLib*> DynLibList;
-
-		//!	List of plugins
-		typedef std::set <IPlugin*> PluginList;
-
-		//!	Loaded libraries
-		DynLibList mLibs;
-
-		//!	Installed plugins
-		PluginList mPlugins;
-
-	};
-
-}
-
-#endif // __MYGUI_PLUGIN_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_PointerManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_PointerManager.h
deleted file mode 100644
index fa03062591..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_PointerManager.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_POINTER_MANAGER_H__
-#define __MYGUI_POINTER_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_IUnlinkWidget.h"
-#include "MyGUI_IWidgetCreator.h"
-#include "MyGUI_StaticImage.h"
-#include "MyGUI_IPointer.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT PointerManager :
-		public IUnlinkWidget,
-		public IWidgetCreator
-	{
-		MYGUI_INSTANCE_HEADER( PointerManager )
-
-	public:
-		void initialise();
-		void shutdown();
-
-	public:
-		/** Load additional MyGUI *_pointer.xml file */
-		bool load(const std::string& _file);
-
-		void _load(xml::ElementPtr _node, const std::string& _file, Version _version);
-
-		/** Show or hide mouse pointer */
-		void setVisible(bool _visible);
-		/** Is mouse pointer visible */
-		bool isVisible() const { return mVisible; }
-
-		/** Set pointer that will be shown
-			@param _name of pointer
-		*/
-		void setPointer(const std::string& _name);
-		/** Reset to default pointer */
-		void resetToDefaultPointer();
-
-		/** Get default pointer */
-		const std::string& getDefaultPointer() { return mDefaultName; }
-		/** Set default pointer */
-		void setDeafultPointer(const std::string& _value);
-
-		const std::string& getLayerName() { return mLayerName; }
-		void setLayerName(const std::string& _value);
-
-		/** Get pointer resource */
-		IPointer* getByName(const std::string& _name) const;
-
-	/*event:*/
-		/** Event : Mouse pointer has been changed.\n
-			signature : void method(const std::string& _pointerName)\n
-			@param _pointerName Name of current mouse pointer
-		*/
-		delegates::CMultiDelegate1<const std::string &>
-			eventChangeMousePointer;
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void PointerManager::setVisible(bool _visible)")
-		void show() { setVisible(true); }
-		MYGUI_OBSOLETE("use : void PointerManager::setVisible(bool _visible)")
-		void hide() { setVisible(false); }
-		MYGUI_OBSOLETE("use : bool PointerManager::isVisible()")
-		bool isShow() { return isVisible(); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	private:
-		void _unlinkWidget(Widget* _widget);
-
-		// создает виджет
-		virtual Widget* baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name);
-
-		// удяляет неудачника
-		virtual void _destroyChildWidget(Widget* _widget);
-
-		// удаляет всех детей
-		virtual void _destroyAllChildWidget();
-
-		void Update();
-
-		void notifyFrameStart(float _time);
-		void notifyChangeMouseFocus(Widget* _widget);
-		void setPointer(const std::string& _name, Widget* _owner);
-
-	private:
-		// вектор всех детей виджетов
-		VectorWidgetPtr mWidgetChild;
-
-		std::string mDefaultName;
-		IntPoint mPoint;
-		bool mVisible;
-		std::string mLayerName;
-		std::string mSkinName;
-
-		Widget* mWidgetOwner;
-		StaticImage* mMousePointer;
-		IPointer* mPointer;
-		std::string mCurrentMousePointer;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_POINTER_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_PopupMenu.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_PopupMenu.h
deleted file mode 100644
index 441f13bc11..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_PopupMenu.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_POPUP_MENU_H__
-#define __MYGUI_POPUP_MENU_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_MenuCtrl.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT PopupMenu :
-		public MenuCtrl
-	{
-		MYGUI_RTTI_DERIVED( PopupMenu )
-
-	public:
-		PopupMenu();
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	protected:
-		virtual ~PopupMenu();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_POPUP_MENU_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Precompiled.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Precompiled.h
deleted file mode 100644
index d9c2b8bf1c..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Precompiled.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
-	@file
-	@author		Alexander Ptakhin
-	@date		01/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_PRECOMPILED_H__
-#define __MYGUI_PRECOMPILED_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Common.h"
-#include "MyGUI_Macros.h"
-#include "MyGUI_Guid.h"
-#include "MyGUI_LogManager.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_Any.h"
-#include "MyGUI_IResource.h"
-#include "MyGUI_Utility.h"
-#include "MyGUI_InputDefine.h"
-#include "MyGUI_Version.h"
-#include "MyGUI_RenderOut.h"
-#include "MyGUI_WidgetStyle.h"
-#include "MyGUI_ActionController.h"
-#include "MyGUI_ControllerFadeAlpha.h"
-#include "MyGUI_ControllerPosition.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_CastWidget.h"
-#include "MyGUI_IObject.h"
-#include "MyGUI_ISerializable.h"
-#include "MyGUI_GenericFactory.h"
-
-#endif // __MYGUI_PRECOMPILED_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Prerequest.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Prerequest.h
deleted file mode 100644
index d0db4e814a..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Prerequest.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*!
-	@file
-	@author		Denis Koronchik
-	@author		Georgiy Evmenov
-	@author		Ну и я чуть чуть =)
-	@date		09/2007
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __MYGUI_PREREQUEST_H__
-#define __MYGUI_PREREQUEST_H__
-
-#include "MyGUI_Platform.h"
-
-#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
-#	ifndef _CRT_SECURE_NO_WARNINGS
-#		define _CRT_SECURE_NO_WARNINGS
-#	endif
-#endif
-
-#define MYGUI_DEFINE_VERSION(major, minor, patch) ((major << 16) | (minor << 8) | patch)
-
-#ifndef MYGUI_DONT_REPLACE_NULLPTR
-	#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
-		#ifndef _MANAGED
-			#define nullptr 0
-		#endif
-	#else
-		#define nullptr 0
-	#endif
-#endif
-
-namespace MyGUI
-{
-
-	class Gui;
-	class IWidgetCreator;
-
-	// managers
-	class LogManager;
-	class InputManager;
-	class SubWidgetManager;
-	class LayerManager;
-	class SkinManager;
-	class WidgetManager;
-	class FontManager;
-	class ControllerManager;
-	class PointerManager;
-	class ClipboardManager;
-	class LayoutManager;
-	class PluginManager;
-	class DynLibManager;
-	class LanguageManager;
-	class ResourceManager;
-	class RenderManager;
-	class FactoryManager;
-	class TextureManager;
-
-	class IWidgetFactory;
-
-	class DynLib;
-
-	namespace factory
-	{
-		template <typename T>
-		class BaseWidgetFactory;
-	}
-
-	class Widget;
-	class Button;
-	class Window;
-	class List;
-	class HScroll;
-	class VScroll;
-	class Edit;
-	class ComboBox;
-	class StaticText;
-	class Tab;
-	class TabItem;
-	class Progress;
-	class ItemBox;
-	class MultiList;
-	class StaticImage;
-	class Message;
-	class MenuCtrl;
-	class MenuItem;
-	class PopupMenu;
-	class MenuBar;
-	class ScrollView;
-	class DDContainer;
-	class Canvas;
-	class ListCtrl;
-	class ListBox;
-
-	typedef Widget* WidgetPtr;
-	typedef Button* ButtonPtr;
-	typedef Window* WindowPtr;
-	typedef List* ListPtr;
-	typedef HScroll* HScrollPtr;
-	typedef VScroll* VScrollPtr;
-	typedef Edit* EditPtr;
-	typedef ComboBox* ComboBoxPtr;
-	typedef StaticText* StaticTextPtr;
-	typedef Tab* TabPtr;
-	typedef TabItem* TabItemPtr;
-	typedef Progress* ProgressPtr;
-	typedef ItemBox* ItemBoxPtr;
-	typedef MultiList* MultiListPtr;
-	typedef StaticImage* StaticImagePtr;
-	typedef Message* MessagePtr;
-	typedef MenuCtrl* MenuCtrlPtr;
-	typedef MenuItem* MenuItemPtr;
-	typedef PopupMenu* PopupMenuPtr;
-	typedef MenuBar* MenuBarPtr;
-	typedef ScrollView* ScrollViewPtr;
-	typedef DDContainer* DDContainerPtr;
-	typedef Canvas* CanvasPtr;
-	typedef ListCtrl* ListCtrlPtr;
-	typedef ListBox* ListBoxPtr;
-
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-	typedef TabItem Sheet;
-	typedef TabItem* SheetPtr;
-	typedef Canvas RenderBox;
-	typedef Canvas* RenderBoxPtr;
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	// Define version
-    #define MYGUI_VERSION_MAJOR 3
-    #define MYGUI_VERSION_MINOR 0
-    #define MYGUI_VERSION_PATCH 1
-
-    #define MYGUI_VERSION    MYGUI_DEFINE_VERSION(MYGUI_VERSION_MAJOR, MYGUI_VERSION_MINOR, MYGUI_VERSION_PATCH)
-
-	// Disable warnings for MSVC compiler
-#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
-
-// Turn off warnings generated by long std templates
-// This warns about truncation to 255 characters in debug/browse info
-#   pragma warning (disable : 4786)
-
-// Turn off warnings generated by long std templates
-// This warns about truncation to 255 characters in debug/browse info
-#   pragma warning (disable : 4503)
-
-// disable: "conversion from 'double' to 'float', possible loss of data
-#   pragma warning (disable : 4244)
-
-// disable: "truncation from 'double' to 'float'
-#   pragma warning (disable : 4305)
-
-// disable: "<type> needs to have dll-interface to be used by clients'
-// Happens on STL member variables which are not public therefore is ok
-#   pragma warning (disable : 4251)
-
-// disable: "non dll-interface class used as base for dll-interface class"
-// Happens when deriving from Singleton because bug in compiler ignores
-// template export
-#   pragma warning (disable : 4275)
-
-// disable: "C++ Exception Specification ignored"
-// This is because MSVC 6 did not implement all the C++ exception
-// specifications in the ANSI C++ draft.
-#   pragma warning( disable : 4290 )
-
-// disable: "no suitable definition provided for explicit template
-// instantiation request" Occurs in VC7 for no justifiable reason on all
-// #includes of Singleton
-#   pragma warning( disable: 4661)
-
-#endif
-
-} // namespace MyGUI
-
-#endif // __MYGUI_PREREQUEST_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Progress.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Progress.h
deleted file mode 100644
index 0f16807ca6..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Progress.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_PROGRESS_H__
-#define __MYGUI_PROGRESS_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Align.h"
-#include "MyGUI_Widget.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT Progress :
-		public Widget
-	{
-		MYGUI_RTTI_DERIVED( Progress )
-
-	public:
-		Progress();
-
-		/** Set progress range */
-		void setProgressRange(size_t _value);
-		/** Get progress range */
-		size_t getProgressRange() { return mRange; }
-
-		/** Set progress position */
-		void setProgressPosition(size_t _value);
-		/** Get progress position */
-		size_t getProgressPosition() { return mEndPosition; }
-
-		/** Enable or disable progress auto tracking */
-		void setProgressAutoTrack(bool _value);
-		/** Get progress auto tracking flag */
-		bool getProgressAutoTrack() { return mAutoTrack; }
-
-		/** Set progress start point
-			For example with Align::Top if will be filled from top to bottom.
-		*/
-		void setProgressStartPoint(Align _value);
-		/** Get progress start point */
-		Align getProgressStartPoint() { return mStartPoint; }
-
-		//! @copydoc Widget::setPosition(const IntPoint& _value)
-		virtual void setPosition(const IntPoint& _value);
-		//! @copydoc Widget::setSize(const IntSize& _value)
-		virtual void setSize(const IntSize& _value);
-		//! @copydoc Widget::setCoord(const IntCoord& _value)
-		virtual void setCoord(const IntCoord& _value);
-
-		/** @copydoc Widget::setPosition(int _left, int _top) */
-		void setPosition(int _left, int _top) { setPosition(IntPoint(_left, _top)); }
-		/** @copydoc Widget::setSize(int _width, int _height) */
-		void setSize(int _width, int _height) { setSize(IntSize(_width, _height)); }
-		/** @copydoc Widget::setCoord(int _left, int _top, int _width, int _height) */
-		void setCoord(int _left, int _top, int _width, int _height) { setCoord(IntCoord(_left, _top, _width, _height)); }
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void Widget::setCoord(const IntCoord& _coord)")
-		void setPosition(const IntCoord& _coord) { setCoord(_coord); }
-		MYGUI_OBSOLETE("use : void Widget::setCoord(int _left, int _top, int _width, int _height)")
-		void setPosition(int _left, int _top, int _width, int _height) { setCoord(_left, _top, _width, _height); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	protected:
-		virtual ~Progress();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-		void frameEntered(float _time);
-		void updateTrack();
-
-		int getClientWidth() { return ((mStartPoint.isLeft()) || (mStartPoint.isRight())) ? mClient->getWidth() : mClient->getHeight(); }
-		int getClientHeight() { return ((mStartPoint.isLeft()) || (mStartPoint.isRight())) ? mClient->getHeight() : mClient->getWidth(); }
-
-		void setTrackPosition(Widget* _widget, int _left, int _top, int _width, int _height);
-
-	private:
-		std::string mTrackSkin;
-		int mTrackWidth;
-		int mTrackStep;
-		int mTrackMin;
-
-		VectorWidgetPtr mVectorTrack;
-		size_t mRange;
-		size_t mStartPosition, mEndPosition;
-		float mAutoPosition;
-		bool mAutoTrack;
-		bool mFillTrack;
-
-		Align mStartPoint;
-
-		Widget* mClient;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_PROGRESS_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RTTI.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RTTI.h
deleted file mode 100644
index a980d0a4e0..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RTTI.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*!
-	@file
-	@author		Alexander Buryak - Rageous
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RTTI_H__
-#define __MYGUI_RTTI_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Diagnostic.h"
-#include <typeinfo>
-#include <string>
-
-namespace MyGUI
-{
-
-	//VC++ 7.1
-	#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC && MYGUI_COMP_VER == 1310
-		#define MYGUI_DECLARE_TYPE_NAME( Type ) \
-		private: \
-			struct TypeNameHolder { const std::string& getClassTypeName() { static std::string type = #Type; return type; } }; \
-		public: \
-			static const std::string& getClassTypeName() { TypeNameHolder type; return type.getClassTypeName(); } \
-			/** Get type name as string */ \
-			virtual const std::string& getTypeName() const { return Type::getClassTypeName(); }
-	#else
-		#define MYGUI_DECLARE_TYPE_NAME( Type ) \
-		public: \
-			static const std::string& getClassTypeName() { static std::string type = #Type; return type; } \
-			/** Get type name as string */ \
-			virtual const std::string& getTypeName() const { return Type::getClassTypeName(); }
-	#endif
-
-	#define MYGUI_RTTI_BASE( BaseType ) \
-		public: \
-			typedef BaseType RTTIBase; \
-			MYGUI_DECLARE_TYPE_NAME( BaseType ) \
-			/** Compare with selected type */ \
-			virtual bool isType( const std::type_info& _type) const { return typeid( BaseType ) == _type; } \
-			/** Compare with selected type */ \
-			template<typename Type> bool isType() const { return isType( typeid( Type )); } \
-			/** Try to cast pointer to selected type. \
-				@param _throw If true throw exception when casting in wrong type, else return nullptr \
-			*/ \
-			template<typename Type> Type* castType(bool _throw = true) \
-			{ \
-				if (this->isType<Type>()) return static_cast<Type*>( this ); \
-				MYGUI_ASSERT(!_throw, "Error cast type '" << this->getTypeName() << "' to type '" << Type::getClassTypeName() << "' .") \
-				return nullptr; \
-			} \
-			/** Try to cast pointer to selected type. \
-				@param _throw If true throw exception when casting in wrong type, else return nullptr \
-			*/ \
-			template<typename Type> const Type* castType(bool _throw = true) const \
-			{ \
-				if (this->isType<Type>()) return static_cast<Type*>( this ); \
-				MYGUI_ASSERT(!_throw, "Error cast type '" << this->getTypeName() << "' to type '" << Type::getClassTypeName() << "' .") \
-				return nullptr; \
-			}
-
-	#define MYGUI_RTTI_DERIVED( DerivedType ) \
-		public: \
-			MYGUI_DECLARE_TYPE_NAME( DerivedType ) \
-			typedef RTTIBase Base; \
-			typedef DerivedType RTTIBase; \
-			/** Compare with selected type */ \
-			virtual bool isType( const std::type_info& _type ) const { return typeid( DerivedType ) == _type || Base::isType( _type ); } \
-			/** Compare with selected type */ \
-			template<typename Type> bool isType() const { return isType( typeid( DerivedType )); }
-
-	//OBSOLETE
-	#define MYGUI_RTTI_CHILD_HEADER( DerivedType, BaseType ) \
-		public: \
-			MYGUI_DECLARE_TYPE_NAME( DerivedType ) \
-			typedef BaseType Base; \
-			typedef DerivedType RTTIBase; \
-			/** Compare with selected type */ \
-			virtual bool isType( const std::type_info& _type ) const { return typeid( DerivedType ) == _type || BaseType::isType( _type ); }
-
-
-	//OBSOLETE
-	#define MYGUI_RTTI_BASE_HEADER( BaseType ) MYGUI_RTTI_BASE( BaseType )
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RTTI_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RawRect.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RawRect.h
deleted file mode 100644
index 4e2c2e7bad..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RawRect.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RAW_RECT_H__
-#define __MYGUI_RAW_RECT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Colour.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_ICroppedRectangle.h"
-#include "MyGUI_SubSkin.h"
-#include "MyGUI_RenderFormat.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT RawRect : public SubSkin
-	{
-		MYGUI_RTTI_DERIVED( RawRect )
-
-	public:
-		RawRect();
-		virtual ~RawRect();
-
-		virtual void setAlpha(float _alpha);
-
-		void setRectColour(const Colour& _colourLT, const Colour& _colourRT, const Colour& _colourLB, const Colour& _colourRB);
-
-		void setRectTexture(const FloatPoint& _pointLT, const FloatPoint& _pointRT, const FloatPoint& _pointLB, const FloatPoint& _pointRB);
-
-		virtual void setStateData(IStateInfo * _data);
-
-		// метод для отрисовки себя
-		virtual void doRender();
-
-	private:
-		FloatPoint mRectTextureLT;
-		FloatPoint mRectTextureRT;
-		FloatPoint mRectTextureLB;
-		FloatPoint mRectTextureRB;
-
-		Colour mColourLT;
-		Colour mColourRT;
-		Colour mColourLB;
-		Colour mColourRB;
-
-		uint32 mRenderColourLT;
-		uint32 mRenderColourRT;
-		uint32 mRenderColourLB;
-		uint32 mRenderColourRB;
-
-		VertexColourType mVertexFormat;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RAW_RECT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderFormat.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderFormat.h
deleted file mode 100644
index 734b9921e4..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderFormat.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RENDER_FORMAT_H__
-#define __MYGUI_RENDER_FORMAT_H__
-
-#include "MyGUI_Macros.h"
-
-namespace MyGUI
-{
-
-	struct MYGUI_EXPORT VertexColourType
-	{
-		enum Enum
-		{
-			ColourARGB, // D3D style compact colour
-			ColourABGR, // GL style compact colour
-			MAX
-		};
-
-		VertexColourType(Enum _value = MAX) : value(_value) { }
-
-		friend bool operator == (VertexColourType const& a, VertexColourType const& b) { return a.value == b.value; }
-		friend bool operator != (VertexColourType const& a, VertexColourType const& b) { return a.value != b.value; }
-
-	private:
-		Enum value;
-	};
-
-	struct MYGUI_EXPORT PixelFormat
-	{
-		enum Enum
-		{
-			Unknow,
-			L8, // 1 byte pixel format, 1 byte luminance
-			L8A8, // 2 byte pixel format, 1 byte luminance, 1 byte alpha
-			R8G8B8, // 24-bit pixel format, 8 bits for red, green and blue.
-			R8G8B8A8 // 32-bit pixel format, 8 bits for red, green, blue and alpha.
-		};
-
-		PixelFormat(Enum _value = Unknow) : value(_value) { }
-
-		friend bool operator == (PixelFormat const& a, PixelFormat const& b) { return a.value == b.value; }
-		friend bool operator != (PixelFormat const& a, PixelFormat const& b) { return a.value != b.value; }
-
-	private:
-		Enum value;
-	};
-
-	struct MYGUI_EXPORT TextureUsage
-	{
-		enum Enum
-		{
-			Default = MYGUI_FLAG_NONE,
-			Static = MYGUI_FLAG(0),
-			Dynamic = MYGUI_FLAG(1),
-			Stream = MYGUI_FLAG(2),
-			Read = MYGUI_FLAG(3),
-			Write = MYGUI_FLAG(4),
-			RenderTarget = MYGUI_FLAG(5)
-		};
-
-		TextureUsage(Enum _value = Default) : value(_value) { }
-
-		friend bool operator == (TextureUsage const& a, TextureUsage const& b) { return a.value == b.value; }
-		friend bool operator != (TextureUsage const& a, TextureUsage const& b) { return a.value != b.value; }
-
-		TextureUsage& operator |= (TextureUsage const& _other) { value = Enum(int(value) | int(_other.value)); return *this; }
-		friend TextureUsage operator | (Enum const& a, Enum const& b) { return TextureUsage(Enum(int(a) | int(b))); }
-		friend TextureUsage operator | (TextureUsage const& a, TextureUsage const& b) { return TextureUsage(Enum(int(a.value) | int(b.value))); }
-
-		bool isValue(Enum _value) { return 0 != (value & _value); }
-
-	private:
-		Enum value;
-	};
-
-} // namespace MyGUI
-
-
-#endif // __MYGUI_RENDER_FORMAT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderItem.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderItem.h
deleted file mode 100644
index d122a32682..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderItem.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RENDER_ITEM_H__
-#define __MYGUI_RENDER_ITEM_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_ISubWidget.h"
-#include "MyGUI_IVertexBuffer.h"
-#include "MyGUI_VertexData.h"
-#include "MyGUI_IRenderTarget.h"
-
-namespace MyGUI
-{
-
-	typedef std::pair<ISubWidget*, size_t> DrawItemInfo;
-	typedef std::vector<DrawItemInfo> VectorDrawItem;
-
-	class MYGUI_EXPORT RenderItem
-	{
-	public:
-		RenderItem();
-		virtual ~RenderItem();
-
-		void renderToTarget(IRenderTarget* _target, bool _update);
-
-		void setTexture(ITexture* _value);
-		ITexture* getTexture();
-
-		void addDrawItem(ISubWidget* _item, size_t _count);
-		void removeDrawItem(ISubWidget* _item);
-		void reallockDrawItem(ISubWidget* _item, size_t _count);
-
-		void outOfDate() { mOutDate = true; }
-
-		size_t getNeedVertexCount() const { return mNeedVertexCount; }
-		size_t getVertexCount() const { return mCountVertex; }
-
-		bool getCurrentUpdate() const { return mCurrentUpdate; }
-		Vertex* getCurrentVertextBuffer() const { return mCurrentVertext; }
-
-		void setLastVertexCount(size_t _count) { mLastVertextCount = _count; }
-
-		IRenderTarget* getRenderTarget() { return mRenderTarget; }
-
-		bool getCompression();
-
-	private:
-#if MYGUI_DEBUG_MODE == 1
-		std::string mTextureName;
-#endif
-
-		ITexture* mTexture;
-
-		size_t mNeedVertexCount;
-
-		bool mOutDate;
-		VectorDrawItem mDrawItems;
-
-		// ����������� ������������ ������� ������
-		size_t mCountVertex;
-
-		bool mCurrentUpdate;
-		Vertex* mCurrentVertext;
-		size_t mLastVertextCount;
-
-		IVertexBuffer* mVertexBuffer;
-		IRenderTarget* mRenderTarget;
-
-		bool mCompression;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RENDER_ITEM_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderManager.h
deleted file mode 100644
index fb151c5d5a..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderManager.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RENDER_MANAGER_H__
-#define __MYGUI_RENDER_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_RenderFormat.h"
-#include "MyGUI_ITexture.h"
-#include "MyGUI_IVertexBuffer.h"
-#include "MyGUI_IRenderTarget.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT RenderManager
-	{
-	public:
-		RenderManager();
-		virtual ~RenderManager() = 0;
-
-		static RenderManager& getInstance();
-		static RenderManager* getInstancePtr();
-
-		virtual IVertexBuffer* createVertexBuffer() = 0;
-		virtual void destroyVertexBuffer(IVertexBuffer* _buffer) = 0;
-
-		virtual ITexture* createTexture(const std::string& _name) = 0;
-		virtual void destroyTexture(ITexture* _texture) = 0;
-		virtual ITexture* getTexture(const std::string& _name) = 0;
-
-		//FIXME �������� ��������� � ��������� � ������ �������
-		virtual const IntSize& getViewSize() const = 0;
-
-		virtual VertexColourType getVertexFormat() = 0;
-
-		virtual bool isFormatSupported(PixelFormat _format, TextureUsage _usage) { return true; }
-
-#if MYGUI_DEBUG_MODE == 1
-		virtual bool checkTexture(ITexture* _texture) { return true; }
-#endif
-
-	private:
-		static RenderManager* msInstance;
-		bool mIsInitialise;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RENDER_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderOut.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderOut.h
deleted file mode 100644
index 8ad9fd2844..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderOut.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RENDER_OUT_H__
-#define __MYGUI_RENDER_OUT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Utility.h"
-
-namespace MyGUI
-{
-	namespace implement
-	{
-		void MYGUI_EXPORT render_out(const std::string& _value);
-	}
-
-	template<typename T> inline
-	void MYGUI_OUT (T p) { implement::render_out(utility::toString(p)); }
-
-	template<typename T1,  typename T2 > inline
-	void MYGUI_OUT (T1 p1, T2 p2) { implement::render_out(utility::toString(p1, p2)); }
-
-	template<typename T1,  typename T2,  typename T3 > inline
-	void MYGUI_OUT (T1 p1, T2 p2, T3 p3) { implement::render_out(utility::toString(p1, p2, p3)); }
-
-	template<typename T1,  typename T2,  typename T3, typename T4 > inline
-	void MYGUI_OUT (T1 p1, T2 p2, T3 p3, T4 p4) { implement::render_out(utility::toString(p1, p2, p3, p4)); }
-
-	template<typename T1,  typename T2,  typename T3, typename T4, typename T5 > inline
-	void MYGUI_OUT (T1 p1, T2 p2, T3 p3, T4 p4, T5 p5) { implement::render_out(utility::toString(p1, p2, p3, p4, p5)); }
-
-	template<typename T1,  typename T2,  typename T3, typename T4, typename T5, typename T6 > inline
-	void MYGUI_OUT (T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6) { implement::render_out(utility::toString(p1, p2, p3, p4, p5, p6)); }
-
-	template<typename T1,  typename T2,  typename T3, typename T4, typename T5, typename T6, typename T7 > inline
-	void MYGUI_OUT (T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7) { implement::render_out(utility::toString(p1, p2, p3, p4, p5, p6, p7)); }
-
-	template<typename T1,  typename T2,  typename T3, typename T4, typename T5, typename T6, typename T7, typename T8 > inline
-	void MYGUI_OUT (T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7, T8 p8) { implement::render_out(utility::toString(p1, p2, p3, p4, p5, p6, p7, p8)); }
-
-	template<typename T1,  typename T2 > inline
-	void MYGUI_OUT_SPACES (T1 p1, T2 p2) { implement::render_out(utility::toString(p1, " ", p2)); }
-
-	template<typename T1,  typename T2,  typename T3 > inline
-	void MYGUI_OUT_SPACES (T1 p1, T2 p2, T3 p3) { implement::render_out(utility::toString(p1, " ", p2, " ", p3)); }
-
-	template<typename T1,  typename T2,  typename T3, typename T4 > inline
-	void MYGUI_OUT_SPACES (T1 p1, T2 p2, T3 p3, T4 p4) { implement::render_out(utility::toString(p1, " ", p2, " ", p3, " ", p4 )); }
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RENDER_OUT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderTargetInfo.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderTargetInfo.h
deleted file mode 100644
index bbded7394a..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RenderTargetInfo.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RENDER_TARGET_INFO_H__
-#define __MYGUI_RENDER_TARGET_INFO_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	struct MYGUI_EXPORT RenderTargetInfo
-	{
-		RenderTargetInfo() :
-			maximumDepth(0),
-			pixScaleX(1),
-			pixScaleY(1),
-			hOffset(0),
-			vOffset(0),
-			aspectCoef(1),
-			leftOffset(0),
-			topOffset(0)
-		{
-		}
-
-		void setOffset(int _left, int _top) const
-		{
-			leftOffset = _left;
-			topOffset = _top;
-		}
-
-		float maximumDepth;
-		float pixScaleX;
-		float pixScaleY;
-		float hOffset;
-		float vOffset;
-		float aspectCoef;
-
-		mutable int leftOffset;
-		mutable int topOffset;
-	};
-
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RENDER_TARGET_INFO_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceHolder.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceHolder.h
deleted file mode 100644
index 505e5e8a98..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceHolder.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RESOURCE_HOLDER_H__
-#define __MYGUI_RESOURCE_HOLDER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Enumerator.h"
-
-namespace MyGUI
-{
-
-	template <typename Type>
-	class /*MYGUI_EXPORT */ResourceHolder
-	{
-	public:
-		typedef std::map<std::string, Type*> MapResource;
-		typedef Enumerator<MapResource> EnumeratorPtr;
-
-		virtual ~ResourceHolder() { }
-	public:
-		/** Check is resource exist */
-		bool isExist(const std::string& _name) const
-		{
-			return mResources.find(_name) != mResources.end();
-		}
-
-		/** Find resource by name*/
-		Type* findByName(const std::string& _name) const
-		{
-			typename MapResource::const_iterator item = mResources.find(_name);
-			return (item == mResources.end()) ? nullptr : item->second;
-		}
-
-		/** Get resource by name*/
-		Type* getByName(const std::string& _name, bool _throw = true) const
-		{
-			Type* result = findByName(_name);
-			MYGUI_ASSERT(result || !_throw, "Resource '" << _name << "' not found");
-			return result;
-		}
-
-		bool remove(const std::string& _name)
-		{
-			typename MapResource::const_iterator item = mResources.find(_name);
-			if (item != mResources.end())
-			{
-				delete item->second;
-				mResources.erase(item->first);
-				return true;
-			}
-			return false;
-		}
-
-		void clear()
-		{
-			for (typename MapResource::iterator item=mResources.begin(); item!=mResources.end(); ++item)
-			{
-				delete item->second;
-			}
-			mResources.clear();
-		}
-
-		EnumeratorPtr getEnumerator()
-		{
-			return EnumeratorPtr(mResources);
-		}
-
-		size_t getCount() const { return mResources.size(); }
-
-	protected:
-		MapResource mResources;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RESOURCE_HOLDER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceImageSet.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceImageSet.h
deleted file mode 100644
index 5699d06dcf..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceImageSet.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RESOURCE_IMAGE_SET_H__
-#define __MYGUI_RESOURCE_IMAGE_SET_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Macros.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_IResource.h"
-#include "MyGUI_ImageInfo.h"
-#include "MyGUI_Enumerator.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_GenericFactory.h"
-
-namespace MyGUI
-{
-
-	class ResourceImageSet;
-	typedef ResourceImageSet * ResourceImageSetPtr;
-
-	struct IndexImage
-	{
-		std::string name;
-		float rate;
-		std::vector<IntPoint> frames;
-	};
-	typedef std::vector<IndexImage> VectorIndexImage;
-
-	struct GroupImage
-	{
-		std::string name;
-		std::string texture;
-		IntSize size;
-		VectorIndexImage indexes;
-	};
-	typedef std::vector<GroupImage> VectorGroupImage;
-	typedef Enumerator<VectorGroupImage> EnumeratorGroupImage;
-
-	class MYGUI_EXPORT ResourceImageSet :
-		public IResource
-	{
-		friend class GenericFactory<ResourceImageSet>;
-
-		MYGUI_RTTI_DERIVED( ResourceImageSet )
-
-	private:
-		ResourceImageSet() { }
-		virtual ~ResourceImageSet() { }
-
-		virtual void deserialization(xml::ElementPtr _node, Version _version);
-
-		//-------------------------------------------------------------//
-	private:
-		size_t getGroupIndex(const std::string& _name)
-		{
-			for (size_t index=0; index<mGroups.size(); ++index)
-			{
-				if (mGroups[index].name == _name) return index;
-			}
-			return ITEM_NONE;
-		}
-
-		size_t getGroupIndex(const IntSize& _size)
-		{
-			for (size_t index=0; index<mGroups.size(); ++index)
-			{
-				if (mGroups[index].size == _size) return index;
-			}
-			return ITEM_NONE;
-		}
-
-		size_t getImageIndex(GroupImage& _group, const std::string& _name)
-		{
-			VectorIndexImage& indexes = _group.indexes;
-			for (size_t index=0; index<indexes.size(); ++index)
-			{
-				if (indexes[index].name == _name) return index;
-			}
-			return ITEM_NONE;
-		}
-
-		const IntSize& getGroupSize(size_t _index)
-		{
-			if (_index >= mGroups.size()) return mSizeEmpty;
-			return mGroups[_index].size;
-		}
-
-		const IntSize& getGroupSize(const std::string& _group)
-		{
-			for (size_t index=0; index<mGroups.size(); ++index)
-			{
-				if (mGroups[index].name == _group) return mGroups[index].size;
-			}
-			return mSizeEmpty;
-		}
-
-	public:
-		ImageIndexInfo getIndexInfo(const std::string& _group, const std::string& _index);
-		ImageIndexInfo getIndexInfo(size_t _group, const std::string& _index);
-		ImageIndexInfo getIndexInfo(const std::string& _group, size_t _index);
-		ImageIndexInfo getIndexInfo(size_t _group, size_t _index);
-		ImageIndexInfo getIndexInfo(const IntSize& _group, size_t _index);
-		ImageIndexInfo getIndexInfo(const IntSize& _group, const std::string& _index);
-
-		/** Get groups Enumerator */
-		EnumeratorGroupImage getEnumerator() { return EnumeratorGroupImage(mGroups); }
-
-	private:
-		VectorGroupImage mGroups;
-
-		static std::string mTextureEmpty;
-		static IntSize mSizeEmpty;
-		static std::vector<IntPoint> mFramesEmpty;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RESOURCE_IMAGE_SET_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceImageSetPointer.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceImageSetPointer.h
deleted file mode 100644
index d41ddc50c7..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceImageSetPointer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RESOURCE_IMAGE_SET_POINTER_H__
-#define __MYGUI_RESOURCE_IMAGE_SET_POINTER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_IPointer.h"
-#include "MyGUI_ResourceImageSet.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ResourceImageSetPointer : public IPointer
-	{
-		MYGUI_RTTI_DERIVED( ResourceImageSetPointer )
-
-	public:
-		ResourceImageSetPointer();
-		virtual ~ResourceImageSetPointer() { }
-
-		virtual void deserialization(xml::ElementPtr _node, Version _version);
-
-		virtual void setImage(StaticImage* _image);
-		virtual void setPosition(StaticImage* _image, const IntPoint& _point);
-
-	private:
-		IntPoint mPoint;
-		IntSize mSize;
-		ResourceImageSetPtr mImageSet;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RESOURCE_IMAGE_SET_POINTER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceManager.h
deleted file mode 100644
index 0aeddff6bf..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceManager.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RESOURCE_MANAGER_H__
-#define __MYGUI_RESOURCE_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_Enumerator.h"
-#include "MyGUI_Guid.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_IResource.h"
-#include "MyGUI_ResourceHolder.h"
-#include "MyGUI_Delegate.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ResourceManager :
-		public ResourceHolder<IResource>
-	{
-		MYGUI_INSTANCE_HEADER( ResourceManager )
-
-	public:
-		void initialise();
-		void shutdown();
-
-	public:
-
-		/** Load additional MyGUI *_resource.xml file */
-		bool load(const std::string& _file);
-
-		bool _loadImplement(const std::string& _file, bool _match, const std::string& _type, const std::string& _instance);
-		void _load(xml::ElementPtr _node, const std::string& _file, Version _version);
-		void _loadList(xml::ElementPtr _node, const std::string& _file, Version _version);
-
-		/** Get resource by GUID */
-		IResourcePtr getByID(const Guid& _id, bool _throw = true);
-
-		std::string getFileNameByID(const Guid& _id);
-
-		void addResource(IResourcePtr _item);
-
-		void removeResource(IResourcePtr _item);
-
-		typedef delegates::CDelegate3<xml::ElementPtr, const std::string &, Version> LoadXmlDelegate;
-
-		LoadXmlDelegate& registerLoadXmlDelegate(const std::string& _key);
-
-		void unregisterLoadXmlDelegate(const std::string& _key);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : size_t ResourceManager::getCount()")
-		size_t getResourceCount() { return getCount(); }
-
-		MYGUI_OBSOLETE("use : IResourcePtr ResourceManager::getByName(const std::string& _name, bool _throw)")
-		IResourcePtr getResource(const std::string& _name, bool _throw = true) { return getByName(_name, _throw); }
-
-		MYGUI_OBSOLETE("use : IResourcePtr ResourceManager::getByID(const Guid& _id, bool _throw)")
-		IResourcePtr getResource(const Guid& _id, bool _throw = true) { return getByID(_id, _throw); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	private:
-		typedef std::map<Guid, IResourcePtr> MapResourceID;
-		MapResourceID mResourcesID;
-
-		// карта с делегатами для парсинга хмл блоков
-		typedef std::map<std::string, LoadXmlDelegate> MapLoadXmlDelegate;
-		MapLoadXmlDelegate mMapLoadXmlDelegate;
-
-		std::string mResourceGroup;
-		typedef std::vector<Guid> VectorGuid;
-		typedef std::map<std::string, VectorGuid> MapVectorString;
-
-		MapVectorString mListFileGuid;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RESOURCE_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceManualFont.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceManualFont.h
deleted file mode 100644
index b531cd3f44..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceManualFont.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RESOURCE_MANUAL_FONT_H__
-#define __MYGUI_RESOURCE_MANUAL_FONT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_ITexture.h"
-#include "MyGUI_IFont.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ResourceManualFont :
-		public IFont
-	{
-		MYGUI_RTTI_DERIVED( ResourceManualFont )
-
-	private:
-		typedef std::vector<RangeInfo> VectorRangeInfo;
-		typedef std::vector<PairCodeCoord> VectorPairCodeCoord;
-
-	public:
-		ResourceManualFont();
-		virtual ~ResourceManualFont();
-
-		virtual void deserialization(xml::ElementPtr _node, Version _version);
-
-		virtual GlyphInfo* getGlyphInfo(Char _id);
-
-		virtual ITexture* getTextureFont() { return mTexture; }
-
-		// ��������� ������, ��������� � ���������� ������
-		virtual int getDefaultHeight() { return mDefaultHeight; }
-
-	private:
-		void addGlyph(Char _index, const IntCoord& _coord);
-
-		void initialise();
-
-		void addGlyph(GlyphInfo * _info, Char _index, int _left, int _top, int _right, int _bottom, int _finalw, int _finalh, float _aspect, int _addHeight = 0);
-
-		void addRange(VectorPairCodeCoord& _info, size_t _first, size_t _last, int _width, int _height, float _aspect);
-		void checkTexture();
-
-	private:
-		std::string mSource;
-		int mDefaultHeight;
-
-		// ��������� ���������� � ��������
-		GlyphInfo mSpaceGlyphInfo;
-
-		// ������� ��������� ������
-		VectorPairCodeCoord mVectorPairCodeCoord;
-
-		// ��� ���������� � ��������
-		VectorRangeInfo mVectorRangeInfo;
-
-		MyGUI::ITexture* mTexture;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RESOURCE_MANUAL_FONT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceManualPointer.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceManualPointer.h
deleted file mode 100644
index 277d1ee7fc..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceManualPointer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RESOURCE_MANUAL_POINTER_H__
-#define __MYGUI_RESOURCE_MANUAL_POINTER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_IPointer.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ResourceManualPointer :
-		public IPointer
-	{
-		MYGUI_RTTI_DERIVED( ResourceManualPointer )
-
-	public:
-		ResourceManualPointer() { }
-		virtual ~ResourceManualPointer() { }
-
-		virtual void deserialization(xml::ElementPtr _node, Version _version);
-
-		virtual void setImage(StaticImage* _image);
-		virtual void setPosition(StaticImage* _image, const IntPoint& _point);
-
-	private:
-		IntPoint mPoint;
-		IntSize mSize;
-		FloatRect mOffset;
-		std::string mTexture;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RESOURCE_MANUAL_POINTER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceSkin.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceSkin.h
deleted file mode 100644
index 01b6adcbd8..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceSkin.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RESOURCE_SKIN_H__
-#define __MYGUI_RESOURCE_SKIN_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_SubWidgetBinding.h"
-#include "MyGUI_ChildSkinInfo.h"
-#include "MyGUI_MaskPickInfo.h"
-#include "MyGUI_IResource.h"
-#include "MyGUI_SubWidgetInfo.h"
-
-namespace MyGUI
-{
-
-	// вспомогательный класс для инициализации одного скина
-	class MYGUI_EXPORT ResourceSkin :
-		public IResource
-	{
-		MYGUI_RTTI_DERIVED( ResourceSkin )
-
-	public:
-		ResourceSkin();
-
-		virtual void deserialization(xml::ElementPtr _node, Version _version);
-
-		const IntSize& getSize() const { return mSize; }
-		const std::string& getTextureName() const { return mTexture; }
-		const VectorSubWidgetInfo& getBasisInfo() const { return mBasis; }
-		const MapWidgetStateInfo& getStateInfo() const { return mStates; }
-		const MapString& getProperties() const { return mProperties; }
-		const VectorChildSkinInfo& getChild() const { return mChilds; }
-		MaskPickInfo const * getMask() const { return &mMaskPeek; }
-		const std::string& getSkinName() { return mSkinName; }
-
-	private:
-		void setInfo(const IntSize& _size, const std::string &_texture);
-		void addInfo(const SubWidgetBinding& _bind);
-		void addProperty(const std::string &_key, const std::string &_value);
-		void addChild(const ChildSkinInfo& _child);
-		bool loadMask(const std::string& _file);
-		void clear();
-
-		void checkState(const MapStateInfo& _states);
-		void checkState(const std::string& _name);
-		void checkBasis();
-		void fillState(const MapStateInfo& _states, size_t _index);
-
-	private:
-		IntSize mSize;
-		std::string mTexture;
-		VectorSubWidgetInfo mBasis;
-		MapWidgetStateInfo mStates;
-		// дополнительные параметры скина
-		MapString mProperties;
-		// дети скина
-		VectorChildSkinInfo mChilds;
-		// маска для этого скина для пикинга
-		MaskPickInfo mMaskPeek;
-		std::string mSkinName;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RESOURCE_SKIN_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceTrueTypeFont.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceTrueTypeFont.h
deleted file mode 100644
index 6754d9c9ac..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ResourceTrueTypeFont.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_RESOURCE_TRUE_TYPE_FONT_H__
-#define __MYGUI_RESOURCE_TRUE_TYPE_FONT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_ITexture.h"
-#include "MyGUI_IFont.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ResourceTrueTypeFont :
-		public IFont
-	{
-		MYGUI_RTTI_DERIVED( ResourceTrueTypeFont )
-
-	public:
-		typedef std::vector<PairCodePoint> VectorPairCodePoint;
-		typedef std::vector<RangeInfo> VectorRangeInfo;
-		typedef std::vector<PairCodeCoord> VectorPairCodeCoord;
-
-	public:
-		ResourceTrueTypeFont();
-		virtual ~ResourceTrueTypeFont();
-
-		virtual void deserialization(xml::ElementPtr _node, Version _version);
-
-		virtual GlyphInfo* getGlyphInfo(Char _id);
-
-		virtual ITexture* getTextureFont() { return mTexture; }
-
-		// получившаяся высота при генерации в пикселях
-		virtual int getDefaultHeight() { return mHeightPix; }
-
-	private:
-		void addCodePointRange(Char _first, Char _second);
-		void addHideCodePointRange(Char _first, Char _second);
-
-		// проверяет, входит ли символ в зоны ненужных символов
-		bool checkHidePointCode(Char _id);
-
-		/** Clear the list of code point ranges. */
-		void clearCodePointRanges();
-
-		void initialise();
-
-		void addGlyph(GlyphInfo * _info, Char _index, int _left, int _top, int _right, int _bottom, int _finalw, int _finalh, float _aspect, int _addHeight = 0);
-		// write 2 or 4 bytes into buffer: LA or LLLA if _rgba is true
-		uint8* writeData(uint8* _pDest, unsigned char _luminance, unsigned char _alpha, bool _rgba);
-
-	private:
-		// Source of the font
-		std::string mSource;
-		// Size of the truetype font, in points
-		float mTtfSize;
-		// Resolution (dpi) of truetype font
-		uint mTtfResolution;
-
-		bool mAntialiasColour;
-
-		int mDistance;
-		int mSpaceWidth;
-		int mTabWidth;
-		int mCursorWidth;
-		int mSelectionWidth;
-		int mOffsetHeight;
-		int mHeightPix;
-
-		// отдельная информация о символах
-		GlyphInfo mSpaceGlyphInfo, mTabGlyphInfo, mSelectGlyphInfo, mSelectDeactiveGlyphInfo, mCursorGlyphInfo;
-
-		// символы которые не нужно рисовать
-		VectorPairCodePoint mVectorHideCodePoint;
-
-		// вся информация о символах
-		VectorRangeInfo mVectorRangeInfo;
-
-		MyGUI::ITexture* mTexture;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_RESOURCE_TRUE_TYPE_FONT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RotatingSkin.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RotatingSkin.h
deleted file mode 100644
index 80847841fd..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_RotatingSkin.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*!
-	@file
-	@author		George Evmenov
-	@date		05/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_ROTATING_SKIN_H__
-#define __MYGUI_ROTATING_SKIN_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_ICroppedRectangle.h"
-#include "MyGUI_SubSkin.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT RotatingSkin : public SubSkin
-	{
-		MYGUI_RTTI_DERIVED( RotatingSkin )
-
-	public:
-		RotatingSkin();
-		virtual ~RotatingSkin();
-
-		/** Set angle of rotation */
-		void setAngle(float _angle);
-		/** Get angle of rotation */
-		float getAngle() const { return mAngle; }
-
-		/** Set center of rotation
-			@param _center Center point.
-			@param _local If true - _center point calculated as point on SubWidget, else calculated as point on screen.
-		*/
-		void setCenter(const IntPoint &_center, bool _local = true);
-		/** Get center of rotation */
-		IntPoint getCenter(bool _local = true) const;
-
-		// ����� ��� ��������� ����
-		virtual void doRender();
-
-	protected:
-		void recalculateAngles();
-
-	private:
-		float mAngle;
-		IntPoint mCenterPos;
-		bool mLocalCenter;
-
-		/*
-			0 3
-			1 2
-		*/
-		float mBaseAngles[4];
-		float mBaseDistances[4];
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_ROTATING_SKIN_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ScrollView.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ScrollView.h
deleted file mode 100644
index e59bbe04a0..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ScrollView.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		08/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_SCROLL_VIEW_H__
-#define __MYGUI_SCROLL_VIEW_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_ScrollViewBase.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT ScrollView :
-		public Widget,
-		protected ScrollViewBase
-	{
-		MYGUI_RTTI_DERIVED( ScrollView )
-
-	public:
-		ScrollView();
-
-		//! @copydoc Widget::setPosition(const IntPoint& _value)
-		virtual void setPosition(const IntPoint& _value);
-		//! @copydoc Widget::setSize(const IntSize& _value)
-		virtual void setSize(const IntSize& _value);
-		//! @copydoc Widget::setCoord(const IntCoord& _value)
-		virtual void setCoord(const IntCoord& _value);
-
-		/** @copydoc Widget::setPosition(int _left, int _top) */
-		void setPosition(int _left, int _top) { setPosition(IntPoint(_left, _top)); }
-		/** @copydoc Widget::setSize(int _width, int _height) */
-		void setSize(int _width, int _height) { setSize(IntSize(_width, _height)); }
-		/** @copydoc Widget::setCoord(int _left, int _top, int _width, int _height) */
-		void setCoord(int _left, int _top, int _width, int _height) { setCoord(IntCoord(_left, _top, _width, _height)); }
-
-		/** Show VScroll when text size larger than Edit */
-		void setVisibleVScroll(bool _value);
-		/** Get Show VScroll flag */
-		bool isVisibleVScroll() { return mVisibleVScroll; }
-
-		/** Show HScroll when text size larger than Edit */
-		void setVisibleHScroll(bool _value);
-		/** Get Show HScroll flag */
-		bool isVisibleHScroll() { return mVisibleHScroll; }
-
-		/** Set canvas align */
-		void setCanvasAlign(Align _value);
-		/** Get canvas align */
-		Align getCanvasAlign() { return mContentAlign; }
-
-		/** Set canvas size */
-		void setCanvasSize(const IntSize& _value);
-		/** Set canvas size */
-		void setCanvasSize(int _width, int _height) { setCanvasSize(IntSize(_width, _height)); }
-		/** Get canvas size */
-		IntSize getCanvasSize();
-
-		/** Get rect where child widgets placed */
-		const IntCoord& getClientCoord();
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void Widget::setCoord(const IntCoord& _coord)")
-		void setPosition(const IntCoord& _coord) { setCoord(_coord); }
-		MYGUI_OBSOLETE("use : void Widget::setCoord(int _left, int _top, int _width, int _height)")
-		void setPosition(int _left, int _top, int _width, int _height) { setCoord(_left, _top, _width, _height); }
-
-		MYGUI_OBSOLETE("use : void ScrollView::setVisibleVScroll(bool _visible)")
-		void showVScroll(bool _visible) { setVisibleVScroll(_visible); }
-		MYGUI_OBSOLETE("use : bool ScrollView::isVisibleVScroll()")
-		bool isShowVScroll() { return isVisibleVScroll(); }
-		MYGUI_OBSOLETE("use : void ScrollView::setVisibleHScroll(bool _visible)")
-		void showHScroll(bool _visible) { setVisibleHScroll(_visible); }
-		MYGUI_OBSOLETE("use : bool ScrollView::isVisibleHScroll()")
-		bool isShowHScroll() { return isVisibleHScroll(); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	protected:
-		virtual ~ScrollView();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		// переопределяем для присвоению холста
-		virtual Widget* baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name);
-
-		void notifyMouseSetFocus(Widget* _sender, Widget* _old);
-		void notifyMouseLostFocus(Widget* _sender, Widget* _new);
-		void notifyMousePressed(Widget* _sender, int _left, int _top, MouseButton _id);
-		void notifyMouseReleased(Widget* _sender, int _left, int _top, MouseButton _id);
-
-		void notifyScrollChangePosition(VScroll* _sender, size_t _position);
-		void notifyMouseWheel(Widget* _sender, int _rel);
-
-		virtual void onKeyLostFocus(Widget* _new);
-		virtual void onKeySetFocus(Widget* _old);
-
-		void updateScrollViewState();
-		void updateView();
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-		// размер данных
-		virtual IntSize getContentSize();
-		// смещение данных
-		virtual IntPoint getContentPosition();
-		virtual void setContentPosition(const IntPoint& _point);
-		// размер окна, через которые видно данные
-		virtual IntSize getViewSize() const;
-		// размер на который прокручиваются данные при щелчке по скролу
-		virtual size_t getVScrollPage();
-		virtual size_t getHScrollPage();
-
-		virtual Align getContentAlign() { return mContentAlign; }
-
-	protected:
-		bool mIsFocus;
-		bool mIsPressed;
-
-		Widget* mScrollClient;
-		Align mContentAlign;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_SCROLL_VIEW_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ScrollViewBase.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ScrollViewBase.h
deleted file mode 100644
index 4ec39e274b..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ScrollViewBase.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		10/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_SCROLL_VIEW_BASE_H__
-#define __MYGUI_SCROLL_VIEW_BASE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-
-namespace MyGUI
-{
-
-	class ScrollViewBase
-	{
-
-	protected:
-		ScrollViewBase();
-		virtual ~ScrollViewBase() { }
-
-		void updateScrollSize();
-		void updateScrollPosition();
-
-		// ������ ������
-		virtual IntSize getContentSize() { return IntSize(); }
-		// �������� ������
-		virtual IntPoint getContentPosition() { return IntPoint(); }
-		virtual void setContentPosition(const IntPoint& _value) { }
-		// ������ ����, ����� ������� ����� ������
-		virtual IntSize getViewSize() const { return IntSize(); }
-		// ������ �� ������� �������������� ������ ��� ������ �� ������
-		virtual size_t getHScrollPage() { return 1; }
-		virtual size_t getVScrollPage() { return 1; }
-
-		virtual Align getContentAlign() { return Align::Center; }
-
-		virtual void eraseContent() { }
-
-	protected:
-		VScroll* mVScroll;
-		HScroll* mHScroll;
-		Widget* mClient;
-
-		bool mVisibleHScroll;
-		bool mVisibleVScroll;
-
-		size_t mVRange;
-		size_t mHRange;
-
-		// ���������� �� ���������� ��� �������
-		bool mChangeContentByResize;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_SCROLL_VIEW_BASE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SharedLayer.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SharedLayer.h
deleted file mode 100644
index efa6611a1e..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SharedLayer.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_SHARED_LAYER_H__
-#define __MYGUI_SHARED_LAYER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_ILayer.h"
-#include "MyGUI_SharedLayerNode.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT SharedLayer :
-		public ILayer
-	{
-		MYGUI_RTTI_DERIVED( SharedLayer )
-
-	public:
-		SharedLayer();
-		virtual ~SharedLayer();
-
-		virtual void deserialization(xml::ElementPtr _node, Version _version);
-
-		// ������� �������� ���
-		virtual ILayerNode* createChildItemNode();
-		// ������� �������� ���
-		virtual void destroyChildItemNode(ILayerNode* _node);
-
-		// ��������� �������� ���
-		virtual void upChildItemNode(ILayerNode* _node);
-
-		// ������ �����
-		virtual EnumeratorILayerNode getEnumerator();
-
-		// ���������� ������ �� �������
-		virtual ILayerItem* getLayerItemByPoint(int _left, int _top);
-
-		virtual IntPoint getPosition(int _left, int _top) const;
-
-		virtual const IntSize& getSize() const;
-
-		// ������ ����
-		virtual void renderToTarget(IRenderTarget* _target, bool _update);
-
-		virtual void dumpStatisticToLog();
-
-	protected:
-		bool mIsPick;
-		SharedLayerNode* mChildItem;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_SHARED_LAYER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SharedLayerNode.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SharedLayerNode.h
deleted file mode 100644
index 8b8149e55c..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SharedLayerNode.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_SHARED_LAYER_NODE_H__
-#define __MYGUI_SHARED_LAYER_NODE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_LayerNode.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT SharedLayerNode : public LayerNode
-	{
-		MYGUI_RTTI_DERIVED( SharedLayerNode )
-
-	public:
-		explicit SharedLayerNode(ILayer* _layer, ILayerNode* _parent = nullptr);
-		virtual ~SharedLayerNode();
-
-		void addUsing() { mCountUsing++; }
-		void removeUsing() { mCountUsing--; }
-		size_t countUsing() { return mCountUsing; }
-
-	private:
-		size_t mCountUsing;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_SHARED_LAYER_NODE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SimpleText.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SimpleText.h
deleted file mode 100644
index 4998cfd94b..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SimpleText.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_SIMPLE_TEXT_H__
-#define __MYGUI_SIMPLE_TEXT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_ISubWidgetText.h"
-#include "MyGUI_EditText.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT SimpleText : public EditText
-	{
-		MYGUI_RTTI_DERIVED( SimpleText )
-
-	public:
-		SimpleText();
-		virtual ~SimpleText();
-
-		virtual void setViewOffset(const IntPoint& _point);
-
-		virtual void doRender();
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_SIMPLE_TEXT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SkinManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SkinManager.h
deleted file mode 100644
index e7a88efffb..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SkinManager.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_SKIN_MANAGER_H__
-#define __MYGUI_SKIN_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_Enumerator.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_ResourceManager.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT SkinManager
-	{
-		MYGUI_INSTANCE_HEADER( SkinManager )
-
-	public:
-		void initialise();
-		void shutdown();
-
-		/** Load additional MyGUI *_skin.xml file */
-		bool load(const std::string& _file);
-		void _load(xml::ElementPtr _node, const std::string& _file, Version _version);
-
-		ResourceSkin* getByName(const std::string& _name) const;
-
-		bool isExist(const std::string& _name) const;
-
-		const std::string getDefaultSkin() const { return mDefaultName; }
-		void setDefaultSkin(const std::string& _value);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : ResourceSkin* SkinManager::getByName(const std::string& _name)")
-		ResourceSkin* getSkin(const std::string& _name) const { return getByName(_name); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	private:
-		void createDefault(const std::string& _value);
-
-	private:
-		std::string mDefaultName;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_SKIN_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_StaticImage.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_StaticImage.h
deleted file mode 100644
index 945976d7ed..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_StaticImage.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_STATIC_IMAGE_H__
-#define __MYGUI_STATIC_IMAGE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_ResourceImageSet.h"
-#include "MyGUI_ImageInfo.h"
-#include "MyGUI_Guid.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT StaticImage :
-		public Widget
-	{
-		MYGUI_RTTI_DERIVED( StaticImage )
-
-	public:
-		StaticImage();
-
-		//------------------------------------------------------------------------------//
-		// The simple interface
-		//------------------------------------------------------------------------------//
-
-		/* Set texture and size of image _tile
-			@param _texture file name or texture name
-			@param _coord - part of texture where we take tiles
-			@param _tile size
-		*/
-		void setImageInfo(const std::string& _texture, const IntCoord& _coord, const IntSize& _tile);
-
-		/* Set texture
-			@param _texture file name or texture name
-		*/
-		void setImageTexture(const std::string& _value);
-
-		/** Set _rect - part of texture where we take tiles */
-		void setImageRect(const IntRect& _value);
-
-		/** Set _coord - part of texture where we take tiles */
-		void setImageCoord(const IntCoord& _value);
-
-		/** Set _tile size */
-		void setImageTile(const IntSize& _value);
-
-		/** Set current tile index
-			@param _index - tile index
-			@remarks Tiles in file start numbering from left to right and from top to bottom.
-			\n \bExample:\n
-			<pre>
-				+---+---+---+
-				| 0 | 1 | 2 |
-				+---+---+---+
-				| 3 | 4 | 5 |
-				+---+---+---+
-			</pre>
-		*/
-		void setImageIndex(size_t _index);
-		/** Get current tile index */
-		size_t getImageIndex();
-
-		//------------------------------------------------------------------------------//
-		// The expanded interface
-		//------------------------------------------------------------------------------//
-
-		//! Get number of items
-		size_t getItemCount() const { return mItems.size(); }
-
-		//! Select specified _index
-		void setItemSelect(size_t _index);
-		//! Get index of selected item (ITEM_NONE if none selected)
-		size_t getItemSelect() { return mIndexSelect; }
-		//! Reset item selection
-		void resetItemSelect() { setItemSelect(ITEM_NONE); }
-
-		//! Insert an item into a list at a specified position
-		void insertItem(size_t _index, const IntCoord& _item);
-		//! Add an item to the end of a list
-		void addItem(const IntCoord& _item) { insertItem(ITEM_NONE, _item); }
-		//! Replace an item at a specified position
-		void setItem(size_t _index, const IntCoord& _item);
-
-		//! Delete item at a specified position
-		void deleteItem(size_t _index);
-		//! Delete all items
-		void deleteAllItems();
-
-		// работа с фреймами анимированных индексов
-		/** Add frame
-			@param _index Image item index
-			@param _item Frame coordinates at image texture
-		*/
-		void addItemFrame(size_t _index, const IntCoord& _item);
-
-		/** Insert frame
-			@param _index Image item index
-			@param _indexFrame Frame index where we insert frame
-			@param _item Frame coordinates at image texture
-		*/
-		void insertItemFrame(size_t _index, size_t _indexFrame, const IntCoord& _item);
-
-		/** Add copy of frame (similar to StaticImage::addItemFrame but we copy frame coordinates)
-			@param _index Image item index
-			@param _indexSourceFrame Frame index of frame that we copying
-		*/
-		void addItemFrameDublicate(size_t _index, size_t _indexSourceFrame);
-
-		/** Insert copy of frame (similar to StaticImage::insertItemFrame but we copy frame coordinates)
-			@param _index Image item index
-			@param _indexFrame Frame index where we insert frame
-			@param _indexSourceFrame Frame index of frame that we copying
-		*/
-		void insertItemFrameDublicate(size_t _index, size_t _indexFrame, size_t _indexSourceFrame);
-
-		/** Change frame
-			@param _index Image item index
-			@param _indexFrame Frame index to change
-			@param _item Frame coordinates at image texture
-		*/
-		void setItemFrame(size_t _index, size_t _indexFrame, const IntCoord& _item);
-
-		/** Delete frame
-			@param _index Image item index
-			@param _indexFrame Frame index that we delete
-		*/
-		void deleteItemFrame(size_t _index, size_t _indexFrame);
-
-		/** Delete all frames
-			@param _index Image item index
-		*/
-		void deleteAllItemFrames(size_t _index);
-
-		/** Set item frame rate
-			@param _index Image item index
-			@param _rate Duration of one frame in seconds
-		*/
-		void setItemFrameRate(size_t _index, float _rate);
-
-		/** Get item frame rate
-			@param _index Image item index
-		*/
-		float getItemFrameRate(size_t _index);
-
-		//------------------------------------------------------------------------------//
-		// The interface with support of resources
-		//------------------------------------------------------------------------------//
-
-		/** Select current items resource used in StaticImage
-			@param _id Resource guid
-			@return false if resource with such guid not exist
-		*/
-		bool setItemResource(const Guid& _id);
-
-		/** Select current items resource used in StaticImage
-			@param _id Resource name
-			@return false if resource with such name not exist
-		*/
-		bool setItemResource(const std::string& _name);
-
-		/** Select current item group */
-		void setItemGroup(const std::string& _value);
-		/** Select current item mane */
-		void setItemName(const std::string& _value);
-
-		/** Select current items resource used in StaticImage
-			@param _resource Resource pointer
-		*/
-		void setItemResourcePtr(ResourceImageSetPtr _resource);
-		/** Set current item */
-		void setItemResourceInfo(const ImageIndexInfo& _info);
-
-		/** Get current items resource used in StaticImage */
-		ResourceImageSetPtr getItemResource() { return mResource; }
-		/** Select current item resource, group and name */
-		void setItemResourceInfo(ResourceImageSetPtr _resource, const std::string& _group, const std::string& _name);
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	protected:
-		virtual ~StaticImage();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-		void frameEntered(float _frame);
-
-		void recalcIndexes();
-		void updateSelectIndex(size_t _index);
-
-		void frameAdvise(bool _advise);
-
-	private:
-		// кусок в текстуре наших картинок
-		IntRect mRectImage;
-		// размер одной картинки
-		IntSize mSizeTile;
-		// размер текстуры
-		IntSize mSizeTexture;
-		// текущая картинка
-		size_t mIndexSelect;
-
-		VectorImages mItems;
-
-		bool mFrameAdvise;
-		float mCurrentTime;
-		size_t mCurrentFrame;
-
-		ResourceImageSetPtr mResource;
-		std::string mItemName;
-		std::string mItemGroup;
-		std::string mCurrentTextureName;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_STATIC_IMAGE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_StaticText.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_StaticText.h
deleted file mode 100644
index 146d03f663..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_StaticText.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_STATIC_TEXT_H__
-#define __MYGUI_STATIC_TEXT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Widget.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT StaticText :
-		public Widget
-	{
-		MYGUI_RTTI_DERIVED( StaticText )
-
-	public:
-		StaticText();
-
-		/** Get text region coordinate */
-		IntCoord getTextRegion();
-
-		/** Get text region size */
-		IntSize getTextSize();
-
-		/** Set widget text font */
-		virtual void setFontName(const std::string& _value);
-		/** Get widget text font name */
-		const std::string& getFontName();
-
-		/** Set widget text font height */
-		virtual void setFontHeight(int _value);
-		/** Get widget text font height */
-		int getFontHeight();
-
-		/** Set widget text align */
-		virtual void setTextAlign(Align _value);
-		/** Get widget text align */
-		Align getTextAlign();
-
-		/** Set widget text colour */
-		virtual void setTextColour(const Colour& _value);
-		/** Get widget text colour */
-		const Colour& getTextColour();
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	protected:
-		virtual ~StaticText();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_STATIC_TEXT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SubSkin.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SubSkin.h
deleted file mode 100644
index 80b97ab91f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SubSkin.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_SUB_SKIN_H__
-#define __MYGUI_SUB_SKIN_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_ISubWidgetRect.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_IStateInfo.h"
-
-namespace MyGUI
-{
-
-	class RenderItem;
-
-	class MYGUI_EXPORT SubSkin :
-		public ISubWidgetRect
-	{
-		MYGUI_RTTI_DERIVED( SubSkin )
-
-	public:
-		SubSkin();
-		virtual ~SubSkin();
-
-		void setAlpha(float _alpha);
-
-		virtual void setVisible(bool _visible);
-
-		virtual void setStateData(IStateInfo* _data);
-
-		virtual void createDrawItem(ITexture* _texture, ILayerNode * _node);
-		virtual void destroyDrawItem();
-
-		// метод для отрисовки себя
-		virtual void doRender();
-
-	/*internal:*/
-		void _updateView();
-		void _correctView();
-
-		void _setAlign(const IntSize& _oldsize, bool _update);
-		void _setAlign(const IntCoord& _oldcoord, bool _update);
-
-		virtual void _setUVSet(const FloatRect& _rect);
-		virtual void _setColour(const Colour& _value);
-
-	protected:
-		FloatRect mRectTexture;
-		bool mEmptyView;
-
-		uint32 mCurrentColour;
-
-		FloatRect mCurrentTexture;
-		IntCoord mCurrentCoord;
-
-		ILayerNode* mNode;
-		RenderItem* mRenderItem;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_SUB_SKIN_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SubWidgetBinding.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SubWidgetBinding.h
deleted file mode 100644
index b6388b2b65..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SubWidgetBinding.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_SUB_WIDGET_BINDING_H__
-#define __MYGUI_SUB_WIDGET_BINDING_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_ISubWidget.h"
-
-namespace MyGUI
-{
-
-	// вспомогательный класс для инициализации сабскинов
-	class MYGUI_EXPORT SubWidgetBinding
-	{
-		// для доступа к внутренним членам
-		friend class ResourceSkin;
-
-	public:
-		SubWidgetBinding()
-		{
-			clear();
-		}
-
-		SubWidgetBinding(const IntCoord& _coord, Align _aligin, const std::string& _type)
-		{
-			create(_coord, _aligin, _type);
-		}
-
-		void create(const IntCoord& _coord, Align _aligin, const std::string& _type)
-		{
-			clear();
-			mOffset = _coord;
-			mAlign = _aligin;
-			mType = _type;
-		}
-
-		void clear()
-		{
-			mType = "";
-			mAlign = Align::Default;
-			mStates.clear();
-		}
-
-		void add(const std::string& _name, IStateInfo* _data, const std::string& _skin)
-		{
-			// ищем такой же ключ
-			MapStateInfo::const_iterator iter = mStates.find(_name);
-			if (iter != mStates.end())
-			{
-				delete _data;
-				MYGUI_LOG(Warning, "state with name '" << _name << "' already exist in skin '" << _skin << "'");
-				return;
-			}
-			// добавляем
-			mStates[_name] = _data;
-		}
-
-	private:
-		IntCoord mOffset;
-		Align mAlign;
-		std::string mType;
-		MapStateInfo mStates;
-	};
-
-} // namespace MyGUI
-
-
-#endif // __MYGUI_SUB_WIDGET_BINDING_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SubWidgetInfo.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SubWidgetInfo.h
deleted file mode 100644
index 0d2bd1e455..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SubWidgetInfo.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		26/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_SUB_WIDGET_INFO_H__
-#define __MYGUI_SUB_WIDGET_INFO_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	// ����������, �� ����� ����������
-	struct SubWidgetInfo
-	{
-		SubWidgetInfo(const std::string& _type, const IntCoord& _coord, Align _align) :
-			coord(_coord),
-			align(_align),
-			type(_type)
-		{
-		}
-
-		IntCoord coord;
-		Align align;
-		std::string type;
-	};
-
-	typedef std::vector<SubWidgetInfo> VectorSubWidgetInfo;
-
-} // namespace MyGUI
-
-#endif // __MYGUI_SUB_WIDGET_INFO_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SubWidgetManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SubWidgetManager.h
deleted file mode 100644
index cfbeb4a93f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_SubWidgetManager.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_SUB_WIDGET_MANAGER_H__
-#define __MYGUI_SUB_WIDGET_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT SubWidgetManager
-	{
-		MYGUI_INSTANCE_HEADER( SubWidgetManager )
-
-	public:
-		void initialise();
-		void shutdown();
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_SUB_WIDGET_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TCoord.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TCoord.h
deleted file mode 100644
index 165e0aa56b..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TCoord.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MyGUI_TCOORD_H__
-#define __MyGUI_TCOORD_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_TPoint.h"
-#include "MyGUI_TSize.h"
-
-namespace MyGUI
-{
-	namespace types
-	{
-
-		template< typename T > struct TCoord
-		{
-			T left, top, width, height;
-
-			TCoord() : left( 0 ), top( 0 ), width( 0 ), height( 0 ) { }
-			TCoord( T const& _left, T const& _top, T const& _width, T const& _height ) : left( _left ), top( _top ), width( _width ), height( _height ) { }
-			TCoord( TCoord const& _obj ) : left( _obj.left ), top( _obj.top ), width( _obj.width ), height( _obj.height ) { }
-			TCoord( TPoint<T> const& _point, TSize<T> const& _size ) : left( _point.left ), top( _point.top ), width( _size.width ), height( _size.height ) { }
-
-			TCoord& operator-=( TCoord const& _obj )
-			{
-				left -= _obj.left;
-				top -= _obj.top;
-				width -= _obj.width;
-				height -= _obj.height;
-				return *this;
-			}
-
-			TCoord& operator+=( TCoord const& _obj )
-			{
-				left += _obj.left;
-				top += _obj.top;
-				width += _obj.width;
-				height += _obj.height;
-				return *this;
-			}
-
-			TCoord operator-( TCoord const& _obj ) const
-			{
-				return TCoord(left - _obj.left, top - _obj.top, width - _obj.width, height - _obj.height);
-			}
-
-			TCoord operator-( TPoint<T> const& _obj ) const
-			{
-				return TCoord(left - _obj.left, top - _obj.top, width, height);
-			}
-
-			TCoord operator-( TSize<T> const& _obj ) const
-			{
-				return TCoord(left, top, width - _obj.width, height - _obj.height);
-			}
-
-			TCoord operator+( TCoord const& _obj ) const
-			{
-				return TCoord(left + _obj.left, top + _obj.top, width + _obj.width, height + _obj.height);
-			}
-
-			TCoord operator+( TPoint<T> const& _obj ) const
-			{
-				return TCoord(left + _obj.left, top + _obj.top, width, height);
-			}
-
-			TCoord operator+( TSize<T> const& _obj ) const
-			{
-				return TCoord(left, top, width + _obj.width, height + _obj.height);
-			}
-
-			TCoord& operator=( TCoord const& _obj )
-			{
-				left = _obj.left;
-				top = _obj.top;
-				width = _obj.width;
-				height = _obj.height;
-				return *this;
-			}
-
-			template< typename U >
-			TCoord& operator=( TCoord<U> const& _obj )
-			{
-				left = _obj.left;
-				top = _obj.top;
-				width = _obj.width;
-				height = _obj.height;
-				return *this;
-			}
-
-			TCoord& operator=( TPoint<T> const& _obj )
-			{
-				left = _obj.left;
-				top = _obj.top;
-				return *this;
-			}
-
-			TCoord& operator=( TSize<T> const& _obj )
-			{
-				width = _obj.width;
-				height = _obj.height;
-				return *this;
-			}
-
-
-			bool operator==( TCoord const& _obj ) const
-			{
-				return ((left == _obj.left) && (top == _obj.top) && (width == _obj.width) && (height == _obj.height));
-			}
-
-			bool operator!=( TCoord const& _obj ) const
-			{
-				return ! ((left == _obj.left) && (top == _obj.top) && (width == _obj.width) && (height == _obj.height));
-			}
-
-			T right() const
-			{
-				return left + width;
-			}
-
-			T bottom() const
-			{
-				return top + height;
-			}
-
-			void clear()
-			{
-				left = top = width = height = 0;
-			}
-
-			void set( T const& _left, T const& _top, T const& _width, T const& _height )
-			{
-				left = _left;
-				top = _top;
-				width = _width;
-				height = _height;
-			}
-
-			void swap(TCoord& _value)
-			{
-				TCoord tmp = _value;
-				_value = *this;
-				*this = tmp;
-			}
-
-			bool empty() const
-			{
-				return ((left == 0) && (top == 0) && (width == 0) && (height == 0));
-			}
-
-			TPoint<T> point() const
-			{
-				return TPoint<T>(left, top);
-			}
-
-			TSize<T> size() const
-			{
-				return TSize<T>(width, height);
-			}
-
-			bool inside(const TPoint<T>&  _value) const
-			{
-				return ( (_value.left >= left) && (_value.left <= right()) && (_value.top >= top) && (_value.top <= bottom()) );
-			}
-
-			std::string print() const
-			{
-				std::ostringstream stream;
-				stream << *this;
-				return stream.str();
-			}
-
-			static TCoord<T> parse(const std::string& _value)
-			{
-				TCoord<T> result;
-				std::istringstream stream(_value);
-				stream >> result.left >> result.top >> result.width >> result.height;
-				if (stream.fail()) return TCoord<T>();
-				else
-				{
-					int item = stream.get();
-					while (item != -1)
-					{
-						if (item != ' ' && item != '\t') return TCoord<T>();
-						item = stream.get();
-					}
-				}
-				return result;
-			}
-
-			friend std::ostream& operator << ( std::ostream& _stream, const TCoord<T>&  _value )
-			{
-				_stream << _value.left << " " << _value.top << " " << _value.width << " " << _value.height;
-				return _stream;
-			}
-
-			friend std::istream& operator >> ( std::istream& _stream, TCoord<T>&  _value )
-			{
-				_stream >> _value.left >> _value.top >> _value.width >> _value.height;
-				if (_stream.fail()) _value.clear();
-				return _stream;
-			}
-
-		};
-
-	} // namespace types
-} // namespace MyGUI
-
-#endif // __MyGUI_TCOORD_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TPoint.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TPoint.h
deleted file mode 100644
index bfeb692f99..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TPoint.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_TPONT_H__
-#define __MYGUI_TPONT_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-	namespace types
-	{
-		template< typename T > struct TPoint
-		{
-			T left, top;
-
-			TPoint() : left( 0 ), top( 0 ) { }
-			TPoint( T const& _left, T const& _top) : left( _left ), top( _top ) { }
-			TPoint( TPoint const& o ) : left( o.left ), top( o.top ) { }
-
-			TPoint& operator-=( TPoint const& o )
-			{
-				left -= o.left;
-				top -= o.top;
-				return *this;
-			}
-
-			TPoint& operator+=( TPoint const& o )
-			{
-				left += o.left;
-				top += o.top;
-				return *this;
-			}
-
-			TPoint operator-( TPoint const& o ) const
-			{
-				return TPoint(left - o.left, top - o.top);
-			}
-
-			TPoint operator+( TPoint const& o ) const
-			{
-				return TPoint(left + o.left, top + o.top);
-			}
-
-			TPoint& operator=( TPoint const& o )
-			{
-				left = o.left;
-				top = o.top;
-				return *this;
-			}
-
-			template< typename U >
-			TPoint& operator=( TPoint<U> const& o )
-			{
-				left = o.left;
-				top = o.top;
-				return *this;
-			}
-
-			bool operator==( TPoint const& o ) const
-			{
-				return ((left == o.left) && (top == o.top));
-			}
-
-			bool operator!=( TPoint const& o ) const
-			{
-				return ! ((left == o.left) && (top == o.top));
-			}
-
-			void clear()
-			{
-				left = top = 0;
-			}
-
-			void set( T const& _left, T const& _top)
-			{
-				left = _left;
-				top = _top;
-			}
-
-			void swap(TPoint& _value)
-			{
-				TPoint tmp = _value;
-				_value = *this;
-				*this = tmp;
-			}
-
-			bool empty() const
-			{
-				return ((left == 0) && (top == 0));
-			}
-
-			std::string print() const
-			{
-				std::ostringstream stream;
-				stream << *this;
-				return stream.str();
-			}
-
-			static TPoint<T> parse(const std::string& _value)
-			{
-				TPoint<T> result;
-				std::istringstream stream(_value);
-				stream >> result.left >> result.top;
-				if (stream.fail()) return TPoint<T>();
-				else
-				{
-					int item = stream.get();
-					while (item != -1)
-					{
-						if (item != ' ' && item != '\t') return TPoint<T>();
-						item = stream.get();
-					}
-				}
-				return result;
-			}
-
-			friend std::ostream& operator << ( std::ostream& _stream, const TPoint<T>&  _value )
-			{
-				_stream << _value.left << " " << _value.top;
-				return _stream;
-			}
-
-			friend std::istream& operator >> ( std::istream& _stream, TPoint<T>&  _value )
-			{
-				_stream >> _value.left >> _value.top;
-				if (_stream.fail()) _value.clear();
-				return _stream;
-			}
-
-		};
-
-	} // namespace types
-} // namespace MyGUI
-
-#endif // __MYGUI_TPONT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TRect.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TRect.h
deleted file mode 100644
index c0e41c6f68..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TRect.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_TRECT_H__
-#define __MYGUI_TRECT_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-	namespace types
-	{
-
-		template< typename T > struct TRect
-		{
-			T left, top, right, bottom;
-
-			TRect() : left( 0 ), top( 0 ), right( 0 ), bottom( 0 ) { }
-			TRect( T const& _left, T const& _top, T const& _right, T const& _bottom ) : left( _left ), top( _top ), right( _right ), bottom( _bottom ) { }
-			TRect( TRect const& o ) : left( o.left ), top( o.top ), right( o.right ), bottom( o.bottom ) { }
-
-			TRect& operator-=( TRect const& o )
-			{
-				left -= o.left;
-				top -= o.top;
-				right -= o.right;
-				bottom -= o.bottom;
-				return *this;
-			}
-
-			TRect& operator+=( TRect const& o )
-			{
-				left += o.left;
-				top += o.top;
-				right += o.right;
-				bottom += o.bottom;
-				return *this;
-			}
-
-			TRect operator-( TRect const& o ) const
-			{
-				return TRect(left - o.left, top - o.top, right - o.right, bottom - o.bottom);
-			}
-
-			TRect operator+( TRect const& o ) const
-			{
-				return TRect(left + o.left, top + o.top, right + o.right, bottom + o.bottom);
-			}
-
-			TRect& operator=( TRect const& o )
-			{
-				left = o.left;
-				top = o.top;
-				right = o.right;
-				bottom = o.bottom;
-				return *this;
-			}
-
-			template< typename U >
-			TRect& operator=( TRect<U> const& o )
-			{
-				left = o.left;
-				top = o.top;
-				right = o.right;
-				bottom = o.bottom;
-				return *this;
-			}
-
-			bool operator==( TRect const& o ) const
-			{
-				return ((left == o.left) && (top == o.top) && (right == o.right) && (bottom == o.bottom));
-			}
-
-			bool operator!=( TRect const& o ) const
-			{
-				return ! ((left == o.left) && (top == o.top) && (right == o.right) && (bottom == o.bottom));
-			}
-
-			T width() const
-			{
-				return right - left;
-			}
-
-			T height() const
-			{
-				return bottom - top;
-			}
-
-			void clear()
-			{
-				left = top = right = bottom = 0;
-			}
-
-			void set( T const& _left, T const& _top, T const& _right, T const& _bottom )
-			{
-				left = _left;
-				top = _top;
-				right = _right;
-				bottom = _bottom;
-			}
-
-			void swap(TRect& _value)
-			{
-				TRect tmp = _value;
-				_value = *this;
-				*this = tmp;
-			}
-
-			bool empty() const
-			{
-				return ((left == 0) && (top == 0) && (right == 0) && (bottom == 0));
-			}
-
-			bool inside(const TRect<T>&  _value) const
-			{
-				return ( (_value.left >= left) && (_value.right <= right) && (_value.top >= top) && (_value.bottom <= bottom) );
-			}
-
-			bool intersect(const TRect<T>&  _value) const
-			{
-				return ( (_value.left <= right) && (_value.right >= left) && (_value.top <= bottom) && (_value.bottom >= top) );
-			}
-
-			bool inside(const TPoint<T>&  _value) const
-			{
-				return ( (_value.left >= left) && (_value.left <= right) && (_value.top >= top) && (_value.top <= bottom) );
-			}
-
-			std::string print() const
-			{
-				std::ostringstream stream;
-				stream << *this;
-				return stream.str();
-			}
-
-			static TRect<T> parse(const std::string& _value)
-			{
-				TRect<T> result;
-				std::istringstream stream(_value);
-				stream >> result.left >> result.top >> result.right >> result.bottom;
-				if (stream.fail()) return TRect<T>();
-				else
-				{
-					int item = stream.get();
-					while (item != -1)
-					{
-						if (item != ' ' && item != '\t') return TRect<T>();
-						item = stream.get();
-					}
-				}
-				return result;
-			}
-
-			friend std::ostream& operator << ( std::ostream& _stream, const TRect<T>&  _value )
-			{
-				_stream << _value.left << " " << _value.top << " " << _value.right << " " << _value.bottom;
-				return _stream;
-			}
-
-			friend std::istream& operator >> ( std::istream& _stream, TRect<T>&  _value )
-			{
-				_stream >> _value.left >> _value.top >> _value.right >> _value.bottom;
-				if (_stream.fail()) _value.clear();
-				return _stream;
-			}
-
-		};
-
-	} // namespace types
-} // namespace MyGUI
-
-#endif // __MYGUI_TRECT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TSize.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TSize.h
deleted file mode 100644
index 3b896d25b2..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TSize.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_TSIZE_H__
-#define __MYGUI_TSIZE_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-	namespace types
-	{
-
-		template< typename T > struct TSize
-		{
-			T width, height;
-
-			TSize() : width( 0 ), height( 0 ) { }
-			TSize( T const& w, T const& h) : width( w ), height( h ) { }
-			TSize( TSize const& o ) : width( o.width ), height( o.height ) { }
-
-			TSize& operator-=( TSize const& o )
-			{
-				width -= o.width;
-				height -= o.height;
-				return *this;
-			}
-
-			TSize& operator+=( TSize const& o )
-			{
-				width += o.width;
-				height += o.height;
-				return *this;
-			}
-
-			TSize operator-( TSize const& o ) const
-			{
-				return TSize(width - o.width, height - o.height);
-			}
-
-			TSize operator+( TSize const& o ) const
-			{
-				return TSize(width + o.width, height + o.height);
-			}
-
-			TSize& operator=( TSize const& o )
-			{
-				width = o.width;
-				height = o.height;
-				return *this;
-			}
-
-			template< typename U >
-			TSize& operator=( TSize<U> const& o )
-			{
-				width = o.width;
-				height = o.height;
-				return *this;
-			}
-
-			bool operator==( TSize const& o ) const
-			{
-				return ((width == o.width) && (height == o.height));
-			}
-
-			bool operator!=( TSize const& o ) const
-			{
-				return ! ((width == o.width) && (height == o.height));
-			}
-
-			void clear()
-			{
-				width = height = 0;
-			}
-
-			void set( T const& w, T const& h)
-			{
-				width = w;
-				height = h;
-			}
-
-			void swap(TSize& _value)
-			{
-				TSize tmp = _value;
-				_value = *this;
-				*this = tmp;
-			}
-
-			bool empty() const
-			{
-				return ((width == 0) && (height == 0));
-			}
-
-			std::string print() const
-			{
-				std::ostringstream stream;
-				stream << *this;
-				return stream.str();
-			}
-
-			static TSize<T> parse(const std::string& _value)
-			{
-				TSize<T> result;
-				std::istringstream stream(_value);
-				stream >> result.width >> result.height;
-				if (stream.fail()) return TSize<T>();
-				else
-				{
-					int item = stream.get();
-					while (item != -1)
-					{
-						if (item != ' ' && item != '\t') return TSize<T>();
-						item = stream.get();
-					}
-				}
-				return result;
-			}
-
-			friend std::ostream& operator << ( std::ostream& _stream, const TSize<T>&  _value )
-			{
-				_stream << _value.width << " " << _value.height;
-				return _stream;
-			}
-
-			friend std::istream& operator >> ( std::istream& _stream, TSize<T>&  _value )
-			{
-				_stream >> _value.width >> _value.height;
-				if (_stream.fail()) _value.clear();
-				return _stream;
-			}
-
-		};
-
-	} // namespace types
-} // namespace MyGUI
-
-#endif // __MYGUI_TSIZE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Tab.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Tab.h
deleted file mode 100644
index 73056a4f68..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Tab.h
+++ /dev/null
@@ -1,369 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_TAB_H__
-#define __MYGUI_TAB_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_Any.h"
-#include "MyGUI_EventPair.h"
-#include "MyGUI_ControllerFadeAlpha.h"
-
-namespace MyGUI
-{
-
-	typedef delegates::CDelegate2<Tab*, size_t> EventHandle_TabPtrSizeT;
-
-	class MYGUI_EXPORT Tab :
-		public Widget
-	{
-		// для уведобления об удалении
-		//FIXME
-		friend class TabItem;
-
-		MYGUI_RTTI_DERIVED( Tab )
-
-	public:
-		Tab();
-
-		struct TabItemInfo
-		{
-			TabItemInfo(int _width, const UString& _name, TabItem* _item, Any _data) :
-				width(_width),
-				name(_name),
-				item(_item),
-				data(_data)
-			{
-			}
-
-			int width;
-			UString name;
-			TabItem* item;
-			Any data;
-		};
-
-		typedef std::vector<TabItemInfo> VectorTabItemInfo;
-
-		//! @copydoc Widget::setPosition(const IntPoint& _value)
-		virtual void setPosition(const IntPoint& _value);
-		//! @copydoc Widget::setSize(const IntSize& _value)
-		virtual void setSize(const IntSize& _value);
-		//! @copydoc Widget::setCoord(const IntCoord& _value)
-		virtual void setCoord(const IntCoord& _value);
-
-		/** @copydoc Widget::setPosition(int _left, int _top) */
-		void setPosition(int _left, int _top) { setPosition(IntPoint(_left, _top)); }
-		/** @copydoc Widget::setSize(int _width, int _height) */
-		void setSize(int _width, int _height) { setSize(IntSize(_width, _height)); }
-		/** @copydoc Widget::setCoord(int _left, int _top, int _width, int _height) */
-		void setCoord(int _left, int _top, int _width, int _height) { setCoord(IntCoord(_left, _top, _width, _height)); }
-
-		//------------------------------------------------------------------------------//
-		// манипуляции айтемами
-
-		//! Get number of items
-		size_t getItemCount() const { return mItemsInfo.size(); }
-
-		//! Insert an item into a array at a specified position
-		TabItem* insertItemAt(size_t _index, const UString& _name, Any _data = Any::Null);
-		//! Insert an item into a array
-		TabItem* insertItem(TabItem* _to, const UString& _name, Any _data = Any::Null)
-		{
-			return insertItemAt(getItemIndex(_to), _name, _data);
-		}
-
-		//! Add an item to the end of a array
-		TabItem* addItem(const UString& _name, Any _data = Any::Null)
-		{
-			return insertItemAt(ITEM_NONE, _name, _data);
-		}
-
-		//! Remove item at a specified position
-		void removeItemAt(size_t _index);
-		//! Remove item
-		void removeItem(TabItem* _item) { removeItemAt(getItemIndex(_item)); }
-
-		//! Remove all items
-		void removeAllItems();
-
-
-		//! Get item from specified position
-		TabItem* getItemAt(size_t _index);
-
-		//! Get item index
-		size_t getItemIndex(TabItem* _item);
-
-		//! Search item, returns the position of the first occurrence in array or ITEM_NONE if item not found
-		size_t findItemIndex(TabItem* _item);
-
-		//! Search item, returns the position of the first occurrence in array or ITEM_NONE if item not found
-		size_t findItemIndexWith(const UString& _name);
-
-		//! Search item, returns the item of the first occurrence in array or nullptr if item not found
-		TabItem* findItemWith(const UString& _name);
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции выделениями
-
-		//! Get index of selected item (ITEM_NONE if none selected)
-		size_t getIndexSelected() { return mIndexSelect; }
-
-		//! Get selected item (nullptr if none selected)
-		TabItem* getItemSelected();
-
-		//! Select specified _index
-		void setIndexSelected(size_t _index);
-
-		//! Select item
-		void setItemSelected(TabItem* _item) { setIndexSelected(getItemIndex(_item)); }
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции данными
-
-		//! Replace an item data at a specified position
-		void setItemDataAt(size_t _index, Any _data);
-		//! Replace an item data
-		void setItemData(TabItem* _item, Any _data) { setItemDataAt(getItemIndex(_item), _data); }
-
-		//! Clear an item data at a specified position
-		void clearItemDataAt(size_t _index) { setItemDataAt(_index, Any::Null); }
-		//! Clear an item data
-		void clearItemData(TabItem* _item) { clearItemDataAt(getItemIndex(_item)); }
-
-		//! Get item data from specified position
-		template <typename ValueType>
-		ValueType * getItemDataAt(size_t _index, bool _throw = true)
-		{
-			MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "Tab::getItemDataAt");
-			return mItemsInfo[_index].data.castType<ValueType>(_throw);
-		}
-		//! Get item data
-		template <typename ValueType>
-		ValueType * getItemData(TabItem* _item, bool _throw = true)
-		{
-			return getItemDataAt<ValueType>(getItemIndex(_item), _throw);
-		}
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции отображением
-
-		//! Replace an item name at a specified position
-		void setItemNameAt(size_t _index, const UString& _name);
-
-		//! Replace an item name
-		void setItemName(TabItem* _item, const UString& _name) { setItemNameAt(getItemIndex(_item), _name); }
-
-		//! Get item name from specified position
-		const UString& getItemNameAt(size_t _index);
-
-		//! Get item name
-		const UString& getItemName(TabItem* _item) { return getItemNameAt(getItemIndex(_item)); }
-
-
-		//------------------------------------------------------------------------------//
-		// манипуляции выдимостью
-
-		//! Move all elements so specified becomes visible
-		void beginToItemAt(size_t _index);
-
-		//! Move all elements so specified becomes visible
-		void beginToItem(TabItem* _item) { beginToItemAt(getItemIndex(_item)); }
-
-		//! Move all elements so first becomes visible
-		void beginToItemFirst() { if (getItemCount()) beginToItemAt(0); }
-
-		//! Move all elements so last becomes visible
-		void beginToItemLast() { if (getItemCount()) beginToItemAt(getItemCount() - 1); }
-
-		//! Move all elements so selected becomes visible
-		void beginToItemSelected() { if (getIndexSelected() != ITEM_NONE) beginToItemAt(getIndexSelected()); }
-
-
-		//------------------------------------------------------------------------------//
-		// остальные манипуляции
-
-		//! Set button width at a specified position
-		void setButtonWidthAt(size_t _index, int _width = DEFAULT);
-		//! Set button width
-		void setButtonWidth(TabItem* _item, int _width = DEFAULT) { setButtonWidthAt(getItemIndex(_item), _width); }
-
-		//! Get button width at a specified position
-		int getButtonWidthAt(size_t _index);
-		//! Get button width
-		int getButtonWidth(TabItem* _item) { return getButtonWidthAt(getItemIndex(_item)); }
-
-		//------------------------------------------------------------------------------//
-
-		/** Set default button width and disable autowidth mode */
-		void setButtonDefaultWidth(int _value);
-		/** Get default button width */
-		int getButtonDefaultWidth() { return mButtonDefaultWidth; }
-
-		/** Enable or disable button auto width */
-		void setButtonAutoWidth(bool _value);
-		/** Get button auto width flag */
-		bool getButtonAutoWidth() { return mButtonAutoWidth; }
-
-		/** Enable or disable smooth sheets showing */
-		void setSmoothShow(bool _value) { mSmoothShow = _value; }
-		/** Get smooth sheets showing flag */
-		bool getSmoothShow() { return mSmoothShow; }
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*event:*/
-		/** Event : Active Tab sheet changed \n
-			signature : void method(MyGUI::Tab* _sender, size_t _index)\n
-			@param _sender widget that called this event
-			@param _index Index of selected sheet
-		*/
-		EventPair<EventHandle_WidgetSizeT, EventHandle_TabPtrSizeT> eventTabChangeSelect;
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void Widget::setCoord(const IntCoord& _coord)")
-		void setPosition(const IntCoord& _coord) { setCoord(_coord); }
-		MYGUI_OBSOLETE("use : void Widget::setCoord(int _left, int _top, int _width, int _height)")
-		void setPosition(int _left, int _top, int _width, int _height) { setCoord(_left, _top, _width, _height); }
-
-		MYGUI_OBSOLETE("use : int Tab::getButtonWidthAt(size_t _index)")
-		int getSheetButtonWidthIndex(size_t _index) { return getButtonWidthAt(_index); }
-		MYGUI_OBSOLETE("use : int Tab::getButtonWidth(TabItem* _item)")
-		int getSheetButtonWidth(TabItem* _sheet) { return getButtonWidth(_sheet); }
-		MYGUI_OBSOLETE("use : void Tab::setButtonWidthAt(size_t _index, int _width)")
-		void setSheetButtonWidthIndex(size_t _index, int _width = DEFAULT) { setButtonWidthAt(_index, _width); }
-		MYGUI_OBSOLETE("use : void Tab::setButtonWidth(TabItem* _item, int _width)")
-		void setSheetButtonWidth(TabItem* _sheet, int _width = DEFAULT) { setButtonWidth(_sheet, _width); }
-		MYGUI_OBSOLETE("use : void Tab::beginToItemAt(size_t _index)")
-		void showBarButton(size_t _index) { beginToItemAt(_index); }
-		MYGUI_OBSOLETE("use : void Tab::beginToItemSelected()")
-		void showBarSelectButton() { beginToItemSelected(); }
-		MYGUI_OBSOLETE("use : size_t Tab::getItemCount()")
-		size_t getSheetCount() { return getItemCount(); }
-		MYGUI_OBSOLETE("use : const UString& Tab::getItemName(TabItem* _item)")
-		const UString& getSheetName(TabItem* _sheet) { return getItemName(_sheet); }
-		MYGUI_OBSOLETE("use : const UString& Tab::getItemNameAt(size_t _index)")
-		const UString& getSheetNameIndex(size_t _index) { return getItemNameAt(_index); }
-		MYGUI_OBSOLETE("use : TabItem* Tab::getItemAt(size_t _index)")
-		TabItem* getSheet(size_t _index) { return getItemAt(_index); }
-		MYGUI_OBSOLETE("use : void Tab::setItemNameAt(size_t _index, const UString& _name)")
-		void setSheetNameIndex(size_t _index, const UString& _name, int _width = DEFAULT) { setItemNameAt(_index, _name); }
-		MYGUI_OBSOLETE("use : void Tab::setItemName(TabItem* _item, const UString& _name)")
-		void setSheetName(TabItem* _sheet, const UString& _name, int _width = DEFAULT) { setItemName(_sheet, _name); }
-		MYGUI_OBSOLETE("use : TabItem* Tab::addItem(const UString& _name, Any _data)")
-		TabItem* addSheet(const UString& _name, int _width = DEFAULT) { return addItem(_name, _width); }
-		MYGUI_OBSOLETE("use : TabItem* Tab::insertItemAt(size_t _index, const UString& _name, Any _data)")
-		TabItem* insertSheet(size_t _index, const UString& _name, int _width = DEFAULT) { return insertItemAt(_index, _name); }
-		MYGUI_OBSOLETE("use : void Tab::removeItemAt(size_t _index)")
-		void removeSheetIndex(size_t _index) { removeItemAt(_index); }
-		MYGUI_OBSOLETE("use : void Tab::removeItem(TabItem* _item)")
-		void removeSheet(TabItem* _sheet) { removeItem(_sheet); }
-		MYGUI_OBSOLETE("use : void Tab::setIndexSelected(size_t _index)")
-		void selectSheetIndex(size_t _index, bool _smooth = true) { setIndexSelected(_index); }
-		MYGUI_OBSOLETE("use : void Tab::setItemSelected(TabItem* _item)")
-		void selectSheet(TabItem* _sheet, bool _smooth = true) { setItemSelected(_sheet); }
-		MYGUI_OBSOLETE("use : size_t Tab::getIndexSelected()")
-		size_t getSelectSheetIndex() { return getIndexSelected(); }
-
-		MYGUI_OBSOLETE("use : size_t Widget::getIndexSelected()")
-		size_t getItemIndexSelected() { return getIndexSelected(); }
-		MYGUI_OBSOLETE("use : void Widget::setIndexSelected(size_t _index)")
-		void setItemSelectedAt(size_t _index) { setIndexSelected(_index); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	protected:
-		virtual ~Tab();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		// переопределяем для особого обслуживания страниц
-		virtual Widget* baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name);
-
-		void updateBar();
-
-		void notifyPressedButtonEvent(MyGUI::Widget* _sender);
-		void notifyPressedBarButtonEvent(MyGUI::Widget* _sender);
-
-		int _getTextWidth(const UString& _text);
-
-		void _showItem(TabItem* _sheet, bool _show, bool _smooth);
-
-		void _createItemButton();
-
-		void _insertItem(size_t _index, const UString& _name, TabItem* _sheet, Any _data);
-
-		// вкладка при удалении уведомляет таб
-		void _notifyDeleteItem(TabItem* _item);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-		void actionWidgetHide(Widget* _widget);
-
-		ControllerFadeAlpha* createControllerFadeAlpha(float _alpha, float _coef, bool _enable);
-
-		Widget* _getWidgetTemplate();
-		Widget* _getWidgetBar();
-
-	private:
-		int mOffsetTab; // смещение бара при показе кнопок
-		bool mButtonShow;
-		int mWidthBar; // ширина в которую помещаються все кнопки
-		VectorWidgetPtr mItemButton; // список кнопок, не должно равно списку страниц
-		std::string mButtonSkinName, mEmptySkinName;
-
-		Widget* mWidgetBar;
-		Button* mButtonLeft;
-		Button* mButtonRight;
-		Button* mButtonList;
-		Widget* mButtonDecor;
-		VectorWidgetPtr mWidgetsPatch; // список виджетов которые нужно показать при показе кнопки
-		Widget* mEmptyBarWidget;
-		Widget* mItemTemplate;
-
-		// информация о вкладках
-		VectorTabItemInfo mItemsInfo;
-		size_t mStartIndex;
-		size_t mIndexSelect;
-
-		int mButtonDefaultWidth;
-		bool mSmoothShow;
-		bool mButtonAutoWidth;
-
-		// флаг, чтобы отсеч уведомления от вкладок, при общем шутдауне виджета
-		bool mShutdown;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_TAB_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TabItem.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TabItem.h
deleted file mode 100644
index ab6d27e3ed..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TabItem.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_TAB_ITEM_H__
-#define __MYGUI_TAB_ITEM_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_Tab.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT TabItem :
-		public Widget
-	{
-		MYGUI_RTTI_DERIVED( TabItem )
-
-	public:
-		TabItem();
-
-		/** Set item caption */
-		virtual void setCaption(const UString& _value);
-		/** Get item caption */
-		virtual const UString& getCaption();
-
-		//! Set button width
-		void setButtonWidth(int _value = DEFAULT);
-		//! Get button width
-		int getButtonWidth();
-
-		//! Replace an item name
-		void setItemName(const UString& _value);
-		//! Get item name
-		const UString& getItemName();
-
-		//! Replace an item name
-		void setItemData(Any _value);
-
-		//! Get item data
-		template <typename ValueType>
-		ValueType * getItemData(bool _throw = true)
-		{
-			return mOwner->getItemData<ValueType>(this, _throw);
-		}
-
-		//! Select sheet
-		void setItemSelected();
-
-		//! Remove item
-		void removeItem();
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*internal*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	protected:
-		virtual ~TabItem();
-
-		void setSelected(bool _value);
-
-	private:
-		Tab* mOwner;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_TAB_ITEM_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TextChangeHistory.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TextChangeHistory.h
deleted file mode 100644
index 204ee565b4..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TextChangeHistory.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_TEXT_CHANGE_HISTORY_H__
-#define __MYGUI_TEXT_CHANGE_HISTORY_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Macros.h"
-#include "MyGUI_UString.h"
-#include <deque>
-
-namespace MyGUI
-{
-
-	// инфо об одной операции
-	struct TextCommandInfo
-	{
-		// типы операций
-		enum CommandType
-		{
-			COMMAND_POSITION,
-			COMMAND_INSERT,
-			COMMAND_ERASE
-		};
-
-		// для удаления и вставки текста
-		TextCommandInfo(const UString& _text, size_t _start, CommandType _type)
-			: text(_text), type(_type), start(_start), undo(ITEM_NONE), redo(ITEM_NONE), length(ITEM_NONE) { }
-		// для указания позиции
-		TextCommandInfo(size_t _undo, size_t _redo, size_t _length)
-			: type(COMMAND_POSITION), start(ITEM_NONE), undo(_undo), redo(_redo), length(_length) { }
-
-		// строка харрактиризуещая изменения
-		UString text;
-		// тип операции
-		CommandType type;
-		// инфа о начале позиции
-		size_t start;
-		// инфа о псевдо позиции
-		size_t undo, redo, length;
-	};
-
-	typedef std::vector<TextCommandInfo> VectorChangeInfo;
-	typedef std::deque<VectorChangeInfo> DequeUndoRedoInfo;
-
-} // namespace MyGUI
-
-#endif // __MYGUI_TEXT_CHANGE_HISTORY_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TextIterator.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TextIterator.h
deleted file mode 100644
index b1284fb729..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TextIterator.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_TEXT_ITERATOR_H__
-#define __MYGUI_TEXT_ITERATOR_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Colour.h"
-#include "MyGUI_TextChangeHistory.h"
-#include "MyGUI_IFont.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT TextIterator
-	{
-	private:
-		TextIterator();
-
-	public:
-		TextIterator(const UString& _text, VectorChangeInfo * _history = nullptr);
-
-		bool moveNext();
-
-		// возвращает цвет
-		UString getTagColour(bool _clear = false);
-
-		// возвращает цвет
-		bool getTagColour(UString& _colour);
-
-		// удаляет цвет
-		void clearTagColour() { getTagColour(true); }
-
-		bool setTagColour(const Colour& _colour);
-
-		bool setTagColour(UString _colour);
-
-		// сохраняет текущий итератор
-		bool saveStartPoint();
-
-		// возвращает строку от сохраненного итератора до текущего
-		UString getFromStart();
-
-		// удаляет от запомненной точки до текущей
-		bool eraseFromStart();
-
-		// возвращает текущую псевдо позицию
-		size_t getPosition() const { return mPosition; }
-
-		const UString& getText() const { return mText; }
-
-		void insertText(const UString& _insert, bool _multiLine);
-
-		void clearNewLine(UString& _text);
-
-		//очищает весь текст
-		void clearText() { clear(); }
-
-		// возвращает размер строки
-		size_t getSize() const;
-
-		void setText(const UString& _text, bool _multiLine);
-
-		void cutMaxLength(size_t _max);
-
-		void cutMaxLengthFromBeginning(size_t _max);
-
-		// возвращает текст без тегов
-		static UString getOnlyText(const UString& _text);
-
-		static UString getTextNewLine() { return L"\n"; }
-
-		static UString getTextCharInfo(Char _char);
-
-		// просто конвертируем цвет в строку
-		static UString convertTagColour(const Colour& _colour);
-
-		static UString toTagsString(const UString& _text);
-
-	private:
-
-		// возвращает цвет
-		bool getTagColour(UString& _colour, UString::iterator& _iter);
-
-		void insert(UString::iterator& _start, UString& _insert);
-
-		UString::iterator erase(UString::iterator _start, UString::iterator _end);
-
-		void clear();
-
-	private:
-		UString mText;
-		UString::iterator mCurrent, mEnd, mSave;
-
-		// позиция и размер
-		size_t mPosition;
-		mutable size_t mSize;
-		bool mFirst;
-
-		VectorChangeInfo * mHistory;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_TEXT_ITERATOR_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TextView.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TextView.h
deleted file mode 100644
index a8384fd0c7..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TextView.h
+++ /dev/null
@@ -1,358 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2009
-	@module
-*/
-#ifndef __MYGUI_TEXT_VIEW_H__
-#define __MYGUI_TEXT_VIEW_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_TextureUtility.h"
-
-namespace MyGUI
-{
-
-	class CharInfo
-	{
-	public:
-		CharInfo() : width(0) { }
-		CharInfo(const FloatRect& _rect, int _width) : rect(_rect), width(_width) { }
-		CharInfo(uint32 _colour) : rect(-1, 0, 0, 0), width((int)_colour) { }
-
-		bool isColour() const { return rect.left == -1; }
-		int getWidth() const { return width; }
-		const FloatRect& getUVRect() const { return rect; }
-		uint32 getColour() const { return (uint32)width; }
-
-	private:
-		FloatRect rect;
-		int width;
-	};
-
-	typedef std::vector<CharInfo> VectorCharInfo;
-
-	struct LineInfo
-	{
-		LineInfo() : width(0), offset(0), count(0) { }
-		void clear() { width = 0; count = 0; simbols.clear(); offset = 0; }
-		int width;
-		int offset;
-		size_t count;
-		VectorCharInfo simbols;
-	};
-
-	typedef std::vector<LineInfo> VectorLineInfo;
-
-	class RollBackPoint
-	{
-	public:
-		RollBackPoint() :
-			position(0),
-			count(0),
-			lenght(0),
-			rollback(false)
-		{ }
-
-		void set(
-			size_t _position,
-			UString::const_iterator& _space_point,
-			size_t _count,
-			int _length
-		)
-		{
-			position = _position;
-			space_point = _space_point;
-			count = _count;
-			lenght = _length;
-			rollback = true;
-		}
-
-		void clear() { rollback = false; }
-		bool empty() const { return !rollback; }
-		int getLenght() const { MYGUI_DEBUG_ASSERT(rollback, "rollback point not valid"); return lenght; }
-		size_t getCount() const { MYGUI_DEBUG_ASSERT(rollback, "rollback point not valid"); return count; }
-		size_t getPosition() const { MYGUI_DEBUG_ASSERT(rollback, "rollback point not valid"); return position; }
-		UString::const_iterator getTextIter() { MYGUI_DEBUG_ASSERT(rollback, "rollback point not valid"); return space_point; }
-
-	private:
-		size_t position;
-		UString::const_iterator space_point;
-		size_t count;
-		int lenght;
-		bool rollback;
-	};
-
-	class TextView
-	{
-	public:
-		TextView() :
-			mLength(0),
-			mFontHeight(0)
-		{
-		}
-
-		void update(const UString& _text, IFont* _font, int _height, Align _align, VertexColourType _format, int _maxheight = -1)
-		{
-			mFontHeight = _height;
-
-			// ������ ��� ������� ����������� ������
-			static const char convert_colour[64] = { 0,  1,  2,  3,  4,  5,  6, 7, 8, 9, 0, 0, 0, 0, 0, 0,
-													 0, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-													 0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-													 0, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0
-			                                       };
-
-			mViewSize.clear();
-
-			RollBackPoint roll_back;
-			IntSize result;
-			int width = 0;
-			size_t count = 0;
-			mLength = 0;
-			mLineInfo.clear();
-			LineInfo line_info;
-			int font_height = _font->getDefaultHeight();
-
-			UString::const_iterator end = _text.end();
-			UString::const_iterator index = _text.begin();
-
-			/*if (index == end)
-				return;*/
-
-			result.height += _height;
-
-			for (; index!=end; ++index)
-			{
-				Char character = *index;
-
-				// ����� ������
-				if (character == FontCodeType::CR
-					|| character == FontCodeType::NEL
-					|| character == FontCodeType::LF)
-				{
-					if (character == FontCodeType::CR)
-					{
-						UString::const_iterator peeki = index;
-						peeki ++;
-						if ((peeki != end) && (*peeki == FontCodeType::LF))
-							index = peeki; // skip both as one newline
-					}
-
-					line_info.width = width;
-					line_info.count = count;
-					mLength += line_info.count + 1;
-
-					result.height += _height;
-					if (result.width < width)
-						result.width = width;
-					width = 0;
-					count = 0;
-
-					mLineInfo.push_back(line_info);
-					line_info.clear();
-
-					// �������� �����
-					roll_back.clear();
-
-					continue;
-				}
-				// ���
-				else if (character == L'#')
-				{
-					// ����� ��������� ������
-					++ index;
-					if (index == end) { --index; continue; } // ��� ������
-
-					character = *index;
-					// ���� ��� ������, �� ������ ���� ����, ���� ��� �� ������ ����
-					if (character != L'#')
-					{
-						// ������ ������ ������
-						uint32 colour = convert_colour[(character-48) & 0x3F];
-
-						// � ��� ���� �������� ����� �����
-						for (char i=0; i<5; i++)
-						{
-							++ index;
-							if (index == end) { --index; continue; } // ��� ������
-							colour <<= 4;
-							colour += convert_colour[ ((*index) - 48) & 0x3F ];
-						}
-
-						// ���� �����, �� ������ ������� � ����� ����������
-						texture_utility::convertColour(colour, _format);
-
-						line_info.simbols.push_back( CharInfo(colour) );
-
-						continue;
-					}
-				}
-
-				GlyphInfo* info = _font->getGlyphInfo(character);
-				if (FontCodeType::Space == character)
-				{
-					roll_back.set(line_info.simbols.size(), index, count, width);
-				}
-				else if (FontCodeType::Tab == character)
-				{
-					roll_back.set(line_info.simbols.size(), index, count, width);
-				}
-
-				int char_width = info->width;
-				if (font_height != _height)
-				{
-					char_width = char_width * _height / font_height;
-					if (!char_width) char_width = 1;
-				}
-
-				// ������� ����
-				if (_maxheight != -1
-					&& (width + char_width) > _maxheight
-					&& !roll_back.empty())
-				{
-					// ���������� �� ���������� �������
-					width = roll_back.getLenght();
-					count = roll_back.getCount();
-					index = roll_back.getTextIter();
-					line_info.simbols.erase(line_info.simbols.begin() + roll_back.getPosition(), line_info.simbols.end());
-
-					// ���������� ����� ������, ��� ������ ������
-					line_info.width = width;
-					line_info.count = count;
-					mLength += line_info.count + 1;
-
-					result.height += _height;
-					if (result.width < width)
-						result.width = width;
-					width = 0;
-					count = 0;
-
-					mLineInfo.push_back(line_info);
-					line_info.clear();
-
-					// �������� �����
-					roll_back.clear();
-
-					continue;
-				}
-
-				line_info.simbols.push_back(CharInfo(info->uvRect, char_width));
-				width += char_width;
-				count ++;
-			}
-
-			line_info.width = width;
-			line_info.count = count;
-			mLength += line_info.count;
-
-			mLineInfo.push_back(line_info);
-
-			if (result.width < width)
-				result.width = width;
-
-			// ������ ������������� ������
-			for (VectorLineInfo::iterator line=mLineInfo.begin(); line!=mLineInfo.end(); ++line)
-			{
-				if (_align.isRight())
-					line->offset = result.width - line->width;
-				else if (_align.isHCenter())
-					line->offset = (result.width - line->width) / 2;
-			}
-
-			mViewSize = result;
-		}
-
-		size_t getCursorPosition(const IntPoint& _value)
-		{
-			const int height = mFontHeight;
-			size_t result = 0;
-			int top = 0;
-
-			for (VectorLineInfo::const_iterator line=mLineInfo.begin(); line!=mLineInfo.end(); ++line)
-			{
-				// ��� ��������� ������
-				bool lastline = !(line + 1 != mLineInfo.end());
-
-				// ���� �������
-				if (top + height > _value.top || lastline)
-				{
-					top += height;
-					int left = line->offset;
-					int count = 0;
-
-					// ���� ������
-					for (VectorCharInfo::const_iterator sim=line->simbols.begin(); sim!=line->simbols.end(); ++sim)
-					{
-						if (sim->isColour())
-							continue;
-
-						if ((left + (sim->getWidth() / 2)) > _value.left)
-						{
-							break;
-						}
-						left += sim->getWidth();
-						count ++;
-					}
-
-					result += count;
-					break;
-				}
-
-				if (!lastline)
-				{
-					top += height;
-					result += line->count + 1;
-				}
-			}
-
-			return result;
-		}
-
-		IntPoint getCursorPoint(size_t _position)
-		{
-			if (_position >= mLength + 1) _position = mLength;
-
-			size_t position = 0;
-			int top = 0;
-			int left = 0;
-			for (VectorLineInfo::const_iterator line=mLineInfo.begin(); line!=mLineInfo.end(); ++line)
-			{
-				left = line->offset;
-				if (position + line->count >= _position)
-				{
-					for (VectorCharInfo::const_iterator sim=line->simbols.begin(); sim!=line->simbols.end(); ++sim)
-					{
-						if (sim->isColour())
-							continue;
-
-						if (position == _position)
-							break;
-
-						position ++;
-						left += sim->getWidth();
-					}
-					break;
-				}
-				position += line->count + 1;
-				top += mFontHeight;
-			}
-
-			return IntPoint(left, top);
-		}
-
-		const IntSize& getViewSize() const { return mViewSize; }
-		size_t getTextLength() const { return mLength; }
-		const VectorLineInfo& getData() { return mLineInfo; }
-
-	private:
-		IntSize mViewSize;
-		size_t mLength;
-		VectorLineInfo mLineInfo;
-		int mFontHeight;
-	};
-
-
-} // namespace MyGUI
-
-#endif // __MYGUI_TEXT_VIEW_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TextureUtility.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TextureUtility.h
deleted file mode 100644
index 4883d2ca8d..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TextureUtility.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_TEXTURE_UTILITY_H__
-#define __MYGUI_TEXTURE_UTILITY_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Colour.h"
-#include "MyGUI_RenderFormat.h"
-
-namespace MyGUI
-{
-
-	namespace texture_utility
-	{
-
-		MYGUI_EXPORT const IntSize& getTextureSize(const std::string& _texture, bool _cache = true);
-		MYGUI_EXPORT uint32 toColourARGB(const Colour& _colour);
-
-		MYGUI_FORCEINLINE void convertColour(uint32& _colour, VertexColourType _format)
-		{
-			if (_format == VertexColourType::ColourABGR)
-				_colour = ((_colour & 0x00FF0000) >> 16) | ((_colour & 0x000000FF) << 16) | (_colour & 0xFF00FF00);
-		}
-
-
-	} // namespace texture_utility
-
-} // namespace MyGUI
-
-#endif // __MYGUI_TEXTURE_UTILITY_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TileRect.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TileRect.h
deleted file mode 100644
index b79817f986..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_TileRect.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_TILE_RECT_H__
-#define __MYGUI_TILE_RECT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_ISubWidgetRect.h"
-#include "MyGUI_ResourceSkin.h"
-
-namespace MyGUI
-{
-
-	class RenderItem;
-
-	class MYGUI_EXPORT TileRect : public ISubWidgetRect
-	{
-		MYGUI_RTTI_DERIVED( TileRect )
-
-	public:
-		TileRect();
-		virtual ~TileRect();
-
-		void setAlpha(float _alpha);
-
-		virtual void setVisible(bool _visible);
-
-		virtual void createDrawItem(ITexture* _texture, ILayerNode * _node);
-		virtual void destroyDrawItem();
-
-		// метод для отрисовки себя
-		virtual void doRender();
-
-		virtual void setStateData(IStateInfo * _data);
-
-	/*internal:*/
-		void _updateView();
-		void _correctView();
-
-		void _setAlign(const IntSize& _oldsize, bool _update);
-		void _setAlign(const IntCoord& _oldcoord, bool _update);
-
-		virtual void _setUVSet(const FloatRect& _rect);
-		virtual void _setColour(const Colour& _value);
-
-	protected:
-		FloatRect mRectTexture;
-		bool mEmptyView;
-
-		uint32 mCurrentColour;
-
-		FloatRect mCurrentTexture;
-		IntCoord mCurrentCoord;
-
-		ILayerNode* mNode;
-		RenderItem* mRenderItem;
-
-		IntSize mTileSize;
-		size_t mCountVertex;
-
-		float mRealTileWidth;
-		float mRealTileHeight;
-
-		float mTextureHeightOne;
-		float mTextureWidthOne;
-
-		bool mTileH;
-		bool mTileV;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_TILE_RECT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Timer.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Timer.h
deleted file mode 100644
index a93845091b..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Timer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_TIMER_H__
-#define __MYGUI_TIMER_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT Timer
-	{
-	public:
-		Timer();
-
-		void reset();
-		unsigned long getMilliseconds();
-
-	private:
-		unsigned long getCurrentMilliseconds();
-
-	private:
-		unsigned long mTimeStart;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_TIMER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Types.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Types.h
deleted file mode 100644
index 2051c6c1cb..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Types.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_TYPES_H__
-#define __MYGUI_TYPES_H__
-
-#include "MyGUI_Prerequest.h"
-
-#include <vector>
-#include <map>
-#include <string>
-
-#include "MyGUI_Utility.h"
-#include "MyGUI_Align.h"
-#include "MyGUI_TPoint.h"
-#include "MyGUI_TSize.h"
-#include "MyGUI_TRect.h"
-#include "MyGUI_TCoord.h"
-
-namespace MyGUI
-{
-
-	// определяем типы
-	typedef types::TPoint<int> IntPoint;
-	typedef types::TPoint<float> FloatPoint;
-
-	typedef types::TSize<int> IntSize;
-	typedef types::TSize<float> FloatSize;
-
-	typedef types::TRect<int> IntRect;
-	typedef types::TRect<float> FloatRect;
-
-	typedef types::TCoord<int> IntCoord;
-	typedef types::TCoord<float> FloatCoord;
-
-	typedef std::map<std::string, std::string> MapString;
-	typedef std::vector<std::string> VectorString;
-
-	typedef char int8;
-	typedef short int16;
-	typedef int int32;
-	typedef unsigned char uint8;
-	typedef unsigned short uint16;
-	typedef unsigned int uint32;
-	typedef unsigned int uint;
-
-	typedef unsigned int Char;
-
-} // namespace MyGUI
-
-#endif // __MYGUI_TYPES_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_UString.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_UString.h
deleted file mode 100644
index f422681020..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_UString.h
+++ /dev/null
@@ -1,2765 +0,0 @@
-// Modified from OpenGUI under lenient license
-// Original copyright details and licensing below:
-// OpenGUI (http://opengui.sourceforge.net)
-// This source code is released under the BSD License
-
-// Permission is given to the Ogre project to use the contents of file within its
-// source and binary applications, as well as any derivative works, in accordance
-// with the terms of any license under which Ogre is or will be distributed.
-//
-// Ogre may relicense its copy of this file, as well as any OpenGUI released updates
-// to this file, under any terms that it deems fit, and is not required to maintain
-// the original BSD licensing terms of this file, however OpenGUI retains the right
-// to present its copy of this file under the terms of any license under which
-// OpenGUI is distributed.
-//
-// Ogre is not required to release to OpenGUI any future changes that it makes to
-// this file, and understands and agrees that any such changes that are released
-// back to OpenGUI will become available under the terms of any license under which
-// OpenGUI is distributed.
-//
-// For brevity, this permission text may be removed from this file if desired.
-// The original record kept within the SourceForge (http://sourceforge.net/) tracker
-// is sufficient.
-//
-// - Eric Shorkey (zero/zeroskill) <opengui@rightbracket.com> [January 20th, 2007]
-
-#ifndef __MYGUI_U_STRING_H__
-#define __MYGUI_U_STRING_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_Diagnostic.h"
-#include "MyGUI_LogManager.h"
-
-// these are explained later
-#include <iterator>
-#include <string>
-#include <stdexcept>
-
-// this pragma used to avoid warnings from some advanced gcc warnings flags
-#if MYGUI_COMPILER == MYGUI_COMPILER_GNUC
-#pragma GCC system_header
-#endif
-
-// Workaround for VC7:
-//      when build with /MD or /MDd, VC7 have both std::basic_string<unsigned short> and
-// basic_string<__wchar_t> instantiated in msvcprt[d].lib/MSVCP71[D].dll, but the header
-// files tells compiler that only one of them is over there (based on /Zc:wchar_t compile
-// option). And since this file used both of them, causing compiler instantiating another
-// one in user object code, which lead to duplicate symbols with msvcprt.lib/MSVCP71[D].dll.
-//
-#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC && (1300 <= MYGUI_COMP_VER && MYGUI_COMP_VER <= 1310)
-
-# if defined(_DLL_CPPLIB)
-
-namespace std
-{
-    template class _CRTIMP2 basic_string<unsigned short, char_traits<unsigned short>,
-	    allocator<unsigned short> >;
-
-    template class _CRTIMP2 basic_string<__wchar_t, char_traits<__wchar_t>,
-	    allocator<__wchar_t> >;
-}
-
-# endif // defined(_DLL_CPPLIB)
-
-#endif  // MYGUI_COMPILER == MYGUI_COMPILER_MSVC && MYGUI_COMP_VER == 1300
-
-
-namespace MyGUI
-{
-
-	/* READ THIS NOTICE BEFORE USING IN YOUR OWN APPLICATIONS
-	=NOTICE=
-	This class is not a complete Unicode solution. It purposefully does not
-	provide certain functionality, such as proper lexical sorting for
-	Unicode values. It does provide comparison operators for the sole purpose
-	of using UString as an index with std::map and other operator< sorted
-	containers, but it should NOT be relied upon for meaningful lexical
-	operations, such as alphabetical sorts. If you need this type of
-	functionality, look into using ICU instead (http://icu.sourceforge.net/).
-
-	=REQUIREMENTS=
-	There are a few requirements for proper operation. They are fairly small,
-	and shouldn't restrict usage on any reasonable target.
-	* Compiler must support unsigned 16-bit integer types
-	* Compiler must support signed 32-bit integer types
-	* wchar_t must be either UTF-16 or UTF-32 encoding, and specified as such
-	    using the WCHAR_UTF16 macro as outlined below.
-	* You must include <iterator>, <string>, and <wchar>. Probably more, but
-	    these are the most obvious.
-
-	=REQUIRED PREPROCESSOR MACROS=
-	This class requires two preprocessor macros to be defined in order to
-	work as advertised.
-	INT32 - must be mapped to a signed 32 bit integer (ex. #define INT32 int)
-	UINT16 - must be mapped to an unsigned 16 bit integer (ex. #define UINT32 unsigned short)
-
-	Additionally, a third macro should be defined to control the evaluation of wchar_t:
-	WCHAR_UTF16 - should be defined when wchar_t represents UTF-16 code points,
-	    such as in Windows. Otherwise it is assumed that wchar_t is a 32-bit
-		integer representing UTF-32 code points.
-	*/
-
-	// THIS IS A VERY BRIEF AUTO DETECTION. YOU MAY NEED TO TWEAK THIS
-#ifdef __STDC_ISO_10646__
-// for any compiler that provides this, wchar_t is guaranteed to hold any Unicode value with a single code point (32-bit or larger)
-// so we can safely skip the rest of the testing
-#else // #ifdef __STDC_ISO_10646__
-#if defined( __WIN32__ ) || defined( _WIN32 )
-#define WCHAR_UTF16 // All currently known Windows platforms utilize UTF-16 encoding in wchar_t
-#else // #if defined( __WIN32__ ) || defined( _WIN32 )
-#if WCHAR_MAX <= 0xFFFF // this is a last resort fall back test; WCHAR_MAX is defined in <wchar.h>
-#define WCHAR_UTF16 // best we can tell, wchar_t is not larger than 16-bit
-#endif // #if WCHAR_MAX <= 0xFFFF
-#endif // #if defined( __WIN32__ ) || defined( _WIN32 )
-#endif // #ifdef __STDC_ISO_10646__
-
-
-// MYGUI_IS_NATIVE_WCHAR_T means that wchar_t isn't a typedef of
-// uint16 or uint32.
-#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
-
-// Don't define wchar_t related functions since it'll duplicate
-// with UString::code_point related functions when compile
-// without /Zc:wchar_t, because in this case both of them are
-// a typedef of uint16.
-# if defined(_NATIVE_WCHAR_T_DEFINED)
-#   define MYGUI_IS_NATIVE_WCHAR_T      1
-# else
-#   define MYGUI_IS_NATIVE_WCHAR_T      0
-# endif
-
-#else   // MYGUI_COMPILER != MYGUI_COMPILER_MSVC
-
-// Assumed wchar_t is natively for other compilers
-#   define MYGUI_IS_NATIVE_WCHAR_T     1
-
-#endif  // MYGUI_COMPILER == MYGUI_COMPILER_MSVC
-
-	//! A UTF-16 string with implicit conversion to/from std::string and std::wstring
-	/*! This class provides a complete 1 to 1 map of most std::string functions (at least to my
-	knowledge). Implicit conversions allow this string class to work with all common C++ string
-	formats, with specialty functions defined where implicit conversion would cause potential
-	problems or is otherwise unavailable.
-
-	Some additional functionality is present to assist in working with characters using the
-	32-bit UTF-32 encoding. (Which is guaranteed to fit any Unicode character into a single
-	code point.) \b Note: Reverse iterators do not have this functionality due to the
-	ambiguity that surrounds working with UTF-16 in reverse. (Such as, where should an
-	iterator point to represent the beginning of a surrogate pair?)
-
-
-	\par Supported Input Types
-	The supported string types for input, and their assumed encoding schemes, are:
-	- std::string (UTF-8)
-	- char* (UTF-8)
-	- std::wstring (autodetected UTF-16 / UTF-32 based on compiler)
-	- wchar_t* (autodetected UTF-16 / UTF-32 based on compiler)
-
-
-	\see
-	- For additional information on UTF-16 encoding: http://en.wikipedia.org/wiki/UTF-16
-	- For additional information on UTF-8 encoding: http://en.wikipedia.org/wiki/UTF-8
-	- For additional information on UTF-32 encoding: http://en.wikipedia.org/wiki/UTF-32
-	*/
-	class UString
-	{
-		// constants used in UTF-8 conversions
-		static const unsigned char _lead1 = 0xC0;      //110xxxxx
-		static const unsigned char _lead1_mask = 0x1F; //00011111
-		static const unsigned char _lead2 = 0xE0;      //1110xxxx
-		static const unsigned char _lead2_mask = 0x0F; //00001111
-		static const unsigned char _lead3 = 0xF0;      //11110xxx
-		static const unsigned char _lead3_mask = 0x07; //00000111
-		static const unsigned char _lead4 = 0xF8;      //111110xx
-		static const unsigned char _lead4_mask = 0x03; //00000011
-		static const unsigned char _lead5 = 0xFC;      //1111110x
-		static const unsigned char _lead5_mask = 0x01; //00000001
-		static const unsigned char _cont = 0x80;       //10xxxxxx
-		static const unsigned char _cont_mask = 0x3F;  //00111111
-
-	public:
-		//! size type used to indicate string size and character positions within the string
-		typedef size_t size_type;
-		//! the usual constant representing: not found, no limit, etc
-		static const size_type npos = ~(size_t)0;
-
-		//! a single 32-bit Unicode character
-		typedef uint32 unicode_char;
-
-		//! a single UTF-16 code point
-		typedef uint16 code_point;
-
-		//! value type typedef for use in iterators
-		typedef code_point value_type;
-
-		typedef std::basic_string<code_point> dstring; // data string
-
-		//! string type used for returning UTF-32 formatted data
-		typedef std::basic_string<unicode_char> utf32string;
-
-		//! This exception is used when invalid data streams are encountered
-		class invalid_data: public std::runtime_error
-		{ /* i don't know why the beautifier is freaking out on this line */
-		public:
-			//! constructor takes a string message that can be later retrieved by the what() function
-			explicit invalid_data( const std::string& _Message ): std::runtime_error( _Message )
-			{
-				/* The thing is, Bob, it's not that I'm lazy, it's that I just don't care. */
-			}
-		};
-
-		//#########################################################################
-		//! base iterator class for UString
-		class _base_iterator: public std::iterator<std::random_access_iterator_tag, value_type>
-		{ /* i don't know why the beautifier is freaking out on this line */
-			friend class UString;
-		protected:
-			_base_iterator()
-			{
-				mString = 0;
-			}
-
-			void _seekFwd( size_type c )
-			{
-				mIter += c;
-			}
-			void _seekRev( size_type c )
-			{
-				mIter -= c;
-			}
-			void _become( const _base_iterator& i )
-			{
-				mIter = i.mIter;
-				mString = i.mString;
-			}
-			bool _test_begin() const
-			{
-				return mIter == mString->mData.begin();
-			}
-			bool _test_end() const
-			{
-				return mIter == mString->mData.end();
-			}
-			size_type _get_index() const
-			{
-				return mIter - mString->mData.begin();
-			}
-			void _jump_to( size_type index )
-			{
-				mIter = mString->mData.begin() + index;
-			}
-
-			unicode_char _getCharacter() const
-			{
-				size_type current_index = _get_index();
-				return mString->getChar( current_index );
-			}
-			int _setCharacter( unicode_char uc )
-			{
-				size_type current_index = _get_index();
-				int change = mString->setChar( current_index, uc );
-				_jump_to( current_index );
-				return change;
-			}
-
-			void _moveNext()
-			{
-				_seekFwd( 1 ); // move 1 code point forward
-				if ( _test_end() ) return; // exit if we hit the end
-				if ( _utf16_surrogate_follow( mIter[0] ) )
-				{
-					// landing on a follow code point means we might be part of a bigger character
-					// so we test for that
-					code_point lead_half = 0;
-					//NB: we can't possibly be at the beginning here, so no need to test
-					lead_half = mIter[-1]; // check the previous code point to see if we're part of a surrogate pair
-					if ( _utf16_surrogate_lead( lead_half ) )
-					{
-						_seekFwd( 1 ); // if so, then advance 1 more code point
-					}
-				}
-			}
-			void _movePrev()
-			{
-				_seekRev( 1 ); // move 1 code point backwards
-				if ( _test_begin() ) return; // exit if we hit the beginning
-				if ( _utf16_surrogate_follow( mIter[0] ) )
-				{
-					// landing on a follow code point means we might be part of a bigger character
-					// so we test for that
-					code_point lead_half = 0;
-					lead_half = mIter[-1]; // check the previous character to see if we're part of a surrogate pair
-					if ( _utf16_surrogate_lead( lead_half ) )
-					{
-						_seekRev( 1 ); // if so, then rewind 1 more code point
-					}
-				}
-			}
-
-			dstring::iterator mIter;
-			UString* mString;
-		};
-
-		//#########################################################################
-		// FORWARD ITERATORS
-		//#########################################################################
-		class _const_fwd_iterator; // forward declaration
-
-		//! forward iterator for UString
-		class _fwd_iterator: public _base_iterator
-		{ /* i don't know why the beautifier is freaking out on this line */
-			friend class _const_fwd_iterator;
-		public:
-			_fwd_iterator() { }
-			_fwd_iterator( const _fwd_iterator& i )
-			{
-				_become( i );
-			}
-
-			//! pre-increment
-			_fwd_iterator& operator++()
-			{
-				_seekFwd( 1 );
-				return *this;
-			}
-			//! post-increment
-			_fwd_iterator operator++( int )
-			{
-				_fwd_iterator tmp( *this );
-				_seekFwd( 1 );
-				return tmp;
-			}
-
-			//! pre-decrement
-			_fwd_iterator& operator--()
-			{
-				_seekRev( 1 );
-				return *this;
-			}
-			//! post-decrement
-			_fwd_iterator operator--( int )
-			{
-				_fwd_iterator tmp( *this );
-				_seekRev( 1 );
-				return tmp;
-			}
-
-			//! addition operator
-			_fwd_iterator operator+( size_type n )
-			{
-				_fwd_iterator tmp( *this );
-				tmp._seekFwd( n );
-				return tmp;
-			}
-			//! addition operator
-			_fwd_iterator operator+( difference_type n )
-			{
-				_fwd_iterator tmp( *this );
-				if ( n < 0 )
-					tmp._seekRev( -n );
-				else
-					tmp._seekFwd( n );
-				return tmp;
-			}
-			//! subtraction operator
-			_fwd_iterator operator-( size_type n )
-			{
-				_fwd_iterator tmp( *this );
-				tmp._seekRev( n );
-				return tmp;
-			}
-			//! subtraction operator
-			_fwd_iterator operator-( difference_type n )
-			{
-				_fwd_iterator tmp( *this );
-				if ( n < 0 )
-					tmp._seekFwd( -n );
-				else
-					tmp._seekRev( n );
-				return tmp;
-			}
-
-			//! addition assignment operator
-			_fwd_iterator& operator+=( size_type n )
-			{
-				_seekFwd( n );
-				return *this;
-			}
-			//! addition assignment operator
-			_fwd_iterator& operator+=( difference_type n )
-			{
-				if ( n < 0 )
-					_seekRev( -n );
-				else
-					_seekFwd( n );
-				return *this;
-			}
-			//! subtraction assignment operator
-			_fwd_iterator& operator-=( size_type n )
-			{
-				_seekRev( n );
-				return *this;
-			}
-			//! subtraction assignment operator
-			_fwd_iterator& operator-=( difference_type n )
-			{
-				if ( n < 0 )
-					_seekFwd( -n );
-				else
-					_seekRev( n );
-				return *this;
-			}
-
-			//! dereference operator
-			value_type& operator*() const
-			{
-				return *mIter;
-			}
-
-			//! dereference at offset operator
-			value_type& operator[]( size_type n ) const
-			{
-				_fwd_iterator tmp( *this );
-				tmp += n;
-				return *tmp;
-			}
-			//! dereference at offset operator
-			value_type& operator[]( difference_type n ) const
-			{
-				_fwd_iterator tmp( *this );
-				tmp += n;
-				return *tmp;
-			}
-
-			//! advances to the next Unicode character, honoring surrogate pairs in the UTF-16 stream
-			_fwd_iterator& moveNext()
-			{
-				_moveNext();
-				return *this;
-			}
-			//! rewinds to the previous Unicode character, honoring surrogate pairs in the UTF-16 stream
-			_fwd_iterator& movePrev()
-			{
-				_movePrev();
-				return *this;
-			}
-			//! Returns the Unicode value of the character at the current position (decodes surrogate pairs if needed)
-			unicode_char getCharacter() const
-			{
-				return _getCharacter();
-			}
-			//! Sets the Unicode value of the character at the current position (adding a surrogate pair if needed); returns the amount of string length change caused by the operation
-			int setCharacter( unicode_char uc )
-			{
-				return _setCharacter( uc );
-			}
-		};
-
-
-		//#########################################################################
-		//! const forward iterator for UString
-		class _const_fwd_iterator: public _base_iterator
-		{ /* i don't know why the beautifier is freaking out on this line */
-		public:
-			_const_fwd_iterator() { }
-			_const_fwd_iterator( const _const_fwd_iterator& i )
-			{
-				_become( i );
-			}
-			_const_fwd_iterator( const _fwd_iterator& i )
-			{
-				_become( i );
-			}
-
-			//! pre-increment
-			_const_fwd_iterator& operator++()
-			{
-				_seekFwd( 1 );
-				return *this;
-			}
-			//! post-increment
-			_const_fwd_iterator operator++( int )
-			{
-				_const_fwd_iterator tmp( *this );
-				_seekFwd( 1 );
-				return tmp;
-			}
-
-			//! pre-decrement
-			_const_fwd_iterator& operator--()
-			{
-				_seekRev( 1 );
-				return *this;
-			}
-			//! post-decrement
-			_const_fwd_iterator operator--( int )
-			{
-				_const_fwd_iterator tmp( *this );
-				_seekRev( 1 );
-				return tmp;
-			}
-
-			//! addition operator
-			_const_fwd_iterator operator+( size_type n )
-			{
-				_const_fwd_iterator tmp( *this );
-				tmp._seekFwd( n );
-				return tmp;
-			}
-			//! addition operator
-			_const_fwd_iterator operator+( difference_type n )
-			{
-				_const_fwd_iterator tmp( *this );
-				if ( n < 0 )
-					tmp._seekRev( -n );
-				else
-					tmp._seekFwd( n );
-				return tmp;
-			}
-			//! subtraction operator
-			_const_fwd_iterator operator-( size_type n )
-			{
-				_const_fwd_iterator tmp( *this );
-				tmp._seekRev( n );
-				return tmp;
-			}
-			//! subtraction operator
-			_const_fwd_iterator operator-( difference_type n )
-			{
-				_const_fwd_iterator tmp( *this );
-				if ( n < 0 )
-					tmp._seekFwd( -n );
-				else
-					tmp._seekRev( n );
-				return tmp;
-			}
-
-			//! addition assignment operator
-			_const_fwd_iterator& operator+=( size_type n )
-			{
-				_seekFwd( n );
-				return *this;
-			}
-			//! addition assignment operator
-			_const_fwd_iterator& operator+=( difference_type n )
-			{
-				if ( n < 0 )
-					_seekRev( -n );
-				else
-					_seekFwd( n );
-				return *this;
-			}
-			//! subtraction assignment operator
-			_const_fwd_iterator& operator-=( size_type n )
-			{
-				_seekRev( n );
-				return *this;
-			}
-			//! subtraction assignment operator
-			_const_fwd_iterator& operator-=( difference_type n )
-			{
-				if ( n < 0 )
-					_seekFwd( -n );
-				else
-					_seekRev( n );
-				return *this;
-			}
-
-			//! dereference operator
-			const value_type& operator*() const
-			{
-				return *mIter;
-			}
-
-			//! dereference at offset operator
-			const value_type& operator[]( size_type n ) const
-			{
-				_const_fwd_iterator tmp( *this );
-				tmp += n;
-				return *tmp;
-			}
-			//! dereference at offset operator
-			const value_type& operator[]( difference_type n ) const
-			{
-				_const_fwd_iterator tmp( *this );
-				tmp += n;
-				return *tmp;
-			}
-
-			//! advances to the next Unicode character, honoring surrogate pairs in the UTF-16 stream
-			_const_fwd_iterator& moveNext()
-			{
-				_moveNext();
-				return *this;
-			}
-			//! rewinds to the previous Unicode character, honoring surrogate pairs in the UTF-16 stream
-			_const_fwd_iterator& movePrev()
-			{
-				_movePrev();
-				return *this;
-			}
-			//! Returns the Unicode value of the character at the current position (decodes surrogate pairs if needed)
-			unicode_char getCharacter() const
-			{
-				return _getCharacter();
-			}
-
-			//! difference operator
-			friend size_type operator-( const _const_fwd_iterator& left, const _const_fwd_iterator& right );
-			//! equality operator
-			friend bool operator==( const _const_fwd_iterator& left, const _const_fwd_iterator& right );
-			//! inequality operator
-			friend bool operator!=( const _const_fwd_iterator& left, const _const_fwd_iterator& right );
-			//! less than
-			friend bool operator<( const _const_fwd_iterator& left, const _const_fwd_iterator& right );
-			//! less than or equal
-			friend bool operator<=( const _const_fwd_iterator& left, const _const_fwd_iterator& right );
-			//! greater than
-			friend bool operator>( const _const_fwd_iterator& left, const _const_fwd_iterator& right );
-			//! greater than or equal
-			friend bool operator>=( const _const_fwd_iterator& left, const _const_fwd_iterator& right );
-
-		};
-
-		//#########################################################################
-		// REVERSE ITERATORS
-		//#########################################################################
-		class _const_rev_iterator; // forward declaration
-		//! forward iterator for UString
-		class _rev_iterator: public _base_iterator
-		{ /* i don't know why the beautifier is freaking out on this line */
-			friend class _const_rev_iterator;
-		public:
-			_rev_iterator() { }
-			_rev_iterator( const _rev_iterator& i )
-			{
-				_become( i );
-			}
-
-			//! pre-increment
-			_rev_iterator& operator++()
-			{
-				_seekRev( 1 );
-				return *this;
-			}
-			//! post-increment
-			_rev_iterator operator++( int )
-			{
-				_rev_iterator tmp( *this );
-				_seekRev( 1 );
-				return tmp;
-			}
-
-			//! pre-decrement
-			_rev_iterator& operator--()
-			{
-				_seekFwd( 1 );
-				return *this;
-			}
-			//! post-decrement
-			_rev_iterator operator--( int )
-			{
-				_rev_iterator tmp( *this );
-				_seekFwd( 1 );
-				return tmp;
-			}
-
-			//! addition operator
-			_rev_iterator operator+( size_type n )
-			{
-				_rev_iterator tmp( *this );
-				tmp._seekRev( n );
-				return tmp;
-			}
-			//! addition operator
-			_rev_iterator operator+( difference_type n )
-			{
-				_rev_iterator tmp( *this );
-				if ( n < 0 )
-					tmp._seekFwd( -n );
-				else
-					tmp._seekRev( n );
-				return tmp;
-			}
-			//! subtraction operator
-			_rev_iterator operator-( size_type n )
-			{
-				_rev_iterator tmp( *this );
-				tmp._seekFwd( n );
-				return tmp;
-			}
-			//! subtraction operator
-			_rev_iterator operator-( difference_type n )
-			{
-				_rev_iterator tmp( *this );
-				if ( n < 0 )
-					tmp._seekRev( -n );
-				else
-					tmp._seekFwd( n );
-				return tmp;
-			}
-
-			//! addition assignment operator
-			_rev_iterator& operator+=( size_type n )
-			{
-				_seekRev( n );
-				return *this;
-			}
-			//! addition assignment operator
-			_rev_iterator& operator+=( difference_type n )
-			{
-				if ( n < 0 )
-					_seekFwd( -n );
-				else
-					_seekRev( n );
-				return *this;
-			}
-			//! subtraction assignment operator
-			_rev_iterator& operator-=( size_type n )
-			{
-				_seekFwd( n );
-				return *this;
-			}
-			//! subtraction assignment operator
-			_rev_iterator& operator-=( difference_type n )
-			{
-				if ( n < 0 )
-					_seekRev( -n );
-				else
-					_seekFwd( n );
-				return *this;
-			}
-
-			//! dereference operator
-			value_type& operator*() const
-			{
-				return mIter[-1];
-			}
-
-			//! dereference at offset operator
-			value_type& operator[]( size_type n ) const
-			{
-				_rev_iterator tmp( *this );
-				tmp -= n;
-				return *tmp;
-			}
-			//! dereference at offset operator
-			value_type& operator[]( difference_type n ) const
-			{
-				_rev_iterator tmp( *this );
-				tmp -= n;
-				return *tmp;
-			}
-		};
-		//#########################################################################
-		//! const reverse iterator for UString
-		class _const_rev_iterator: public _base_iterator
-		{ /* i don't know why the beautifier is freaking out on this line */
-		public:
-			_const_rev_iterator() { }
-			_const_rev_iterator( const _const_rev_iterator& i )
-			{
-				_become( i );
-			}
-			_const_rev_iterator( const _rev_iterator& i )
-			{
-				_become( i );
-			}
-			//! pre-increment
-			_const_rev_iterator& operator++()
-			{
-				_seekRev( 1 );
-				return *this;
-			}
-			//! post-increment
-			_const_rev_iterator operator++( int )
-			{
-				_const_rev_iterator tmp( *this );
-				_seekRev( 1 );
-				return tmp;
-			}
-
-			//! pre-decrement
-			_const_rev_iterator& operator--()
-			{
-				_seekFwd( 1 );
-				return *this;
-			}
-			//! post-decrement
-			_const_rev_iterator operator--( int )
-			{
-				_const_rev_iterator tmp( *this );
-				_seekFwd( 1 );
-				return tmp;
-			}
-
-			//! addition operator
-			_const_rev_iterator operator+( size_type n )
-			{
-				_const_rev_iterator tmp( *this );
-				tmp._seekRev( n );
-				return tmp;
-			}
-			//! addition operator
-			_const_rev_iterator operator+( difference_type n )
-			{
-				_const_rev_iterator tmp( *this );
-				if ( n < 0 )
-					tmp._seekFwd( -n );
-				else
-					tmp._seekRev( n );
-				return tmp;
-			}
-			//! subtraction operator
-			_const_rev_iterator operator-( size_type n )
-			{
-				_const_rev_iterator tmp( *this );
-				tmp._seekFwd( n );
-				return tmp;
-			}
-			//! subtraction operator
-			_const_rev_iterator operator-( difference_type n )
-			{
-				_const_rev_iterator tmp( *this );
-				if ( n < 0 )
-					tmp._seekRev( -n );
-				else
-					tmp._seekFwd( n );
-				return tmp;
-			}
-
-			//! addition assignment operator
-			_const_rev_iterator& operator+=( size_type n )
-			{
-				_seekRev( n );
-				return *this;
-			}
-			//! addition assignment operator
-			_const_rev_iterator& operator+=( difference_type n )
-			{
-				if ( n < 0 )
-					_seekFwd( -n );
-				else
-					_seekRev( n );
-				return *this;
-			}
-			//! subtraction assignment operator
-			_const_rev_iterator& operator-=( size_type n )
-			{
-				_seekFwd( n );
-				return *this;
-			}
-			//! subtraction assignment operator
-			_const_rev_iterator& operator-=( difference_type n )
-			{
-				if ( n < 0 )
-					_seekRev( -n );
-				else
-					_seekFwd( n );
-				return *this;
-			}
-
-			//! dereference operator
-			const value_type& operator*() const
-			{
-				return mIter[-1];
-			}
-
-			//! dereference at offset operator
-			const value_type& operator[]( size_type n ) const
-			{
-				_const_rev_iterator tmp( *this );
-				tmp -= n;
-				return *tmp;
-			}
-			//! dereference at offset operator
-			const value_type& operator[]( difference_type n ) const
-			{
-				_const_rev_iterator tmp( *this );
-				tmp -= n;
-				return *tmp;
-			}
-
-			//! difference operator
-			friend size_type operator-( const _const_rev_iterator& left, const _const_rev_iterator& right );
-			//! equality operator
-			friend bool operator==( const _const_rev_iterator& left, const _const_rev_iterator& right );
-			//! inequality operator
-			friend bool operator!=( const _const_rev_iterator& left, const _const_rev_iterator& right );
-			//! less than
-			friend bool operator<( const _const_rev_iterator& left, const _const_rev_iterator& right );
-			//! less than or equal
-			friend bool operator<=( const _const_rev_iterator& left, const _const_rev_iterator& right );
-			//! greater than
-			friend bool operator>( const _const_rev_iterator& left, const _const_rev_iterator& right );
-			//! greater than or equal
-			friend bool operator>=( const _const_rev_iterator& left, const _const_rev_iterator& right );
-		};
-		//#########################################################################
-
-		typedef _fwd_iterator iterator;                     //!< iterator
-		typedef _rev_iterator reverse_iterator;             //!< reverse iterator
-		typedef _const_fwd_iterator const_iterator;         //!< const iterator
-		typedef _const_rev_iterator const_reverse_iterator; //!< const reverse iterator
-
-
-		//!\name Constructors/Destructor
-		//@{
-		//! default constructor, creates an empty string
-		UString()
-		{
-			_init();
-		}
-		//! copy constructor
-		UString( const UString& copy )
-		{
-			_init();
-			mData = copy.mData;
-		}
-		//! \a length copies of \a ch
-		UString( size_type length, const code_point& ch )
-		{
-			_init();
-			assign( length, ch );
-		}
-		//! duplicate of nul-terminated sequence \a str
-		UString( const code_point* str )
-		{
-			_init();
-			assign( str );
-		}
-		//! duplicate of \a str, \a length code points long
-		UString( const code_point* str, size_type length )
-		{
-			_init();
-			assign( str, length );
-		}
-		//! substring of \a str starting at \a index and \a length code points long
-		UString( const UString& str, size_type index, size_type length )
-		{
-			_init();
-			assign( str, index, length );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! duplicate of nul-terminated \c wchar_t array
-		UString( const wchar_t* w_str )
-		{
-			_init();
-			assign( w_str );
-		}
-		//! duplicate of \a w_str, \a length characters long
-		UString( const wchar_t* w_str, size_type length )
-		{
-			_init();
-			assign( w_str, length );
-		}
-#endif
-		//! duplicate of \a wstr
-		UString( const std::wstring& wstr )
-		{
-			_init();
-			assign( wstr );
-		}
-		//! duplicate of nul-terminated C-string \a c_str (UTF-8 encoding)
-		UString( const char* c_str )
-		{
-			_init();
-			assign( c_str );
-		}
-		//! duplicate of \a c_str, \a length characters long (UTF-8 encoding)
-		UString( const char* c_str, size_type length )
-		{
-			_init();
-			assign( c_str, length );
-		}
-		//! duplicate of \a str (UTF-8 encoding)
-		UString( const std::string& str )
-		{
-			_init();
-			assign( str );
-		}
-		//! destructor
-		~UString()
-		{
-			_cleanBuffer();
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name Utility functions
-		//@{
-		//! Returns the number of code points in the current string
-		size_type size() const
-		{
-			return mData.size();
-		}
-		//! Returns the number of code points in the current string
-		size_type length() const
-		{
-			return size();
-		}
-		//! Returns the number of Unicode characters in the string
-		/*! Executes in linear time. */
-		size_type length_Characters() const
-		{
-			const_iterator i = begin(), ie = end();
-			size_type c = 0;
-			while ( i != ie )
-			{
-				i.moveNext();
-				++c;
-			}
-			return c;
-		}
-		//! returns the maximum number of UTF-16 code points that the string can hold
-		size_type max_size() const
-		{
-			return mData.max_size();
-		}
-		//! sets the capacity of the string to at least \a size code points
-		void reserve( size_type size )
-		{
-			mData.reserve( size );
-		}
-		//! changes the size of the string to \a size, filling in any new area with \a val
-		void resize( size_type num, const code_point& val = 0 )
-		{
-			mData.resize( num, val );
-		}
-		//! exchanges the elements of the current string with those of \a from
-		void swap( UString& from )
-		{
-			mData.swap( from.mData );
-		}
-		//! returns \c true if the string has no elements, \c false otherwise
-		bool empty() const
-		{
-			return mData.empty();
-		}
-		//! returns a pointer to the first character in the current string
-		const code_point* c_str() const
-		{
-			return mData.c_str();
-		}
-		//! returns a pointer to the first character in the current string
-		const code_point* data() const
-		{
-			return c_str();
-		}
-		//! returns the number of elements that the string can hold before it will need to allocate more space
-		size_type capacity() const
-		{
-			return mData.capacity();
-		}
-		//! deletes all of the elements in the string
-		void clear()
-		{
-			mData.clear();
-		}
-		//! returns a substring of the current string, starting at \a index, and \a num characters long.
-		/*! If \a num is omitted, it will default to \c UString::npos, and the substr() function will simply return the remainder of the string starting at \a index. */
-		UString substr( size_type index, size_type num = npos ) const
-		{
-			// this could avoid the extra copy if we used a private specialty constructor
-			dstring data = mData.substr( index, num );
-			UString tmp;
-			tmp.mData.swap( data );
-			return tmp;
-		}
-		//! appends \a val to the end of the string
-		void push_back( unicode_char val )
-		{
-			code_point cp[2];
-			size_t c = _utf32_to_utf16( val, cp );
-			if ( c > 0 ) push_back( cp[0] );
-			if ( c > 1 ) push_back( cp[1] );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! appends \a val to the end of the string
-		void push_back( wchar_t val )
-		{
-			// we do this because the Unicode method still preserves UTF-16 code points
-			mData.push_back( static_cast<unicode_char>( val ) );
-		}
-#endif
-		//! appends \a val to the end of the string
-		/*! This can be used to push surrogate pair code points, you'll just need to push them
-		one after the other. */
-		void push_back( code_point val )
-		{
-			mData.push_back( val );
-		}
-		//! appends \a val to the end of the string
-		/*! Limited to characters under the 127 value barrier. */
-		void push_back( char val )
-		{
-			mData.push_back( static_cast<code_point>( val ) );
-		}
-		//! returns \c true if the given Unicode character \a ch is in this string
-		bool inString( unicode_char ch ) const
-		{
-			const_iterator i, ie = end();
-			for ( i = begin(); i != ie; i.moveNext() )
-			{
-				if ( i.getCharacter() == ch )
-					return true;
-			}
-			return false;
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name Stream variations
-		//@{
-		//! returns the current string in UTF-8 form within a std::string
-		const std::string& asUTF8() const
-		{
-			_load_buffer_UTF8();
-			return *m_buffer.mStrBuffer;
-		}
-		//! returns the current string in UTF-8 form as a nul-terminated char array
-		const char* asUTF8_c_str() const
-		{
-			_load_buffer_UTF8();
-			return m_buffer.mStrBuffer->c_str();
-		}
-		//! returns the current string in UTF-32 form within a utf32string
-		const utf32string& asUTF32() const
-		{
-			_load_buffer_UTF32();
-			return *m_buffer.mUTF32StrBuffer;
-		}
-		//! returns the current string in UTF-32 form as a nul-terminated unicode_char array
-		const unicode_char* asUTF32_c_str() const
-		{
-			_load_buffer_UTF32();
-			return m_buffer.mUTF32StrBuffer->c_str();
-		}
-		//! returns the current string in the native form of std::wstring
-		const std::wstring& asWStr() const
-		{
-			_load_buffer_WStr();
-			return *m_buffer.mWStrBuffer;
-		}
-		//! returns the current string in the native form of a nul-terminated wchar_t array
-		const wchar_t* asWStr_c_str() const
-		{
-			_load_buffer_WStr();
-			return m_buffer.mWStrBuffer->c_str();
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name Single Character Access
-		//@{
-		//! returns a reference to the element in the string at index \c loc
-		code_point& at( size_type loc )
-		{
-			return mData.at( loc );
-		}
-		//! returns a reference to the element in the string at index \c loc
-		const code_point& at( size_type loc ) const
-		{
-			return mData.at( loc );
-		}
-		//! returns the data point \a loc evaluated as a UTF-32 value
-		/*! This function will will only properly decode surrogate pairs when \a loc points to the index
-		of a lead code point that is followed by a trailing code point. Evaluating the trailing code point
-		itself, or pointing to a code point that is a sentinel value (part of a broken pair) will return
-		the value of just that code point (not a valid Unicode value, but useful as a sentinel value). */
-		unicode_char getChar( size_type loc ) const
-		{
-			const code_point* ptr = c_str();
-			unicode_char uc;
-			size_t len = _utf16_char_length( ptr[loc] );
-			code_point cp[2] = { /* blame the code beautifier */ 0, 0 };
-			cp[0] = ptr[loc];
-
-			if ( len == 2 && ( loc + 1 ) < mData.length() )
-			{
-				cp[1] = ptr[loc+1];
-			}
-			_utf16_to_utf32( cp, uc );
-			return uc;
-		}
-		//! sets the value of the character at \a loc to the Unicode value \a ch (UTF-32)
-		/*! Providing sentinel values (values between U+D800-U+DFFF) are accepted, but you should be aware
-		that you can also unwittingly create a valid surrogate pair if you don't pay attention to what you
-		are doing. \note This operation may also lengthen the string if a surrogate pair is needed to
-		represent the value given, but one is not available to replace; or alternatively shorten the string
-		if an existing surrogate pair is replaced with a character that is representable without a surrogate
-		pair. The return value will signify any lengthening or shortening performed, returning 0 if no change
-		was made, -1 if the string was shortened, or 1 if the string was lengthened. Any single call can
-		only change the string length by + or - 1. */
-		int setChar( size_type loc, unicode_char ch )
-		{
-			code_point cp[2] = { /* blame the code beautifier */ 0, 0 };
-			size_t lc = _utf32_to_utf16( ch, cp );
-			unicode_char existingChar = getChar( loc );
-			size_t existingSize = _utf16_char_length( existingChar );
-			size_t newSize = _utf16_char_length( ch );
-
-			if ( newSize > existingSize )
-			{
-				at( loc ) = cp[0];
-				insert( loc + 1, 1, cp[1] );
-				return 1;
-			}
-			if ( newSize < existingSize )
-			{
-				erase( loc, 1 );
-				at( loc ) = cp[0];
-				return -1;
-			}
-
-			// newSize == existingSize
-			at( loc ) = cp[0];
-			if ( lc == 2 ) at( loc + 1 ) = cp[1];
-			return 0;
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name iterator acquisition
-		//@{
-		//! returns an iterator to the first element of the string
-		iterator begin()
-		{
-			iterator i;
-			i.mIter = mData.begin();
-			i.mString = this;
-			return i;
-		}
-		//! returns an iterator to the first element of the string
-		const_iterator begin() const
-		{
-			const_iterator i;
-			i.mIter = const_cast<UString*>( this )->mData.begin();
-			i.mString = const_cast<UString*>( this );
-			return i;
-		}
-		//! returns an iterator just past the end of the string
-		iterator end()
-		{
-			iterator i;
-			i.mIter = mData.end();
-			i.mString = this;
-			return i;
-		}
-		//! returns an iterator just past the end of the string
-		const_iterator end() const
-		{
-			const_iterator i;
-			i.mIter = const_cast<UString*>( this )->mData.end();
-			i.mString = const_cast<UString*>( this );
-			return i;
-		}
-		//! returns a reverse iterator to the last element of the string
-		reverse_iterator rbegin()
-		{
-			reverse_iterator i;
-			i.mIter = mData.end();
-			i.mString = this;
-			return i;
-		}
-		//! returns a reverse iterator to the last element of the string
-		const_reverse_iterator rbegin() const
-		{
-			const_reverse_iterator i;
-			i.mIter = const_cast<UString*>( this )->mData.end();
-			i.mString = const_cast<UString*>( this );
-			return i;
-		}
-		//! returns a reverse iterator just past the beginning of the string
-		reverse_iterator rend()
-		{
-			reverse_iterator i;
-			i.mIter = mData.begin();
-			i.mString = this;
-			return i;
-		}
-		//! returns a reverse iterator just past the beginning of the string
-		const_reverse_iterator rend() const
-		{
-			const_reverse_iterator i;
-			i.mIter = const_cast<UString*>( this )->mData.begin();
-			i.mString = const_cast<UString*>( this );
-			return i;
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name assign
-		//@{
-		//! gives the current string the values from \a start to \a end
-		UString& assign( iterator start, iterator end )
-		{
-			mData.assign( start.mIter, end.mIter );
-			return *this;
-		}
-		//! assign \a str to the current string
-		UString& assign( const UString& str )
-		{
-			mData.assign( str.mData );
-			return *this;
-		}
-		//! assign the nul-terminated \a str to the current string
-		UString& assign( const code_point* str )
-		{
-			mData.assign( str );
-			return *this;
-		}
-		//! assign the first \a num characters of \a str to the current string
-		UString& assign( const code_point* str, size_type num )
-		{
-			mData.assign( str, num );
-			return *this;
-		}
-		//! assign \a len entries from \a str to the current string, starting at \a index
-		UString& assign( const UString& str, size_type index, size_type len )
-		{
-			mData.assign( str.mData, index, len );
-			return *this;
-		}
-		//! assign \a num copies of \a ch to the current string
-		UString& assign( size_type num, const code_point& ch )
-		{
-			mData.assign( num, ch );
-			return *this;
-		}
-		//! assign \a wstr to the current string (\a wstr is treated as a UTF-16 stream)
-		UString& assign( const std::wstring& wstr )
-		{
-			mData.clear();
-			mData.reserve( wstr.length() ); // best guess bulk allocate
-#ifdef WCHAR_UTF16 // if we're already working in UTF-16, this is easy
-			code_point tmp;
-			std::wstring::const_iterator i, ie = wstr.end();
-			for ( i = wstr.begin(); i != ie; ++i )
-			{
-				tmp = static_cast<code_point>( *i );
-				mData.push_back( tmp );
-			}
-#else // otherwise we do it the safe way (which is still 100% safe to pass UTF-16 through, just slower)
-			code_point cp[3] = { 0, 0, 0 };
-			unicode_char tmp;
-			std::wstring::const_iterator i, ie = wstr.end();
-			for ( i = wstr.begin(); i != ie; i++ )
-			{
-				tmp = static_cast<unicode_char>( *i );
-				size_t lc = _utf32_to_utf16( tmp, cp );
-				if ( lc > 0 ) mData.push_back( cp[0] );
-				if ( lc > 1 ) mData.push_back( cp[1] );
-			}
-#endif
-			return *this;
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! assign \a w_str to the current string
-		UString& assign( const wchar_t* w_str )
-		{
-			std::wstring tmp;
-			tmp.assign( w_str );
-			return assign( tmp );
-		}
-		//! assign the first \a num characters of \a w_str to the current string
-		UString& assign( const wchar_t* w_str, size_type num )
-		{
-			std::wstring tmp;
-			tmp.assign( w_str, num );
-			return assign( tmp );
-		}
-#endif
-		//! assign \a str to the current string (\a str is treated as a UTF-8 stream)
-		UString& assign( const std::string& str )
-		{
-			size_type len = _verifyUTF8( str );
-			clear(); // empty our contents, if there are any
-			reserve( len ); // best guess bulk capacity growth
-
-			// This is a 3 step process, converting each byte in the UTF-8 stream to UTF-32,
-			// then converting it to UTF-16, then finally appending the data buffer
-
-			unicode_char uc;          // temporary Unicode character buffer
-			unsigned char utf8buf[7]; // temporary UTF-8 buffer
-			utf8buf[6] = 0;
-			size_t utf8len;           // UTF-8 length
-			code_point utf16buff[3];  // temporary UTF-16 buffer
-			utf16buff[2] = 0;
-			size_t utf16len;          // UTF-16 length
-
-			std::string::const_iterator i, ie = str.end();
-			for ( i = str.begin(); i != ie; ++i )
-			{
-				utf8len = _utf8_char_length( static_cast<unsigned char>( *i ) ); // estimate bytes to load
-				for ( size_t j = 0; j < utf8len; j++ )
-				{ // load the needed UTF-8 bytes
-					utf8buf[j] = ( static_cast<unsigned char>( *( i + j ) ) ); // we don't increment 'i' here just in case the estimate is wrong (shouldn't happen, but we're being careful)
-				}
-				utf8buf[utf8len] = 0; // nul terminate so we throw an exception before running off the end of the buffer
-				utf8len = _utf8_to_utf32( utf8buf, uc ); // do the UTF-8 -> UTF-32 conversion
-				i += utf8len - 1; // we subtract 1 for the increment of the 'for' loop
-
-				utf16len = _utf32_to_utf16( uc, utf16buff ); // UTF-32 -> UTF-16 conversion
-				append( utf16buff, utf16len ); // append the characters to the string
-			}
-			return *this;
-		}
-		//! assign \a c_str to the current string (\a c_str is treated as a UTF-8 stream)
-		UString& assign( const char* c_str )
-		{
-			std::string tmp( c_str );
-			return assign( tmp );
-		}
-		//! assign the first \a num characters of \a c_str to the current string (\a c_str is treated as a UTF-8 stream)
-		UString& assign( const char* c_str, size_type num )
-		{
-			std::string tmp;
-			tmp.assign( c_str, num );
-			return assign( tmp );
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name append
-		//@{
-		//! appends \a str on to the end of the current string
-		UString& append( const UString& str )
-		{
-			mData.append( str.mData );
-			return *this;
-		}
-		//! appends \a str on to the end of the current string
-		UString& append( const code_point* str )
-		{
-			mData.append( str );
-			return *this;
-		}
-		//! appends a substring of \a str starting at \a index that is \a len characters long on to the end of the current string
-		UString& append( const UString& str, size_type index, size_type len )
-		{
-			mData.append( str.mData, index, len );
-			return *this;
-		}
-		//! appends \a num characters of \a str on to the end of the current string
-		UString& append( const code_point* str, size_type num )
-		{
-			mData.append( str, num );
-			return *this;
-		}
-		//! appends \a num repetitions of \a ch on to the end of the current string
-		UString& append( size_type num, code_point ch )
-		{
-			mData.append( num, ch );
-			return *this;
-		}
-		//! appends the sequence denoted by \a start and \a end on to the end of the current string
-		UString& append( iterator start, iterator end )
-		{
-			mData.append( start.mIter, end.mIter );
-			return *this;
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! appends \a num characters of \a str on to the end of the current string
-		UString& append( const wchar_t* w_str, size_type num )
-		{
-			std::wstring tmp( w_str, num );
-			return append( tmp );
-		}
-		//! appends \a num repetitions of \a ch on to the end of the current string
-		UString& append( size_type num, wchar_t ch )
-		{
-			return append( num, static_cast<unicode_char>( ch ) );
-		}
-#endif
-		//! appends \a num characters of \a str on to the end of the current string  (UTF-8 encoding)
-		UString& append( const char* c_str, size_type num )
-		{
-			UString tmp( c_str, num );
-			append( tmp );
-			return *this;
-		}
-		//! appends \a num repetitions of \a ch on to the end of the current string (Unicode values less than 128)
-		UString& append( size_type num, char ch )
-		{
-			append( num, static_cast<code_point>( ch ) );
-			return *this;
-		}
-		//! appends \a num repetitions of \a ch on to the end of the current string (Full Unicode spectrum)
-		UString& append( size_type num, unicode_char ch )
-		{
-			code_point cp[2] = { 0, 0 };
-			if ( _utf32_to_utf16( ch, cp ) == 2 )
-			{
-				for ( size_type i = 0; i < num; i++ )
-				{
-					append( 1, cp[0] );
-					append( 1, cp[1] );
-				}
-			}
-			else
-			{
-				for ( size_type i = 0; i < num; i++ )
-				{
-					append( 1, cp[0] );
-				}
-			}
-			return *this;
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name insert
-		//@{
-		//! inserts \a ch before the code point denoted by \a i
-		iterator insert( iterator i, const code_point& ch )
-		{
-			iterator ret;
-			ret.mIter = mData.insert( i.mIter, ch );
-			ret.mString = this;
-			return ret;
-		}
-		//! inserts \a str into the current string, at location \a index
-		UString& insert( size_type index, const UString& str )
-		{
-			mData.insert( index, str.mData );
-			return *this;
-		}
-		//! inserts \a str into the current string, at location \a index
-		UString& insert( size_type index, const code_point* str )
-		{
-			mData.insert( index, str );
-			return *this;
-		}
-		//! inserts a substring of \a str (starting at \a index2 and \a num code points long) into the current string, at location \a index1
-		UString& insert( size_type index1, const UString& str, size_type index2, size_type num )
-		{
-			mData.insert( index1, str.mData, index2, num );
-			return *this;
-		}
-		//! inserts the code points denoted by \a start and \a end into the current string, before the code point specified by \a i
-		void insert( iterator i, iterator start, iterator end )
-		{
-			mData.insert( i.mIter, start.mIter, end.mIter );
-		}
-		//! inserts \a num code points of \a str into the current string, at location \a index
-		UString& insert( size_type index, const code_point* str, size_type num )
-		{
-			mData.insert( index, str, num );
-			return *this;
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! inserts \a num code points of \a str into the current string, at location \a index
-		UString& insert( size_type index, const wchar_t* w_str, size_type num )
-		{
-			UString tmp( w_str, num );
-			insert( index, tmp );
-			return *this;
-		}
-#endif
-		//! inserts \a num code points of \a str into the current string, at location \a index
-		UString& insert( size_type index, const char* c_str, size_type num )
-		{
-			UString tmp( c_str, num );
-			insert( index, tmp );
-			return *this;
-		}
-		//! inserts \a num copies of \a ch into the current string, at location \a index
-		UString& insert( size_type index, size_type num, code_point ch )
-		{
-			mData.insert( index, num, ch );
-			return *this;
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! inserts \a num copies of \a ch into the current string, at location \a index
-		UString& insert( size_type index, size_type num, wchar_t ch )
-		{
-			insert( index, num, static_cast<unicode_char>( ch ) );
-			return *this;
-		}
-#endif
-		//! inserts \a num copies of \a ch into the current string, at location \a index
-		UString& insert( size_type index, size_type num, char ch )
-		{
-			insert( index, num, static_cast<code_point>( ch ) );
-			return *this;
-		}
-		//! inserts \a num copies of \a ch into the current string, at location \a index
-		UString& insert( size_type index, size_type num, unicode_char ch )
-		{
-			code_point cp[3] = { 0, 0, 0 };
-			size_t lc = _utf32_to_utf16( ch, cp );
-			if ( lc == 1 )
-			{
-				return insert( index, num, cp[0] );
-			}
-			for ( size_type c = 0; c < num; c++ )
-			{
-				// insert in reverse order to preserve ordering after insert
-				insert( index, 1, cp[1] );
-				insert( index, 1, cp[0] );
-			}
-			return *this;
-		}
-		//! inserts \a num copies of \a ch into the current string, before the code point denoted by \a i
-		void insert( iterator i, size_type num, const code_point& ch )
-		{
-			mData.insert( i.mIter, num, ch );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! inserts \a num copies of \a ch into the current string, before the code point denoted by \a i
-		void insert( iterator i, size_type num, const wchar_t& ch )
-		{
-			insert( i, num, static_cast<unicode_char>( ch ) );
-		}
-#endif
-		//! inserts \a num copies of \a ch into the current string, before the code point denoted by \a i
-		void insert( iterator i, size_type num, const char& ch )
-		{
-			insert( i, num, static_cast<code_point>( ch ) );
-		}
-		//! inserts \a num copies of \a ch into the current string, before the code point denoted by \a i
-		void insert( iterator i, size_type num, const unicode_char& ch )
-		{
-			code_point cp[3] = { 0, 0, 0 };
-			size_t lc = _utf32_to_utf16( ch, cp );
-			if ( lc == 1 )
-			{
-				insert( i, num, cp[0] );
-			}
-			else
-			{
-				for ( size_type c = 0; c < num; c++ )
-				{
-					// insert in reverse order to preserve ordering after insert
-					insert( i, 1, cp[1] );
-					insert( i, 1, cp[0] );
-				}
-			}
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name erase
-		//@{
-		//! removes the code point pointed to by \a loc, returning an iterator to the next character
-		iterator erase( iterator loc )
-		{
-			iterator ret;
-			ret.mIter = mData.erase( loc.mIter );
-			ret.mString = this;
-			return ret;
-		}
-		//! removes the code points between \a start and \a end (including the one at \a start but not the one at \a end), returning an iterator to the code point after the last code point removed
-		iterator erase( iterator start, iterator end )
-		{
-			iterator ret;
-			ret.mIter = mData.erase( start.mIter, end.mIter );
-			ret.mString = this;
-			return ret;
-		}
-		//! removes \a num code points from the current string, starting at \a index
-		UString& erase( size_type index = 0, size_type num = npos )
-		{
-			if ( num == npos )
-				mData.erase( index );
-			else
-				mData.erase( index, num );
-			return *this;
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name replace
-		//@{
-		//! replaces up to \a num1 code points of the current string (starting at \a index1) with \a str
-		UString& replace( size_type index1, size_type num1, const UString& str )
-		{
-			mData.replace( index1, num1, str.mData, 0, npos );
-			return *this;
-		}
-		//! replaces up to \a num1 code points of the current string (starting at \a index1) with up to \a num2 code points from \a str
-		UString& replace( size_type index1, size_type num1, const UString& str, size_type num2 )
-		{
-			mData.replace( index1, num1, str.mData, 0, num2 );
-			return *this;
-		}
-		//! replaces up to \a num1 code points of the current string (starting at \a index1) with up to \a num2 code points from \a str beginning at \a index2
-		UString& replace( size_type index1, size_type num1, const UString& str, size_type index2, size_type num2 )
-		{
-			mData.replace( index1, num1, str.mData, index2, num2 );
-			return *this;
-		}
-		//! replaces code points in the current string from \a start to \a end with \a num code points from \a str
-		UString& replace( iterator start, iterator end, const UString& str, size_type num = npos )
-		{
-			_const_fwd_iterator st(start); //Work around for gcc, allow it to find correct overload
-
-			size_type index1 = begin() - st;
-			size_type num1 = end - st;
-			return replace( index1, num1, str, 0, num );
-		}
-		//! replaces up to \a num1 code points in the current string (beginning at \a index) with \c num2 copies of \c ch
-		UString& replace( size_type index, size_type num1, size_type num2, code_point ch )
-		{
-			mData.replace( index, num1, num2, ch );
-			return *this;
-		}
-		//! replaces the code points in the current string from \a start to \a end with \a num copies of \a ch
-		UString& replace( iterator start, iterator end, size_type num, code_point ch )
-		{
-			_const_fwd_iterator st(start); //Work around for gcc, allow it to find correct overload
-
-			size_type index1 = begin() - st;
-			size_type num1 = end - st;
-			return replace( index1, num1, num, ch );
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name compare
-		//@{
-		//! compare \a str to the current string
-		int compare( const UString& str ) const
-		{
-			return mData.compare( str.mData );
-		}
-		//! compare \a str to the current string
-		int compare( const code_point* str ) const
-		{
-			return mData.compare( str );
-		}
-		//! compare \a str to a substring of the current string, starting at \a index for \a length characters
-		int compare( size_type index, size_type length, const UString& str ) const
-		{
-			return mData.compare( index, length, str.mData );
-		}
-		//! compare a substring of \a str to a substring of the current string, where \a index2 and \a length2 refer to \a str and \a index and \a length refer to the current string
-		int compare( size_type index, size_type length, const UString& str, size_type index2, size_type length2 ) const
-		{
-			return mData.compare( index, length, str.mData, index2, length2 );
-		}
-		//! compare a substring of \a str to a substring of the current string, where the substring of \a str begins at zero and is \a length2 characters long, and the substring of the current string begins at \a index and is \a length  characters long
-		int compare( size_type index, size_type length, const code_point* str, size_type length2 ) const
-		{
-			return mData.compare( index, length, str, length2 );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! compare a substring of \a str to a substring of the current string, where the substring of \a str begins at zero and is \a length2 elements long, and the substring of the current string begins at \a index and is \a length characters long
-		int compare( size_type index, size_type length, const wchar_t* w_str, size_type length2 ) const
-		{
-			UString tmp( w_str, length2 );
-			return compare( index, length, tmp );
-		}
-#endif
-		//! compare a substring of \a str to a substring of the current string, where the substring of \a str begins at zero and is \a length2 <b>UTF-8 code points</b> long, and the substring of the current string begins at \a index and is \a length characters long
-		int compare( size_type index, size_type length, const char* c_str, size_type length2 ) const
-		{
-			UString tmp( c_str, length2 );
-			return compare( index, length, tmp );
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name find & rfind
-		//@{
-		//! returns the index of the first occurrence of \a str within the current string, starting at \a index; returns \c UString::npos if nothing is found
-		/*! \a str is a UTF-16 encoded string, but through implicit casting can also be a UTF-8 encoded string (const char* or std::string) */
-		size_type find( const UString& str, size_type index = 0 ) const
-		{
-			return mData.find( str.c_str(), index );
-		}
-		//! returns the index of the first occurrence of \a str within the current string and within \a length code points, starting at \a index; returns \c UString::npos if nothing is found
-		/*! \a cp_str is a UTF-16 encoded string */
-		size_type find( const code_point* cp_str, size_type index, size_type length ) const
-		{
-			UString tmp( cp_str );
-			return mData.find( tmp.c_str(), index, length );
-		}
-		//! returns the index of the first occurrence of \a str within the current string and within \a length code points, starting at \a index; returns \c UString::npos if nothing is found
-		/*! \a cp_str is a UTF-8 encoded string */
-		size_type find( const char* c_str, size_type index, size_type length ) const
-		{
-			UString tmp( c_str );
-			return mData.find( tmp.c_str(), index, length );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! returns the index of the first occurrence of \a str within the current string and within \a length code points, starting at \a index; returns \c UString::npos if nothing is found
-		/*! \a cp_str is a UTF-16 encoded string */
-		size_type find( const wchar_t* w_str, size_type index, size_type length ) const
-		{
-			UString tmp( w_str );
-			return mData.find( tmp.c_str(), index, length );
-		}
-#endif
-		//! returns the index of the first occurrence \a ch within the current string, starting at \a index; returns \c UString::npos if nothing is found
-		/*! \a ch is only capable of representing Unicode values up to U+007F (127) */
-		size_type find( char ch, size_type index = 0 ) const
-		{
-			return find( static_cast<code_point>( ch ), index );
-		}
-		//! returns the index of the first occurrence \a ch within the current string, starting at \a index; returns \c UString::npos if nothing is found
-		/*! \a ch is only capable of representing Unicode values up to U+FFFF (65535) */
-		size_type find( code_point ch, size_type index = 0 ) const
-		{
-			return mData.find( ch, index );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! returns the index of the first occurrence \a ch within the current string, starting at \a index; returns \c UString::npos if nothing is found
-		/*! \a ch is only capable of representing Unicode values up to U+FFFF (65535) */
-		size_type find( wchar_t ch, size_type index = 0 ) const
-		{
-			return find( static_cast<unicode_char>( ch ), index );
-		}
-#endif
-		//! returns the index of the first occurrence \a ch within the current string, starting at \a index; returns \c UString::npos if nothing is found
-		/*! \a ch can fully represent any Unicode character */
-		size_type find( unicode_char ch, size_type index = 0 ) const
-		{
-			code_point cp[3] = { 0, 0, 0 };
-			size_t lc = _utf32_to_utf16( ch, cp );
-			return find( UString( cp, lc ), index );
-		}
-
-		//! returns the location of the first occurrence of \a str in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type rfind( const UString& str, size_type index = 0 ) const
-		{
-			return mData.rfind( str.c_str(), index );
-		}
-		//! returns the location of the first occurrence of \a str in the current string, doing a reverse search from \a index, searching at most \a num characters; returns \c UString::npos if nothing is found
-		size_type rfind( const code_point* cp_str, size_type index, size_type num ) const
-		{
-			UString tmp( cp_str );
-			return mData.rfind( tmp.c_str(), index, num );
-		}
-		//! returns the location of the first occurrence of \a str in the current string, doing a reverse search from \a index, searching at most \a num characters; returns \c UString::npos if nothing is found
-		size_type rfind( const char* c_str, size_type index, size_type num ) const
-		{
-			UString tmp( c_str );
-			return mData.rfind( tmp.c_str(), index, num );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! returns the location of the first occurrence of \a str in the current string, doing a reverse search from \a index, searching at most \a num characters; returns \c UString::npos if nothing is found
-		size_type rfind( const wchar_t* w_str, size_type index, size_type num ) const
-		{
-			UString tmp( w_str );
-			return mData.rfind( tmp.c_str(), index, num );
-		}
-#endif
-		//! returns the location of the first occurrence of \a ch in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type rfind( char ch, size_type index = 0 ) const
-		{
-			return rfind( static_cast<code_point>( ch ), index );
-		}
-		//! returns the location of the first occurrence of \a ch in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type rfind( code_point ch, size_type index ) const
-		{
-			return mData.rfind( ch, index );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! returns the location of the first occurrence of \a ch in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type rfind( wchar_t ch, size_type index = 0 ) const
-		{
-			return rfind( static_cast<unicode_char>( ch ), index );
-		}
-#endif
-		//! returns the location of the first occurrence of \a ch in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type rfind( unicode_char ch, size_type index = 0 ) const
-		{
-			code_point cp[3] = { 0, 0, 0 };
-			size_t lc = _utf32_to_utf16( ch, cp );
-			return rfind( UString( cp, lc ), index );
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name find_first/last_(not)_of
-		//@{
-		//! Returns the index of the first character within the current string that matches \b any character in \a str, beginning the search at \a index and searching at most \a num characters; returns \c UString::npos if nothing is found
-		size_type find_first_of( const UString &str, size_type index = 0, size_type num = npos ) const
-		{
-			size_type i = 0;
-			const size_type len = length();
-			while ( i < num && ( index + i ) < len )
-			{
-				unicode_char ch = getChar( index + i );
-				if ( str.inString( ch ) )
-					return index + i;
-				i += _utf16_char_length( ch ); // increment by the Unicode character length
-			}
-			return npos;
-		}
-		//! returns the index of the first occurrence of \a ch in the current string, starting the search at \a index; returns \c UString::npos if nothing is found
-		size_type find_first_of( code_point ch, size_type index = 0 ) const
-		{
-			UString tmp;
-			tmp.assign( 1, ch );
-			return find_first_of( tmp, index );
-		}
-		//! returns the index of the first occurrence of \a ch in the current string, starting the search at \a index; returns \c UString::npos if nothing is found
-		size_type find_first_of( char ch, size_type index = 0 ) const
-		{
-			return find_first_of( static_cast<code_point>( ch ), index );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! returns the index of the first occurrence of \a ch in the current string, starting the search at \a index; returns \c UString::npos if nothing is found
-		size_type find_first_of( wchar_t ch, size_type index = 0 ) const
-		{
-			return find_first_of( static_cast<unicode_char>( ch ), index );
-		}
-#endif
-		//! returns the index of the first occurrence of \a ch in the current string, starting the search at \a index; returns \c UString::npos if nothing is found
-		size_type find_first_of( unicode_char ch, size_type index = 0 ) const
-		{
-			code_point cp[3] = { 0, 0, 0 };
-			size_t lc = _utf32_to_utf16( ch, cp );
-			return find_first_of( UString( cp, lc ), index );
-		}
-
-		//! returns the index of the first character within the current string that does not match any character in \a str, beginning the search at \a index and searching at most \a num characters; returns \c UString::npos if nothing is found
-		size_type find_first_not_of( const UString& str, size_type index = 0, size_type num = npos ) const
-		{
-			size_type i = 0;
-			const size_type len = length();
-			while ( i < num && ( index + i ) < len )
-			{
-				unicode_char ch = getChar( index + i );
-				if ( !str.inString( ch ) )
-					return index + i;
-				i += _utf16_char_length( ch ); // increment by the Unicode character length
-			}
-			return npos;
-		}
-		//! returns the index of the first character within the current string that does not match \a ch, starting the search at \a index; returns \c UString::npos if nothing is found
-		size_type find_first_not_of( code_point ch, size_type index = 0 ) const
-		{
-			UString tmp;
-			tmp.assign( 1, ch );
-			return find_first_not_of( tmp, index );
-		}
-		//! returns the index of the first character within the current string that does not match \a ch, starting the search at \a index; returns \c UString::npos if nothing is found
-		size_type find_first_not_of( char ch, size_type index = 0 ) const
-		{
-			return find_first_not_of( static_cast<code_point>( ch ), index );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! returns the index of the first character within the current string that does not match \a ch, starting the search at \a index; returns \c UString::npos if nothing is found
-		size_type find_first_not_of( wchar_t ch, size_type index = 0 ) const
-		{
-			return find_first_not_of( static_cast<unicode_char>( ch ), index );
-		}
-#endif
-		//! returns the index of the first character within the current string that does not match \a ch, starting the search at \a index; returns \c UString::npos if nothing is found
-		size_type find_first_not_of( unicode_char ch, size_type index = 0 ) const
-		{
-			code_point cp[3] = { 0, 0, 0 };
-			size_t lc = _utf32_to_utf16( ch, cp );
-			return find_first_not_of( UString( cp, lc ), index );
-		}
-
-		//! returns the index of the first character within the current string that matches any character in \a str, doing a reverse search from \a index and searching at most \a num characters; returns \c UString::npos if nothing is found
-		size_type find_last_of( const UString& str, size_type index = npos, size_type num = npos ) const
-		{
-			size_type i = 0;
-			const size_type len = length();
-			if ( index > len ) index = len - 1;
-
-			while ( i < num && ( index - i ) != npos )
-			{
-				size_type j = index - i;
-				// careful to step full Unicode characters
-				if ( j != 0 && _utf16_surrogate_follow( at( j ) ) && _utf16_surrogate_lead( at( j - 1 ) ) )
-				{
-					j = index - ++i;
-				}
-				// and back to the usual dull test
-				unicode_char ch = getChar( j );
-				if ( str.inString( ch ) )
-					return j;
-				i++;
-			}
-			return npos;
-		}
-		//! returns the index of the first occurrence of \a ch in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type find_last_of( code_point ch, size_type index = npos ) const
-		{
-			UString tmp;
-			tmp.assign( 1, ch );
-			return find_last_of( tmp, index );
-		}
-		//! returns the index of the first occurrence of \a ch in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type find_last_of( char ch, size_type index = npos ) const
-		{
-			return find_last_of( static_cast<code_point>( ch ), index );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! returns the index of the first occurrence of \a ch in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type find_last_of( wchar_t ch, size_type index = npos ) const
-		{
-			return find_last_of( static_cast<unicode_char>( ch ), index );
-		}
-#endif
-		//! returns the index of the first occurrence of \a ch in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type find_last_of( unicode_char ch, size_type index = npos ) const
-		{
-			code_point cp[3] = { 0, 0, 0 };
-			size_t lc = _utf32_to_utf16( ch, cp );
-			return find_last_of( UString( cp, lc ), index );
-		}
-
-		//! returns the index of the last character within the current string that does not match any character in \a str, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type find_last_not_of( const UString& str, size_type index = npos, size_type num = npos ) const
-		{
-			size_type i = 0;
-			const size_type len = length();
-			if ( index > len ) index = len - 1;
-
-			while ( i < num && ( index - i ) != npos )
-			{
-				size_type j = index - i;
-				// careful to step full Unicode characters
-				if ( j != 0 && _utf16_surrogate_follow( at( j ) ) && _utf16_surrogate_lead( at( j - 1 ) ) )
-				{
-					j = index - ++i;
-				}
-				// and back to the usual dull test
-				unicode_char ch = getChar( j );
-				if ( !str.inString( ch ) )
-					return j;
-				i++;
-			}
-			return npos;
-		}
-		//! returns the index of the last occurrence of a character that does not match \a ch in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type find_last_not_of( code_point ch, size_type index = npos ) const
-		{
-			UString tmp;
-			tmp.assign( 1, ch );
-			return find_last_not_of( tmp, index );
-		}
-		//! returns the index of the last occurrence of a character that does not match \a ch in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type find_last_not_of( char ch, size_type index = npos ) const
-		{
-			return find_last_not_of( static_cast<code_point>( ch ), index );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! returns the index of the last occurrence of a character that does not match \a ch in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type find_last_not_of( wchar_t ch, size_type index = npos ) const
-		{
-			return find_last_not_of( static_cast<unicode_char>( ch ), index );
-		}
-#endif
-		//! returns the index of the last occurrence of a character that does not match \a ch in the current string, doing a reverse search from \a index; returns \c UString::npos if nothing is found
-		size_type find_last_not_of( unicode_char ch, size_type index = npos ) const
-		{
-			code_point cp[3] = { 0, 0, 0 };
-			size_t lc = _utf32_to_utf16( ch, cp );
-			return find_last_not_of( UString( cp, lc ), index );
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name Operators
-		//@{
-		//! less than operator
-		bool operator<( const UString& right ) const
-		{
-			return compare( right ) < 0;
-		}
-		//! less than or equal operator
-		bool operator<=( const UString& right ) const
-		{
-			return compare( right ) <= 0;
-		}
-		//! greater than operator
-		bool operator>( const UString& right ) const
-		{
-			return compare( right ) > 0;
-		}
-		//! greater than or equal operator
-		bool operator>=( const UString& right ) const
-		{
-			return compare( right ) >= 0;
-		}
-		//! equality operator
-		bool operator==( const UString& right ) const
-		{
-			return compare( right ) == 0;
-		}
-		//! inequality operator
-		bool operator!=( const UString& right ) const
-		{
-			return !operator==( right );
-		}
-		//! assignment operator, implicitly casts all compatible types
-		UString& operator=( const UString& s )
-		{
-			return assign( s );
-		}
-		//! assignment operator
-		UString& operator=( code_point ch )
-		{
-			clear();
-			return append( 1, ch );
-		}
-		//! assignment operator
-		UString& operator=( char ch )
-		{
-			clear();
-			return append( 1, ch );
-		}
-#if MYGUI_IS_NATIVE_WCHAR_T
-		//! assignment operator
-		UString& operator=( wchar_t ch )
-		{
-			clear();
-			return append( 1, ch );
-		}
-#endif
-		//! assignment operator
-		UString& operator=( unicode_char ch )
-		{
-			clear();
-			return append( 1, ch );
-		}
-		//! code point dereference operator
-		code_point& operator[]( size_type index )
-		{
-			return at( index );
-		}
-		//! code point dereference operator
-		const code_point& operator[]( size_type index ) const
-		{
-			return at( index );
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name Implicit Cast Operators
-		//@{
-		//! implicit cast to std::string
-		operator std::string() const
-		{
-			return std::string( asUTF8() );
-		}
-		//! implicit cast to std::wstring
-		operator std::wstring() const
-		{
-			return std::wstring( asWStr() );
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name UTF-16 character encoding/decoding
-		//@{
-		//! returns \c true if \a cp does not match the signature for the lead of follow code point of a surrogate pair in a UTF-16 sequence
-		static bool _utf16_independent_char( code_point cp )
-		{
-			if ( 0xD800 <= cp && cp <= 0xDFFF ) // tests if the cp is within the surrogate pair range
-				return false; // it matches a surrogate pair signature
-			return true; // everything else is a standalone code point
-		}
-		//! returns \c true if \a cp matches the signature of a surrogate pair lead character
-		static bool _utf16_surrogate_lead( code_point cp )
-		{
-			if ( 0xD800 <= cp && cp <= 0xDBFF ) // tests if the cp is within the 2nd word of a surrogate pair
-				return true; // it is a 1st word
-			return false; // it isn't
-		}
-		//! returns \c true if \a cp matches the signature of a surrogate pair following character
-		static bool _utf16_surrogate_follow( code_point cp )
-		{
-			if ( 0xDC00 <= cp && cp <= 0xDFFF ) // tests if the cp is within the 2nd word of a surrogate pair
-				return true; // it is a 2nd word
-			return false; // everything else isn't
-		}
-		//! estimates the number of UTF-16 code points in the sequence starting with \a cp
-		static size_t _utf16_char_length( code_point cp )
-		{
-			if ( 0xD800 <= cp && cp <= 0xDBFF ) // test if cp is the beginning of a surrogate pair
-				return 2; // if it is, then we are 2 words long
-			return 1; // otherwise we are only 1 word long
-		}
-		//! returns the number of UTF-16 code points needed to represent the given UTF-32 character \a cp
-		static size_t _utf16_char_length( unicode_char uc )
-		{
-			if ( uc > 0xFFFF ) // test if uc is greater than the single word maximum
-				return 2; // if so, we need a surrogate pair
-			return 1; // otherwise we can stuff it into a single word
-		}
-		//! converts the given UTF-16 character buffer \a in_cp to a single UTF-32 Unicode character \a out_uc, returns the number of code points used to create the output character (2 for surrogate pairs, otherwise 1)
-		/*! This function does it's best to prevent error conditions, verifying complete
-		surrogate pairs before applying the algorithm. In the event that half of a pair
-		is found it will happily generate a value in the 0xD800 - 0xDFFF range, which is
-		normally an invalid Unicode value but we preserve them for use as sentinel values. */
-		static size_t _utf16_to_utf32( const code_point in_cp[2], unicode_char& out_uc )
-		{
-			const code_point& cp1 = in_cp[0];
-			const code_point& cp2 = in_cp[1];
-			bool wordPair = false;
-
-			// does it look like a surrogate pair?
-			if ( 0xD800 <= cp1 && cp1 <= 0xDBFF )
-			{
-				// looks like one, but does the other half match the algorithm as well?
-				if ( 0xDC00 <= cp2 && cp2 <= 0xDFFF )
-					wordPair = true; // yep!
-			}
-
-			if ( !wordPair )
-			{ // if we aren't a 100% authentic surrogate pair, then just copy the value
-				out_uc = cp1;
-				return 1;
-			}
-
-			unsigned short cU = cp1, cL = cp2; // copy upper and lower words of surrogate pair to writable buffers
-			cU -= 0xD800; // remove the encoding markers
-			cL -= 0xDC00;
-
-			out_uc = ( cU & 0x03FF ) << 10; // grab the 10 upper bits and set them in their proper location
-			out_uc |= ( cL & 0x03FF ); // combine in the lower 10 bits
-			out_uc += 0x10000; // add back in the value offset
-
-			return 2; // this whole operation takes to words, so that's what we'll return
-		}
-		//! writes the given UTF-32 \a uc_in to the buffer location \a out_cp using UTF-16 encoding, returns the number of code points used to encode the input (always 1 or 2)
-		/*! This function, like its counterpart, will happily create invalid UTF-16 surrogate pairs. These
-		invalid entries will be created for any value of \c in_uc that falls in the range U+D800 - U+DFFF.
-		These are generally useful as sentinel values to represent various program specific conditions.
-		\note This function will also pass through any single UTF-16 code point without modification,
-		making it a safe method of ensuring a stream that is unknown UTF-32 or UTF-16 is truly UTF-16.*/
-		static size_t _utf32_to_utf16( const unicode_char& in_uc, code_point out_cp[2] )
-		{
-			if ( in_uc <= 0xFFFF )
-			{ // we blindly preserve sentinel values because our decoder understands them
-				out_cp[0] = in_uc;
-				return 1;
-			}
-			unicode_char uc = in_uc; // copy to writable buffer
-			unsigned short tmp; // single code point buffer
-			uc -= 0x10000; // subtract value offset
-
-			//process upper word
-			tmp = ( uc >> 10 ) & 0x03FF; // grab the upper 10 bits
-			tmp += 0xD800; // add encoding offset
-			out_cp[0] = tmp; // write
-
-			// process lower word
-			tmp = uc & 0x03FF; // grab the lower 10 bits
-			tmp += 0xDC00; // add encoding offset
-			out_cp[1] = tmp; // write
-
-			return 2; // return used word count (2 for surrogate pairs)
-		}
-		//@}
-
-		//////////////////////////////////////////////////////////////////////////
-
-		//!\name UTF-8 character encoding/decoding
-		//@{
-		//! returns \c true if \a cp is the beginning of a UTF-8 sequence
-		static bool _utf8_start_char( unsigned char cp )
-		{
-			return ( cp & ~_cont_mask ) != _cont;
-		}
-		//! estimates the number of UTF-8 code points in the sequence starting with \a cp
-		static size_t _utf8_char_length( unsigned char cp )
-		{
-			if ( !( cp & 0x80 ) ) return 1;
-			if (( cp & ~_lead1_mask ) == _lead1 ) return 2;
-			if (( cp & ~_lead2_mask ) == _lead2 ) return 3;
-			if (( cp & ~_lead3_mask ) == _lead3 ) return 4;
-			if (( cp & ~_lead4_mask ) == _lead4 ) return 5;
-			if (( cp & ~_lead5_mask ) == _lead5 ) return 6;
-			throw invalid_data( "invalid UTF-8 sequence header value" );
-		}
-		//! returns the number of UTF-8 code points needed to represent the given UTF-32 character \a cp
-		static size_t _utf8_char_length( unicode_char uc )
-		{
-			/*
-			7 bit:  U-00000000 - U-0000007F: 0xxxxxxx
-			11 bit: U-00000080 - U-000007FF: 110xxxxx 10xxxxxx
-			16 bit: U-00000800 - U-0000FFFF: 1110xxxx 10xxxxxx 10xxxxxx
-			21 bit: U-00010000 - U-001FFFFF: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-			26 bit: U-00200000 - U-03FFFFFF: 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-			31 bit: U-04000000 - U-7FFFFFFF: 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-			*/
-			if ( !( uc & ~0x0000007F ) ) return 1;
-			if ( !( uc & ~0x000007FF ) ) return 2;
-			if ( !( uc & ~0x0000FFFF ) ) return 3;
-			if ( !( uc & ~0x001FFFFF ) ) return 4;
-			if ( !( uc & ~0x03FFFFFF ) ) return 5;
-			if ( !( uc & ~0x7FFFFFFF ) ) return 6;
-			throw invalid_data( "invalid UTF-32 value" );
-		}
-
-		//! converts the given UTF-8 character buffer to a single UTF-32 Unicode character, returns the number of bytes used to create the output character (maximum of 6)
-		static size_t _utf8_to_utf32( const unsigned char in_cp[6], unicode_char& out_uc )
-		{
-			size_t len = _utf8_char_length( in_cp[0] );
-			if ( len == 1 )
-			{ // if we are only 1 byte long, then just grab it and exit
-				out_uc = in_cp[0];
-				return 1;
-			}
-
-			unicode_char c = 0; // temporary buffer
-			size_t i = 0;
-			switch ( len )
-			{ // load header byte
-			case 6:
-				c = in_cp[i] & _lead5_mask;
-				break;
-			case 5:
-				c = in_cp[i] & _lead4_mask;
-				break;
-			case 4:
-				c = in_cp[i] & _lead3_mask;
-				break;
-			case 3:
-				c = in_cp[i] & _lead2_mask;
-				break;
-			case 2:
-				c = in_cp[i] & _lead1_mask;
-				break;
-			}
-
-			for ( ++i; i < len; i++ )
-			{ // load each continuation byte
-				if (( in_cp[i] & ~_cont_mask ) != _cont )
-					throw invalid_data( "bad UTF-8 continuation byte" );
-				c <<= 6;
-				c |= ( in_cp[i] & _cont_mask );
-			}
-
-			out_uc = c; // write the final value and return the used byte length
-			return len;
-		}
-		//! writes the given UTF-32 \a uc_in to the buffer location \a out_cp using UTF-8 encoding, returns the number of bytes used to encode the input
-		static size_t _utf32_to_utf8( const unicode_char& in_uc, unsigned char out_cp[6] )
-		{
-			size_t len = _utf8_char_length( in_uc ); // predict byte length of sequence
-			unicode_char c = in_uc; // copy to temp buffer
-
-			//stuff all of the lower bits
-			for ( size_t i = len - 1; i > 0; i-- )
-			{
-				out_cp[i] = (( c ) & _cont_mask ) | _cont;
-				c >>= 6;
-			}
-
-			//now write the header byte
-			switch ( len )
-			{
-			case 6:
-				out_cp[0] = (( c ) & _lead5_mask ) | _lead5;
-				break;
-			case 5:
-				out_cp[0] = (( c ) & _lead4_mask ) | _lead4;
-				break;
-			case 4:
-				out_cp[0] = (( c ) & _lead3_mask ) | _lead3;
-				break;
-			case 3:
-				out_cp[0] = (( c ) & _lead2_mask ) | _lead2;
-				break;
-			case 2:
-				out_cp[0] = (( c ) & _lead1_mask ) | _lead1;
-				break;
-			case 1:
-			default:
-				out_cp[0] = ( c ) & 0x7F;
-				break;
-			}
-
-			// return the byte length of the sequence
-			return len;
-		}
-
-		//! verifies a UTF-8 stream, returning the total number of Unicode characters found
-		static size_type _verifyUTF8( const unsigned char* c_str )
-		{
-			std::string tmp( reinterpret_cast<const char*>( c_str ) );
-			return _verifyUTF8( tmp );
-		}
-		//! verifies a UTF-8 stream, returning the total number of Unicode characters found
-		static size_type _verifyUTF8( const std::string& str )
-		{
-			std::string::const_iterator i, ie = str.end();
-			i = str.begin();
-			size_type length = 0;
-
-			while ( i != ie )
-			{
-				// characters pass until we find an extended sequence
-				if (( *i ) & 0x80 )
-				{
-					unsigned char c = ( *i );
-					size_t contBytes = 0;
-
-					// get continuation byte count and test for overlong sequences
-					if (( c & ~_lead1_mask ) == _lead1 )
-					{ // 1 additional byte
-						if ( c == _lead1 ) throw invalid_data( "overlong UTF-8 sequence" );
-						contBytes = 1;
-
-					}
-					else if (( c & ~_lead2_mask ) == _lead2 )
-					{ // 2 additional bytes
-						contBytes = 2;
-						if ( c == _lead2 )
-						{ // possible overlong UTF-8 sequence
-							c = ( *( i + 1 ) ); // look ahead to next byte in sequence
-							if (( c & _lead2 ) == _cont ) throw invalid_data( "overlong UTF-8 sequence" );
-						}
-
-					}
-					else if (( c & ~_lead3_mask ) == _lead3 )
-					{ // 3 additional bytes
-						contBytes = 3;
-						if ( c == _lead3 )
-						{ // possible overlong UTF-8 sequence
-							c = ( *( i + 1 ) ); // look ahead to next byte in sequence
-							if (( c & _lead3 ) == _cont ) throw invalid_data( "overlong UTF-8 sequence" );
-						}
-
-					}
-					else if (( c & ~_lead4_mask ) == _lead4 )
-					{ // 4 additional bytes
-						contBytes = 4;
-						if ( c == _lead4 )
-						{ // possible overlong UTF-8 sequence
-							c = ( *( i + 1 ) ); // look ahead to next byte in sequence
-							if (( c & _lead4 ) == _cont ) throw invalid_data( "overlong UTF-8 sequence" );
-						}
-
-					}
-					else if (( c & ~_lead5_mask ) == _lead5 )
-					{ // 5 additional bytes
-						contBytes = 5;
-						if ( c == _lead5 )
-						{ // possible overlong UTF-8 sequence
-							c = ( *( i + 1 ) ); // look ahead to next byte in sequence
-							if (( c & _lead5 ) == _cont ) throw invalid_data( "overlong UTF-8 sequence" );
-						}
-					}
-
-					// check remaining continuation bytes for
-					while ( contBytes-- )
-					{
-						c = ( *( ++i ) ); // get next byte in sequence
-						if (( c & ~_cont_mask ) != _cont )
-							throw invalid_data( "bad UTF-8 continuation byte" );
-					}
-				}
-				length++;
-				i++;
-			}
-			return length;
-		}
-		//@}
-
-	private:
-		//template<class ITER_TYPE> friend class _iterator;
-		dstring mData;
-
-		//! buffer data type identifier
-		enum BufferType
-		{
-			bt_none,
-			bt_string,
-			bt_wstring,
-			bt_utf32string
-		};
-
-		//! common constructor operations
-		void _init()
-		{
-			m_buffer.mVoidBuffer = 0;
-			m_bufferType = bt_none;
-			m_bufferSize = 0;
-		}
-
-		///////////////////////////////////////////////////////////////////////
-		// Scratch buffer
-		//! auto cleans the scratch buffer using the proper delete for the stored type
-		void _cleanBuffer() const
-		{
-			if ( m_buffer.mVoidBuffer != 0 )
-			{
-				switch ( m_bufferType )
-				{
-				case bt_string:
-					delete m_buffer.mStrBuffer;
-					break;
-				case bt_wstring:
-					delete m_buffer.mWStrBuffer;
-					break;
-				case bt_utf32string:
-					delete m_buffer.mUTF32StrBuffer;
-					break;
-				case bt_none: // under the worse of circumstances, this is all we can do, and hope it works out
-				default:
-					//delete m_buffer.mVoidBuffer;
-					// delete void* is undefined, don't do that
-					MYGUI_ASSERT(false, "This should never happen - mVoidBuffer should never contain something if we "
-						"don't know the type");
-					break;
-				}
-				m_buffer.mVoidBuffer = 0;
-				m_bufferSize = 0;
-			}
-		}
-
-		//! create a std::string in the scratch buffer area
-		void _getBufferStr() const
-		{
-			if ( m_bufferType != bt_string )
-			{
-				_cleanBuffer();
-				m_buffer.mStrBuffer = new std::string();
-				m_bufferType = bt_string;
-			}
-			m_buffer.mStrBuffer->clear();
-		}
-		//! create a std::wstring in the scratch buffer area
-		void _getBufferWStr() const
-		{
-			if ( m_bufferType != bt_wstring )
-			{
-				_cleanBuffer();
-				m_buffer.mWStrBuffer = new std::wstring();
-				m_bufferType = bt_wstring;
-			}
-			m_buffer.mWStrBuffer->clear();
-		}
-		//! create a utf32string in the scratch buffer area
-		void _getBufferUTF32Str() const
-		{
-			if ( m_bufferType != bt_utf32string )
-			{
-				_cleanBuffer();
-				m_buffer.mUTF32StrBuffer = new utf32string();
-				m_bufferType = bt_utf32string;
-			}
-			m_buffer.mUTF32StrBuffer->clear();
-		}
-
-		void _load_buffer_UTF8() const
-		{
-			_getBufferStr();
-			std::string& buffer = ( *m_buffer.mStrBuffer );
-			buffer.reserve( length() );
-
-			unsigned char utf8buf[6];
-			char* charbuf = ( char* )utf8buf;
-			unicode_char c;
-			size_t len;
-
-			const_iterator i, ie = end();
-			for ( i = begin(); i != ie; i.moveNext() )
-			{
-				c = i.getCharacter();
-				len = _utf32_to_utf8( c, utf8buf );
-				size_t j = 0;
-				while ( j < len )
-					buffer.push_back( charbuf[j++] );
-			}
-		}
-		void _load_buffer_WStr() const
-		{
-			_getBufferWStr();
-			std::wstring& buffer = ( *m_buffer.mWStrBuffer );
-			buffer.reserve( length() ); // may over reserve, but should be close enough
-#ifdef WCHAR_UTF16 // wchar_t matches UTF-16
-			const_iterator i, ie = end();
-			for ( i = begin(); i != ie; ++i )
-			{
-				buffer.push_back(( wchar_t )( *i ) );
-			}
-#else // wchar_t fits UTF-32
-			unicode_char c;
-			const_iterator i, ie = end();
-			for ( i = begin(); i != ie; i.moveNext() )
-			{
-				c = i.getCharacter();
-				buffer.push_back(( wchar_t )c );
-			}
-#endif
-		}
-		void _load_buffer_UTF32() const
-		{
-			_getBufferUTF32Str();
-			utf32string& buffer = ( *m_buffer.mUTF32StrBuffer );
-			buffer.reserve( length() ); // may over reserve, but should be close enough
-
-			unicode_char c;
-
-			const_iterator i, ie = end();
-			for ( i = begin(); i != ie; i.moveNext() )
-			{
-				c = i.getCharacter();
-				buffer.push_back( c );
-			}
-		}
-
-		mutable BufferType m_bufferType; // identifies the data type held in m_buffer
-		mutable size_t m_bufferSize; // size of the CString buffer
-
-		// multi-purpose buffer used everywhere we need a throw-away buffer
-		union Buffer
-		{
-			mutable void* mVoidBuffer;
-			mutable std::string* mStrBuffer;
-			mutable std::wstring* mWStrBuffer;
-			mutable utf32string* mUTF32StrBuffer;
-		}
-		m_buffer;
-	};
-
-	//! string addition operator \relates UString
-	inline UString operator+( const UString& s1, const UString& s2 )
-	{
-		return UString( s1 ).append( s2 );
-	}
-	//! string addition operator \relates UString
-	inline UString operator+( const UString& s1, UString::code_point c )
-	{
-		return UString( s1 ).append( 1, c );
-	}
-	//! string addition operator \relates UString
-	inline UString operator+( const UString& s1, UString::unicode_char c )
-	{
-		return UString( s1 ).append( 1, c );
-	}
-	//! string addition operator \relates UString
-	inline UString operator+( const UString& s1, char c )
-	{
-		return UString( s1 ).append( 1, c );
-	}
-#if MYGUI_IS_NATIVE_WCHAR_T
-	//! string addition operator \relates UString
-	inline UString operator+( const UString& s1, wchar_t c )
-	{
-		return UString( s1 ).append( 1, c );
-	}
-#endif
-	//! string addition operator \relates UString
-	inline UString operator+( UString::code_point c, const UString& s2 )
-	{
-		return UString().append( 1, c ).append( s2 );
-	}
-	//! string addition operator \relates UString
-	inline UString operator+( UString::unicode_char c, const UString& s2 )
-	{
-		return UString().append( 1, c ).append( s2 );
-	}
-	//! string addition operator \relates UString
-	inline UString operator+( char c, const UString& s2 )
-	{
-		return UString().append( 1, c ).append( s2 );
-	}
-#if MYGUI_IS_NATIVE_WCHAR_T
-	//! string addition operator \relates UString
-	inline UString operator+( wchar_t c, const UString& s2 )
-	{
-		return UString().append( 1, c ).append( s2 );
-	}
-#endif
-
-	// (const) forward iterator common operators
-	inline UString::size_type operator-( const UString::_const_fwd_iterator& left, const UString::_const_fwd_iterator& right )
-	{
-		return ( left.mIter - right.mIter );
-	}
-	inline bool operator==( const UString::_const_fwd_iterator& left, const UString::_const_fwd_iterator& right )
-	{
-		return left.mIter == right.mIter;
-	}
-	inline bool operator!=( const UString::_const_fwd_iterator& left, const UString::_const_fwd_iterator& right )
-	{
-		return left.mIter != right.mIter;
-	}
-	inline bool operator<( const UString::_const_fwd_iterator& left, const UString::_const_fwd_iterator& right )
-	{
-		return left.mIter < right.mIter;
-	}
-	inline bool operator<=( const UString::_const_fwd_iterator& left, const UString::_const_fwd_iterator& right )
-	{
-		return left.mIter <= right.mIter;
-	}
-	inline bool operator>( const UString::_const_fwd_iterator& left, const UString::_const_fwd_iterator& right )
-	{
-		return left.mIter > right.mIter;
-	}
-	inline bool operator>=( const UString::_const_fwd_iterator& left, const UString::_const_fwd_iterator& right )
-	{
-		return left.mIter >= right.mIter;
-	}
-
-	// (const) reverse iterator common operators
-	// NB: many of these operations are evaluated in reverse because this is a reverse iterator wrapping a forward iterator
-	inline UString::size_type operator-( const UString::_const_rev_iterator& left, const UString::_const_rev_iterator& right )
-	{
-		return ( right.mIter - left.mIter );
-	}
-	inline bool operator==( const UString::_const_rev_iterator& left, const UString::_const_rev_iterator& right )
-	{
-		return left.mIter == right.mIter;
-	}
-	inline bool operator!=( const UString::_const_rev_iterator& left, const UString::_const_rev_iterator& right )
-	{
-		return left.mIter != right.mIter;
-	}
-	inline bool operator<( const UString::_const_rev_iterator& left, const UString::_const_rev_iterator& right )
-	{
-		return right.mIter < left.mIter;
-	}
-	inline bool operator<=( const UString::_const_rev_iterator& left, const UString::_const_rev_iterator& right )
-	{
-		return right.mIter <= left.mIter;
-	}
-	inline bool operator>( const UString::_const_rev_iterator& left, const UString::_const_rev_iterator& right )
-	{
-		return right.mIter > left.mIter;
-	}
-	inline bool operator>=( const UString::_const_rev_iterator& left, const UString::_const_rev_iterator& right )
-	{
-		return right.mIter >= left.mIter;
-	}
-
-	//! std::ostream write operator \relates UString
-	inline std::ostream& operator << ( std::ostream& os, const UString& s )
-	{
-		return os << s.asUTF8();
-	}
-
-	//! std::wostream write operator \relates UString
-	//inline std::wostream& operator << ( std::wostream& os, const UString& s )
-	//{
-	//	return os << s.asWStr();
-	//}
-
-
-
-}
-
-#endif // __MYGUI_U_STRING_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Utility.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Utility.h
deleted file mode 100644
index 1cc81d70f5..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Utility.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_UTILITY_H__
-#define __MYGUI_UTILITY_H__
-
-#include "MyGUI_Prerequest.h"
-#include <vector>
-#include <sstream>
-
-namespace MyGUI
-{
-	namespace utility
-	{
-
-		inline void trim(std::string& _str, bool _left = true, bool _right = true)
-		{
-			if (_right) _str.erase(_str.find_last_not_of(" \t\r")+1);
-			if (_left) _str.erase(0, _str.find_first_not_of(" \t\r"));
-		}
-
-		// конвертирование в строку
-		template<typename T >
-		inline std::string toString (T p)
-		{
-			std::ostringstream stream;
-			stream << p;
-			return stream.str();
-		}
-
-		inline const std::string& toString (const std::string& _value)
-		{
-			return _value;
-		}
-
-		template<typename T1,  typename T2 >
-		inline std::string toString (T1 p1, T2 p2)
-		{
-			std::ostringstream stream;
-			stream << p1 << p2;
-			return stream.str();
-		}
-
-		template<typename T1,  typename T2,  typename T3 >
-		inline std::string toString (T1 p1, T2 p2, T3 p3)
-		{
-			std::ostringstream stream;
-			stream << p1 << p2 << p3;
-			return stream.str();
-		}
-
-		template<typename T1,  typename T2,  typename T3, typename T4 >
-		inline std::string toString (T1 p1, T2 p2, T3 p3, T4 p4)
-		{
-			std::ostringstream stream;
-			stream << p1 << p2 << p3 << p4;
-			return stream.str();
-		}
-
-		template<typename T1,  typename T2,  typename T3, typename T4, typename T5 >
-		inline std::string toString (T1 p1, T2 p2, T3 p3, T4 p4, T5 p5)
-		{
-			std::ostringstream stream;
-			stream << p1 << p2 << p3 << p4 << p5;
-			return stream.str();
-		}
-
-		template<typename T1,  typename T2,  typename T3, typename T4, typename T5, typename T6 >
-		inline std::string toString (T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6)
-		{
-			std::ostringstream stream;
-			stream << p1 << p2 << p3 << p4 << p5 << p6;
-			return stream.str();
-		}
-
-		template<typename T1,  typename T2,  typename T3, typename T4, typename T5, typename T6, typename T7 >
-		inline std::string toString (T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7)
-		{
-			std::ostringstream stream;
-			stream << p1 << p2 << p3 << p4 << p5 << p6 << p7;
-			return stream.str();
-		}
-
-		template<typename T1,  typename T2,  typename T3, typename T4, typename T5, typename T6, typename T7, typename T8 >
-		inline std::string toString (T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7, T8 p8)
-		{
-			std::ostringstream stream;
-			stream << p1 << p2 << p3 << p4 << p5 << p6 << p7 << p8;
-			return stream.str();
-		}
-
-		template<typename T1,  typename T2,  typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9 >
-		inline std::string toString (T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7, T8 p8, T9 p9)
-		{
-			std::ostringstream stream;
-			stream << p1 << p2 << p3 << p4 << p5 << p6 << p7 << p8 << p9;
-			return stream.str();
-		}
-
-		template< >
-		inline std::string toString<bool> (bool _value)
-		{
-			return _value ? "true" : "false";
-		}
-
-
-		// утилиты для парсинга
-		template<typename T >
-		inline T parseValue( const std::string& _value )
-		{
-			std::istringstream stream(_value);
-			T result;
-			stream >> result;
-			if (stream.fail()) return T();
-			else
-			{
-				int item = stream.get();
-				while (item != -1)
-				{
-					if (item != ' ' && item != '\t') return T();
-					item = stream.get();
-				}
-			}
-			return result;
-		}
-
-		// отдельная имплементация под bool
-		template<>
-		inline bool parseValue( const std::string& _value )
-		{
-			if (_value == "true" || _value == "1") return true;
-			return false;
-		}
-
-		// отдельная имплементация под char
-		template<>
-		inline char parseValue( const std::string& _value ) { return (char)parseValue<short>(_value); }
-
-		// отдельная имплементация под unsigned char
-		template<>
-		inline unsigned char parseValue( const std::string& _value ) { return (unsigned char)parseValue<unsigned short>(_value); }
-
-
-		inline short parseShort(const std::string& _value) { return parseValue<short>(_value); }
-		inline unsigned short parseUShort(const std::string& _value) { return parseValue<unsigned short>(_value); }
-		inline int parseInt(const std::string& _value) { return parseValue<int>(_value); }
-		inline unsigned int parseUInt(const std::string& _value) { return parseValue<unsigned int>(_value); }
-		inline size_t parseSizeT(const std::string& _value) { return parseValue<size_t>(_value); }
-		inline float parseFloat(const std::string& _value) { return parseValue<float>(_value); }
-		inline double parseDouble(const std::string& _value) { return parseValue<double>(_value); }
-
-		inline bool parseBool(const std::string& _value) { return parseValue<bool>(_value); }
-		inline char parseChar(const std::string& _value) { return parseValue<char>(_value); }
-		inline unsigned char parseUChar(const std::string& _value) { return parseValue<unsigned char>(_value); }
-
-		// для парсинга сложных типов, состоящих из простых
-		template<typename T1, typename T2 >
-		inline T1 parseValueEx2(const std::string& _value)
-		{
-			T2 p1, p2;
-			std::istringstream stream(_value);
-			stream >> p1 >> p2;
-			if (stream.fail()) return T1();
-			else
-			{
-				int item = stream.get();
-				while (item != -1)
-				{
-					if (item != ' ' && item != '\t') return T1();
-					item = stream.get();
-				}
-			}
-			return T1(p1, p2);
-		}
-
-		template<typename T1, typename T2 >
-		inline T1 parseValueEx3(const std::string& _value)
-		{
-			T2 p1, p2, p3;
-			std::istringstream stream(_value);
-			stream >> p1 >> p2 >> p3;
-			if (stream.fail()) return T1();
-			else
-			{
-				int item = stream.get();
-				while (item != -1)
-				{
-					if (item != ' ' && item != '\t') return T1();
-					item = stream.get();
-				}
-			}
-			return T1(p1, p2, p3);
-		}
-
-		template<typename T1, typename T2 >
-		inline T1 parseValueEx4(const std::string& _value)
-		{
-			T2 p1, p2, p3, p4;
-			std::istringstream stream(_value);
-			stream >> p1 >> p2 >> p3 >> p4;
-			if (stream.fail()) return T1();
-			else
-			{
-				int item = stream.get();
-				while (item != -1)
-				{
-					if (item != ' ' && item != '\t') return T1();
-					item = stream.get();
-				}
-			}
-			return T1(p1, p2, p3, p4);
-		}
-
-		namespace templates
-		{
-			template<typename T>
-			inline void split(std::vector<std::string>& _ret, const std::string& _source, const std::string& _delims)
-			{
-				size_t start = _source.find_first_not_of(_delims);
-				while (start != _source.npos)
-				{
-					size_t end = _source.find_first_of(_delims, start);
-					if (end != _source.npos) _ret.push_back(_source.substr(start, end-start));
-					else
-					{
-						_ret.push_back(_source.substr(start));
-						break;
-					}
-					start = _source.find_first_not_of(_delims, end + 1);
-				}
-			}
-		} // namespace templates
-
-		inline std::vector<std::string> split(const std::string& _source, const std::string& _delims = "\t\n ")
-		{
-			std::vector<std::string> result;
-			templates::split<void>(result, _source, _delims);
-			return result;
-		}
-
-		template<typename T1, typename T2, typename T3, typename T4>
-		inline bool parseComplex(const std::string& _value, T1& _p1, T2& _p2, T3& _p3, T4& _p4)
-		{
-			std::istringstream stream(_value);
-
-			stream >> _p1 >> _p2 >> _p3 >> _p4;
-
-			if (stream.fail()) return false;
-			int item = stream.get();
-			while (item != -1)
-			{
-				if (item != ' ' && item != '\t') return false;
-				item = stream.get();
-			}
-
-			return true;
-		}
-
-		template<typename T1, typename T2, typename T3>
-		inline bool parseComplex(const std::string& _value, T1& _p1, T2& _p2, T3& _p3)
-		{
-			std::istringstream stream(_value);
-
-			stream >> _p1 >> _p2 >> _p3;
-
-			if (stream.fail()) return false;
-			int item = stream.get();
-			while (item != -1)
-			{
-				if (item != ' ' && item != '\t') return false;
-				item = stream.get();
-			}
-
-			return true;
-		}
-
-		template<typename T1, typename T2>
-		inline bool parseComplex(const std::string& _value, T1& _p1, T2& _p2)
-		{
-			std::istringstream stream(_value);
-
-			stream >> _p1 >> _p2;
-
-			if (stream.fail()) return false;
-			int item = stream.get();
-			while (item != -1)
-			{
-				if (item != ' ' && item != '\t') return false;
-				item = stream.get();
-			}
-
-			return true;
-		}
-
-		template<typename T1>
-		inline bool parseComplex(const std::string& _value, T1& _p1)
-		{
-			std::istringstream stream(_value);
-
-			stream >> _p1;
-
-			if (stream.fail()) return false;
-			int item = stream.get();
-			while (item != -1)
-			{
-				if (item != ' ' && item != '\t') return false;
-				item = stream.get();
-			}
-
-			return true;
-		}
-
-		template<>
-		inline bool parseComplex<bool>(const std::string& _value, bool& _p1)
-		{
-			std::string value(_value);
-			trim(value);
-			if ((value == "true") || (value == "1"))
-			{
-				_p1 = true;
-				return true;
-			}
-			else if ((value == "false") || (value == "0"))
-			{
-				_p1 = false;
-				return true;
-			}
-
-			return false;
-		}
-
-	} // namespace utility
-
-} // namespace MyGUI
-
-#endif // __MYGUI_UTILITY_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_VScroll.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_VScroll.h
deleted file mode 100644
index 8f2b59cc91..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_VScroll.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_VSCROLL_H__
-#define __MYGUI_VSCROLL_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_EventPair.h"
-
-namespace MyGUI
-{
-
-	typedef delegates::CDelegate2<VScroll*, size_t> EventHandle_VScrollPtrSizeT;
-
-	class MYGUI_EXPORT VScroll :
-		public Widget
-	{
-		MYGUI_RTTI_DERIVED( VScroll )
-
-	public:
-		VScroll();
-
-		/** Set scroll range */
-		void setScrollRange(size_t _value);
-		/** Get scroll range */
-		size_t getScrollRange() { return mScrollRange; }
-
-		/** Set scroll position (value from 0 to range - 1) */
-		void setScrollPosition(size_t _value);
-		/** Get scroll position (value from 0 to range - 1) */
-		size_t getScrollPosition() { return mScrollPosition; }
-
-		/** Set scroll page
-			@param _page Tracker step when buttons pressed
-		*/
-		void setScrollPage(size_t _value) { mScrollPage = _value; }
-		/** Get scroll page */
-		size_t getScrollPage() { return mScrollPage; }
-
-		/** Set scroll view page
-			@param _viewPage Tracker step when pressed on scroll line
-		*/
-		void setScrollViewPage(size_t _value) { mScrollViewPage = _value; }
-		/** Get scroll view page */
-		size_t getScrollViewPage() { return mScrollViewPage; }
-
-		/** Get size in pixels of area where scroll moves */
-		virtual int getLineSize();
-
-		/** Set size of track in pixels
-			@param _value in pixels, if less than MinTrackSize, MinTrackSize used
-		*/
-		virtual void setTrackSize(int _value);
-		/** Get size of track in pixels */
-		virtual int getTrackSize();
-
-		/** Set minimal track size (used for setTrackSize)*/
-		void setMinTrackSize(int _value) { mMinTrackSize = _value; }
-		/** Get minimal track size */
-		int getMinTrackSize() { return mMinTrackSize; }
-
-		/** Enable or disable move to click mode.\n
-			Move to click mode: Tracker moves to cursor when pressed on scroll line.\n
-			Disabled (false) by default.
-		*/
-		void setMoveToClick(bool _value) { mMoveToClick = _value; }
-		/** Get move to click mode flag */
-		bool getMoveToClick() { return mMoveToClick; }
-
-		//! @copydoc Widget::setPosition(const IntPoint& _value)
-		virtual void setPosition(const IntPoint& _value);
-		//! @copydoc Widget::setSize(const IntSize& _value)
-		virtual void setSize(const IntSize& _value);
-		//! @copydoc Widget::setCoord(const IntCoord& _value)
-		virtual void setCoord(const IntCoord& _value);
-
-		/** @copydoc Widget::setPosition(int _left, int _top) */
-		void setPosition(int _left, int _top) { setPosition(IntPoint(_left, _top)); }
-		/** @copydoc Widget::setSize(int _width, int _height) */
-		void setSize(int _width, int _height) { setSize(IntSize(_width, _height)); }
-		/** @copydoc Widget::setCoord(int _left, int _top, int _width, int _height) */
-		void setCoord(int _left, int _top, int _width, int _height) { setCoord(IntCoord(_left, _top, _width, _height)); }
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*event:*/
-		/** Event : scroll tracker position changed.\n
-			signature : void method(MyGUI::VScroll* _sender, size_t _position)\n
-			@param _sender widget that called this event
-			@param _position - new tracker position
-		*/
-		EventPair<EventHandle_WidgetSizeT, EventHandle_VScrollPtrSizeT> eventScrollChangePosition;
-
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void Widget::setCoord(const IntCoord& _coord)")
-		void setPosition(const IntCoord& _coord) { setCoord(_coord); }
-		MYGUI_OBSOLETE("use : void Widget::setCoord(int _left, int _top, int _width, int _height)")
-		void setPosition(int _left, int _top, int _width, int _height) { setCoord(_left, _top, _width, _height); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	protected:
-		virtual ~VScroll();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		virtual void updateTrack();
-		virtual void TrackMove(int _left, int _top);
-
-		virtual void onMouseWheel(int _rel);
-
-		void notifyMousePressed(Widget* _sender, int _left, int _top, MouseButton _id);
-		void notifyMouseReleased(Widget* _sender, int _left, int _top, MouseButton _id);
-		void notifyMouseDrag(Widget* _sender, int _left, int _top);
-		void notifyMouseWheel(Widget* _sender, int _rel);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-	protected:
-		// наши кнопки
-		Button* mWidgetStart;
-		Button* mWidgetEnd;
-		Button* mWidgetTrack;
-		// куски между кнопками
-		Button* mWidgetFirstPart;
-		Button* mWidgetSecondPart;
-
-		// смещение внутри окна
-		IntPoint mPreActionOffset;
-
-		// диапазон на который трек может двигаться
-		size_t mSkinRangeStart;
-		size_t mSkinRangeEnd;
-
-		size_t mScrollRange;
-		size_t mScrollPosition;
-		size_t mScrollPage; // на сколько перещелкивать, при щелчке на кнопке
-		size_t mScrollViewPage; // на сколько перещелкивать, при щелчке по полосе
-
-		int mMinTrackSize;
-		bool mMoveToClick;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_VSCROLL_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Version.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Version.h
deleted file mode 100644
index 33c69b2dc3..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Version.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_VERSION_H__
-#define __MYGUI_VERSION_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_Utility.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT Version
-	{
-	public:
-		Version() : value(0) { }
-		Version(uint8 _major, uint8 _minor, uint16 _patch) : value((uint32(_major) << 24) + (uint32(_minor) << 16) + uint32(_patch)) { }
-		Version(uint8 _major, uint8 _minor) : value((uint32(_major) << 24) + (uint32(_minor) << 16)) { }
-		explicit Version(const std::string& _value) : value(parse(_value).value) { }
-
-		friend bool operator < (Version const& a, Version const& b) { return a.getPoorVersion() < b.getPoorVersion(); }
-		friend bool operator >= (Version const& a, Version const& b) { return !(a < b); }
-		friend bool operator > (Version const& a, Version const& b) { return (b < a); }
-		friend bool operator <= (Version const& a, Version const& b) { return !(a > b); }
-
-		friend bool operator == (Version const& a, Version const& b) { return !(a < b) && !(a > b); }
-		friend bool operator != (Version const& a, Version const& b) { return !(a == b); }
-
-		friend std::ostream& operator << ( std::ostream& _stream, const Version&  _value )
-		{
-			_stream << _value.print();
-			return _stream;
-		}
-
-		friend std::istream& operator >> ( std::istream& _stream, Version&  _value )
-		{
-			std::string value;
-			_stream >> value;
-			_value = Version::parse(value);
-			return _stream;
-		}
-
-		uint8 getMajor() const { return uint8((value & 0xFF000000) >> 24); }
-		uint8 getMinor() const { return uint8((value & 0x00FF0000) >> 16); }
-		uint16 getPatch() const { return uint16(value & 0x0000FFFF); }
-
-		uint32 getPoorVersion() const { return value & 0xFFFF0000; }
-		uint32 getFullVersion() const { return value; }
-
-		std::string print() const
-		{
-			if (getPatch() == 0) return utility::toString(getMajor(), ".", getMinor());
-			return utility::toString(getMajor(), ".", getMinor(), ".", getPatch());
-		}
-
-		static Version parse(const std::string& _value)
-		{
-			const std::vector<std::string>& vec = utility::split(_value, ".");
-			if (vec.empty()) return Version();
-			uint8 major = (uint8)utility::parseValue<int>(vec[0]);
-			uint8 minor = vec.size() > 1 ? (uint8)utility::parseValue<int>(vec[1]) : uint8(0);
-			uint16 patch = vec.size() > 2 ? (uint16)utility::parseValue<int>(vec[2]) : uint16(0);
-			return Version(major, minor, patch);
-		}
-
-	private:
-		union
-		{
-			uint32 value;
-			uint8 value_data[4];
-		};
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_VERSION_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_VertexData.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_VertexData.h
deleted file mode 100644
index 7167490924..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_VertexData.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_VERTEX_DATA_H__
-#define __MYGUI_VERTEX_DATA_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-
-namespace MyGUI
-{
-
-	struct Vertex
-	{
-		void set(float _x, float _y, float _z, float _u, float _v, uint32 _colour)
-		{
-			x = _x;
-			y = _y;
-			z = _z;
-			u = _u;
-			v = _v;
-			colour = _colour;
-		}
-
-		float x, y, z;
-		uint32 colour;
-		float u, v;
-	};
-
-	struct VertexQuad
-	{
-		enum Enum
-		{
-			CornerLT = 0,
-			CornerRT = 1,
-			CornerLB = 2,
-			CornerLB2 = 3,
-			CornerRT2 = 4,
-			CornerRB = 5,
-			VertexCount = 6
-		};
-
-		void set(float _l, float _t, float _r, float _b, float _z, float _u1, float _v1, float _u2, float _v2, uint32 _colour)
-		{
-			vertex[CornerLT].set(_l, _t, _z, _u1, _v1, _colour);
-			vertex[CornerRT].set(_r, _t, _z, _u2, _v1, _colour);
-			vertex[CornerLB].set(_l, _b, _z, _u1, _v2, _colour);
-			vertex[CornerRB].set(_r, _b, _z, _u2, _v2, _colour);
-			vertex[CornerRT2] = vertex[CornerRT];
-			vertex[CornerLB2] = vertex[CornerLB];
-		}
-
-		void set(float _x1, float _y1, float _x2, float _y2, float _x3, float _y3, float _x4, float _y4, float _z, float _u1, float _v1, float _u2, float _v2, uint32 _colour)
-		{
-			vertex[CornerLT].set(_x1, _y1, _z, _u1, _v1, _colour);
-			vertex[CornerRT].set(_x2, _y2, _z, _u2, _v1, _colour);
-			vertex[CornerLB].set(_x4, _y4, _z, _u1, _v2, _colour);
-			vertex[CornerRB].set(_x3, _y3, _z, _u2, _v2, _colour);
-			vertex[CornerRT2] = vertex[CornerRT];
-			vertex[CornerLB2] = vertex[CornerLB];
-		}
-
-		Vertex vertex[6];
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_VERTEX_DATA_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Widget.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Widget.h
deleted file mode 100644
index 5679bc382f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Widget.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_WIDGET_H__
-#define __MYGUI_WIDGET_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Any.h"
-#include "MyGUI_ICroppedRectangle.h"
-#include "MyGUI_ISubWidgetRect.h"
-#include "MyGUI_ISubWidgetText.h"
-#include "MyGUI_LayerItem.h"
-#include "MyGUI_WidgetUserData.h"
-#include "MyGUI_WidgetEvent.h"
-#include "MyGUI_IWidgetCreator.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_IObject.h"
-
-namespace MyGUI
-{
-
-	class MYGUI_EXPORT Widget :
-		public IObject,
-		public ICroppedRectangle,
-		public LayerItem,
-		public UserData,
-		public WidgetEvent,
-		public IWidgetCreator,
-		public delegates::IDelegateUnlink
-	{
-		// для вызова закрытых деструкторов
-		friend class IWidgetCreator;
-
-		MYGUI_RTTI_BASE( Widget )
-
-	public:
-		Widget();
-
-		/** Create child widget
-			@param _type widget type
-			@param _skin widget skin
-			@param _coord int coordinates of widget (_left, _top, _width, _height)
-			@param _align widget align (possible values can be found in enum Align)
-			@param _name if needed (you can use it for finding widget by name later)
-		*/
-		Widget* createWidgetT(const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _name = "");
-
-		/** See Widget::createWidgetT(const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _name = "") */
-		Widget* createWidgetT(const std::string& _type, const std::string& _skin, int _left, int _top, int _width, int _height, Align _align, const std::string& _name = "");
-
-		/** Create widget using coordinates relative to parent. see Widget::createWidgetT(const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _name = "") */
-		Widget* createWidgetRealT(const std::string& _type, const std::string& _skin, const FloatCoord& _coord, Align _align, const std::string& _name = "");
-
-		/** Create widget using coordinates relative to parent. see Widget::createWidgetT(const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _name = "") */
-		Widget* createWidgetRealT(const std::string& _type, const std::string& _skin, float _left, float _top, float _width, float _height, Align _align, const std::string& _name = "");
-
-		// templates for creating widgets by type
-		/** Same as Widget::createWidgetT but return T pointer instead of Widget* */
-		template <typename T>
-		T* createWidget(const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _name = "")
-		{
-			return static_cast<T*>(createWidgetT(T::getClassTypeName(), _skin, _coord, _align, _name));
-		}
-
-		/** Same as Widget::createWidgetT but return T pointer instead of Widget* */
-		template <typename T>
-		T* createWidget(const std::string& _skin, int _left, int _top, int _width, int _height, Align _align, const std::string& _name = "")
-		{
-			return static_cast<T*>(createWidgetT(T::getClassTypeName(), _skin, IntCoord(_left, _top, _width, _height), _align, _name));
-		}
-
-		/** Same as Widget::createWidgetRealT but return T* instead of Widget* */
-		template <typename T>
-		T* createWidgetReal(const std::string& _skin, const FloatCoord& _coord, Align _align, const std::string& _name = "")
-		{
-			return static_cast<T*>(createWidgetRealT(T::getClassTypeName(), _skin, _coord, _align, _name));
-		}
-
-		/** Same as Widget::createWidgetRealT but return T* instead of Widget* */
-		template <typename T>
-		T* createWidgetReal(const std::string& _skin, float _left, float _top, float _width, float _height, Align _align, const std::string& _name = "")
-		{
-			return static_cast<T*>(createWidgetRealT(T::getClassTypeName(), _skin, _left, _top, _width, _height, _align, _name));
-		}
-
-		/** Create child widget
-			@param _style Child, Popup or Overlapped widget style
-			@param _type widget type
-			@param _skin widget skin
-			@param _coord int coordinates of widget (_left, _top, _width, _height)
-			@param _align widget align (possible values can be found in enum Align)
-			@param _name if needed (you can use it for finding widget by name later)
-		*/
-		Widget* createWidgetT(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer = "", const std::string& _name = "");
-
-		/** Same as Widget::createWidgetT but return T* instead of Widget* */
-		template <typename T>
-		T* createWidget(WidgetStyle _style, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer = "", const std::string& _name = "")
-		{
-			return static_cast<T*>(createWidgetT(_style, T::getClassTypeName(), _skin, _coord, _align, _layer, _name));
-		}
-
-		//! Get name of widget
-		const std::string& getName() const { return mName; }
-
-
-		/** Set widget position (position of left top corner) */
-		virtual void setPosition(const IntPoint& _value);
-		/** Set widget size */
-		virtual void setSize(const IntSize& _value);
-		/** Set widget position and size */
-		virtual void setCoord(const IntCoord& _value);
-
-		/** See Widget::setPosition(const IntPoint& _pos) */
-		void setPosition(int _left, int _top) { setPosition(IntPoint(_left, _top)); }
-		/** See Widget::setSize(const IntSize& _size) */
-		void setSize(int _width, int _height) { setSize(IntSize(_width, _height)); }
-		/** See Widget::setCoord(const IntCoord& _coord) */
-		void setCoord(int _left, int _top, int _width, int _height) { setCoord(IntCoord(_left, _top, _width, _height)); }
-
-		/** Set widget position (position of left top corner)*/
-		void setRealPosition(const FloatPoint& _value);
-		/** Set widget size */
-		void setRealSize(const FloatSize& _value);
-		/** Set widget position and size*/
-		void setRealCoord(const FloatCoord& _value);
-
-		/** See Widget::setRealPosition(const FloatPoint& _point) */
-		void setRealPosition(float _left, float _top) { setRealPosition(FloatPoint(_left, _top)); }
-		/** See Widget::setRealSize(const FloatSize& _size) */
-		void setRealSize(float _width, float _height) { setRealSize(FloatSize(_width, _height)); }
-		/** See Widget::setRealPosition(const FloatCoord& _coord) */
-		void setRealCoord(float _left, float _top, float _width, float _height) { setRealCoord(FloatCoord(_left, _top, _width, _height)); }
-
-		/** Hide or show widget */
-		virtual void setVisible(bool _value);
-
-		/** Set align */
-		virtual void setAlign(Align _value);
-
-		/** Set widget caption */
-		virtual void setCaption(const UString& _value);
-		/** Get widget caption */
-		virtual const UString& getCaption();
-
-		/** Set widget opacity */
-		void setAlpha(float _value);
-		/** Get widget opacity */
-		float getAlpha() { return mAlpha; }
-
-		/** Enable or disable inherits alpha mode */
-		void setInheritsAlpha(bool _value);
-		/** Get inherits alpha mode flag */
-		bool isInheritsAlpha() { return mInheritsAlpha; }
-
-		/** Set widget's state */
-		bool setState(const std::string& _value);
-
-		void setColour(const Colour& _value);
-
-		// являемся ли мы рутовым виджетом
-		/** Is this widget is root widget (root == without parents) */
-		bool isRootWidget() { return nullptr == mCroppedParent; }
-
-		/** Get parent widget or nullptr if no parent */
-		Widget* getParent() { return mParent; }
-
-		/** Get child widgets Enumerator */
-		EnumeratorWidgetPtr getEnumerator();
-
-		/** Get child count */
-		size_t getChildCount();
-
-		/** Get child by index (index from 0 to child_count - 1) */
-		Widget* getChildAt(size_t _index);
-
-		/** Find widget by name (search recursively through all childs starting from this widget) */
-		Widget* findWidget(const std::string& _name);
-
-		/** Set need key focus flag */
-		void setNeedKeyFocus(bool _value) { mNeedKeyFocus = _value; }
-		/** Is need key focus
-			If disable this widget won't be reacting on keyboard at all.\n
-			Enabled (true) by default.
-		*/
-		bool isNeedKeyFocus() { return mNeedKeyFocus; }
-
-		/** Set need mouse focus flag */
-		void setNeedMouseFocus(bool _value) { mNeedMouseFocus = _value; }
-		/** Is need mouse focus
-			If disable this widget won't be reacting on mouse at all.\n
-			Enabled (true) by default.
-		*/
-		bool isNeedMouseFocus() { return mNeedMouseFocus; }
-
-		/** Set inherits mode flag
-			This mode makes all child widgets pickable even if widget don't
-			need mouse focus (was set setNeedKeyFocus(false) ).\n
-			Disabled (false) by default.
-		*/
-		void setInheritsPick(bool _value) { mInheritsPick = _value; }
-		/** Get inherits mode flag */
-		bool isInheritsPick() { return mInheritsPick; }
-
-		/** Set picking mask for widget */
-		void setMaskPick(const std::string& _filename);
-
-		/** Enable or disable widget */
-		virtual void setEnabled(bool _value);
-		/** Enable or disable widget without changing widget's state */
-		void setEnabledSilent(bool _value) { mEnabled = _value; }
-		/** Is widget enabled */
-		bool isEnabled() { return mEnabled; }
-
-		/** Set mouse pointer for this widget */
-		void setPointer(const std::string& _value) { mPointer = _value; }
-		/** Get mouse pointer name for this widget */
-		const std::string& getPointer();
-
-		/** Get widget's layer, return "" if widget is not root widget (root == without parents) */
-		const std::string& getLayerName();
-
-		/** Get rect where child widgets placed */
-		IntCoord getClientCoord();
-
-		/** Get clien area widget or nullptr if widget don't have client */
-		Widget* getClientWidget() { return mWidgetClient; }
-
-		/** Get text sub widget or nullptr if no text sub widget */
-		ISubWidgetText * getSubWidgetText() { return mText; }
-		/** Get sub widget of first texture or nullptr if no sub widget with texture */
-		ISubWidgetRect * getSubWidgetMain() { return mMainSkin; }
-
-		/** Set need tool tip mode flag. Enable this if you need tool tip events for widget */
-		void setNeedToolTip(bool _value);
-		/** Get need tool tip mode flag */
-		bool getNeedToolTip() { return mNeedToolTip; }
-
-		/** Enable or disable tooltip event */
-		void setEnableToolTip(bool _value);
-		/** Get tool tip enabled flag */
-		bool getEnableToolTip() { return mEnableToolTip; }
-
-		/** Detach widget from widgets hierarchy
-			@param _layer Attach to specified layer (if any)
-		*/
-		void detachFromWidget(const std::string& _layer = "");
-
-		/** Attach widget to parent
-			@param _style Child widget type
-			@param _layer Attach to specified layer (if any)
-			@note you might also need to call void Widget::setWidgetStyle(WidgetStyle _style);
-				to set widget style (widget attached with MyGUI::WidgetStyle::Popup by default)
-		*/
-		void attachToWidget(Widget* _parent, WidgetStyle _style = WidgetStyle::Child, const std::string& _layer = "");
-
-		/** Change widget skin */
-		void changeWidgetSkin(const std::string& _skinname);
-
-		/** Set widget style.
-			@param _layer Attach to specified layer (if any)
-			@note When choosing WidgetStyle::Popup style you also need attach widget to layer
-			see LayerManager::attachToLayerNode
-		*/
-		void setWidgetStyle(WidgetStyle _style, const std::string& _layer = "");
-		/** Get widget style */
-		WidgetStyle getWidgetStyle() { return mWidgetStyle; }
-
-		/** Set any widget property
-			@param _key Property name (for example Widget_Alpha or Edit_MultiLine)
-			@param _value Value converted to string
-		*/
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-
-	/*internal:*/
-		// метод для запроса номера айтема и контейнера
-		virtual void _getContainer(Widget*& _container, size_t& _index);
-
-		// дает приоритет виджету при пиккинге
-		void _forcePeek(Widget* _widget);
-
-		void _setUVSet(const FloatRect& _rect);
-
-		virtual void _setTextureName(const std::string& _texture);
-		virtual const std::string& _getTextureName();
-
-		IWidgetCreator * _getIWidgetCreator() { return mIWidgetCreator; }
-
-		IntCoord _getTextRegion();
-		IntSize _getTextSize();
-		void _setFontName(const std::string& _font);
-		const std::string& _getFontName();
-		void _setFontHeight(int _height);
-		int _getFontHeight();
-		void _setTextAlign(Align _align);
-		Align _getTextAlign();
-		void _setTextColour(const Colour& _colour);
-		const Colour& _getTextColour();
-
-		// устанавливает строку заменив /n на реальный перенос
-		void setCaptionWithNewLine(const std::string& _value);
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void Widget::setCoord(const IntCoord& _coord)")
-		void setPosition(const IntCoord& _coord) { setCoord(_coord); }
-		MYGUI_OBSOLETE("use : void Widget::setCoord(int _left, int _top, int _width, int _height)")
-		void setPosition(int _left, int _top, int _width, int _height) { setCoord(_left, _top, _width, _height); }
-
-		MYGUI_OBSOLETE("use : void Widget::setEnableToolTip")
-		void enableToolTip(bool _enable) { setEnableToolTip(_enable); }
-
-		MYGUI_OBSOLETE("use : void setInheritsPick(bool _inherits)")
-		void setInheritsPeek(bool _inherits) { setInheritsPick(_inherits); }
-		MYGUI_OBSOLETE("use : bool isInheritsPick()")
-		bool isInheritsPeek() { return isInheritsPick(); }
-
-		MYGUI_OBSOLETE("use : void setMaskPick(const std::string& _filename)")
-		void setMaskPeek(const std::string& _filename) { setMaskPick(_filename); }
-
-		MYGUI_OBSOLETE("use : const IntCoord& StaticText::getTextRegion()")
-		IntCoord getTextCoord() { return _getTextRegion(); }
-		MYGUI_OBSOLETE("use : IntSize StaticText::getTextSize()")
-		IntSize getTextSize() { return _getTextSize(); }
-
-		MYGUI_OBSOLETE("use : void StaticText::setFontName(const std::string& _font)")
-		void setFontName(const std::string& _font) { _setFontName(_font); }
-		MYGUI_OBSOLETE("use : const std::string& StaticText::getFontName()")
-		const std::string& getFontName() { return _getFontName(); }
-
-		MYGUI_OBSOLETE("use : void StaticText::setFontHeight(int _height)")
-		void setFontHeight(int _height) { _setFontHeight(_height); }
-		MYGUI_OBSOLETE("use : int StaticText::getFontHeight()")
-		int getFontHeight() { return _getFontHeight(); }
-
-		MYGUI_OBSOLETE("use : void StaticText::setTextAlign(Align _align)")
-		void setTextAlign(Align _align) { _setTextAlign(_align); }
-		MYGUI_OBSOLETE("use : Align StaticText::getTextAlign()")
-		Align getTextAlign() { return _getTextAlign(); }
-
-		MYGUI_OBSOLETE("use : void StaticText::setTextColour(const Colour& _colour)")
-		void setTextColour(const Colour& _colour) { _setTextColour(_colour); }
-		MYGUI_OBSOLETE("use : const Colour& StaticText::getTextColour()")
-		const Colour& getTextColour() { return _getTextColour(); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	protected:
-		// все создание только через фабрику
-		Widget(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-		virtual ~Widget();
-
-		virtual void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		void _updateView(); // обновления себя и детей
-
-		void _setAlign(const IntSize& _oldsize, bool _update);
-		void _setAlign(const IntCoord& _oldcoord, bool _update);
-
-		// создает виджет
-		virtual Widget* baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name);
-
-		// удяляет неудачника
-		virtual void _destroyChildWidget(Widget* _widget);
-
-		// удаляет всех детей
-		virtual void _destroyAllChildWidget();
-
-		// запрашиваем у конейтера айтем по позиции мыши
-		virtual size_t _getContainerIndex(const IntPoint& _point) { return ITEM_NONE; }
-
-		// сброс всех данных контейнера, тултипы и все остальное
-		virtual void _resetContainer(bool _update);
-
-		virtual void baseUpdateEnable();
-
-		// наследуемся он LayerInfo
-		virtual ILayerItem * getLayerItemByPoint(int _left, int _top);
-		virtual const IntCoord& getLayerItemCoord() { return mCoord; }
-
-	private:
-
-		void frameEntered(float _frame);
-
-		void initialiseWidgetSkin(ResourceSkin* _info, const IntSize& _size);
-		void shutdownWidgetSkin(bool _deep = false);
-
-		void _updateAlpha();
-		void _updateAbsolutePoint();
-
-		// для внутреннего использования
-		void _setInheritsVisible(bool _value);
-		bool _isInheritsVisible() { return mInheritsVisible; }
-
-		void _setInheritsEnable(bool _value);
-		bool _isInheritsEnable() { return mInheritsEnabled; }
-
-		// показывает скрывает все сабскины
-		void _setSubSkinVisible(bool _visible);
-
-		float _getRealAlpha() { return mRealAlpha; }
-
-		// добавляет в список виджет
-		virtual void _linkChildWidget(Widget* _widget);
-		// удаляет из списка
-		virtual void _unlinkChildWidget(Widget* _widget);
-
-	protected:
-		// список всех стейтов
-		MapWidgetStateInfo mStateInfo;
-		// информация о маске для пикинга
-		MaskPickInfo const * mMaskPickInfo;
-		MaskPickInfo mOwnMaskPickInfo;
-
-		// вектор всех детей виджетов
-		VectorWidgetPtr mWidgetChild;
-		// вектор детей скина
-		VectorWidgetPtr mWidgetChildSkin;
-		// вектор всех детей сабскинов
-		VectorSubWidget mSubSkinChild;
-
-		// указатель на окно текста
-		ISubWidgetText * mText;
-		// указатель на первый не текстовой сабскин
-		ISubWidgetRect * mMainSkin;
-
-		// доступен ли на виджет
-		bool mEnabled;
-		bool mInheritsEnabled;
-		// скрыты ли все сабскины при выходе за границу
-		bool mSubSkinsVisible;
-		// для иерархического скрытия
-		bool mInheritsVisible;
-		// прозрачность и флаг наследования альфы нашего оверлея
-		float mAlpha;
-		float mRealAlpha;
-		bool mInheritsAlpha;
-		// имя виджета
-		std::string mName;
-		// курсор который будет показан при наведении
-		std::string mPointer;
-		std::string mTextureName;
-		ITexture* mTexture;
-
-		// наш отец в иерархии виджетов
-		Widget* mParent;
-
-		// это тот кто нас создал, и кто нас будет удалять
-		IWidgetCreator * mIWidgetCreator;
-
-		// нужен ли виджету ввод с клавы
-		bool mNeedKeyFocus;
-		// нужен ли виджету фокус мыши
-		bool mNeedMouseFocus;
-		bool mInheritsPick;
-
-		// клиентская зона окна
-		// если виджет имеет пользовательские окна не в себе
-		// то обязательно проинициализировать Client
-		Widget* mWidgetClient;
-
-		bool mNeedToolTip;
-		bool mEnableToolTip;
-		bool mToolTipVisible;
-		float mToolTipCurrentTime;
-		IntPoint mToolTipOldPoint;
-		size_t mToolTipOldIndex;
-		IntPoint m_oldMousePoint;
-
-		// поведение виджета, перекрывающийся дочерний или всплывающий
-		WidgetStyle mWidgetStyle;
-
-		FloatCoord mRelativeCoord;
-		bool mDisableUpdateRelative;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_WIDGET_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetDefines.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetDefines.h
deleted file mode 100644
index 98aa9414d6..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetDefines.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_WIDGET_DEFINES_H__
-#define __MYGUI_WIDGET_DEFINES_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Enumerator.h"
-#include <vector>
-#include <map>
-
-namespace MyGUI
-{
-
-	class Widget;
-	typedef std::vector<Widget*> VectorWidgetPtr;
-	typedef std::map<std::string, Widget*> MapWidgetPtr;
-	typedef Enumerator<VectorWidgetPtr> EnumeratorWidgetPtr;
-
-} // namespace MyGUI
-
-#endif // __MYGUI_WIDGET_DEFINES_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetEvent.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetEvent.h
deleted file mode 100644
index 0b0a4c15b7..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetEvent.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_WIDGET_EVENT_H__
-#define __MYGUI_WIDGET_EVENT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Macros.h"
-#include "MyGUI_WidgetDefines.h"
-#include "MyGUI_WidgetToolTip.h"
-#include "MyGUI_InputDefine.h"
-
-namespace MyGUI
-{
-
-	// делегаты для событий виджета
-	typedef delegates::CDelegate1<Widget*> EventHandle_WidgetVoid;
-	typedef delegates::CDelegate2<Widget*, Widget*> EventHandle_WidgetWidget;
-	typedef delegates::CDelegate2<Widget*, bool> EventHandle_WidgetBool;
-	typedef delegates::CDelegate2<Widget*, int> EventHandle_WidgetInt;
-	typedef delegates::CDelegate2<Widget*, size_t> EventHandle_WidgetSizeT;
-	typedef delegates::CDelegate3<Widget*, int, int> EventHandle_WidgetIntInt;
-	typedef delegates::CDelegate4<Widget*, int, int, MouseButton> EventHandle_WidgetIntIntButton;
-	typedef delegates::CDelegate2<Widget*, KeyCode> EventHandle_WidgetKeyCode;
-	typedef delegates::CDelegate3<Widget*, KeyCode, Char> EventHandle_WidgetKeyCodeChar;
-	typedef delegates::CDelegate3<Widget*, const std::string&, const std::string&> EventHandle_WidgetStringString;
-	typedef delegates::CDelegate3<Widget*, Widget*&, size_t &> EventHandle_WidgetRefWidgetRefSizeT;
-	typedef delegates::CDelegate2<Widget*, const ToolTipInfo& > EventHandle_WidgetToolTip;
-
-	/**
-	General information about creating delegate for event :
-	@example "Delegate usage"
-	@code
-		void anyFunc(...) { } // global function
-
-		class AnyClass
-		{
-		public:
-			static void anyStaticMethod(...) { } // static class method
-			void anyMethod(...) { } // class method
-		};
-
-		AnyClass anyObject; // class instance
-	@endcode
-
-	delegate creating:
-	@code
-		eventAny = MyGUI::newDelegate(anyFunc);
-		eventAny = MyGUI::newDelegate(AnyClass::anyStaticMethod);
-		eventAny = MyGUI::newDelegate(&anyObject, &AnyClass::anyMethod);
-	@endcode
-	*/
-
-	class MYGUI_EXPORT WidgetEvent
-	{
-		friend class InputManager;
-
-    public:
-		virtual ~WidgetEvent() { }
-
-	protected:
-		WidgetEvent() :
-			mWidgetEventSender(0),
-			mRootMouseActive(false),
-			mRootKeyActive(false)
-		{
-		}
-
-	public:
-
-		/** Event : Widget lost mouse focus.\n
-			signature : void method(MyGUI::Widget* _sender, MyGUI::Widget* _new)\n
-			@param _sender widget that called this event
-			@param _new widget with mouse focus or nullptr
-		*/
-		EventHandle_WidgetWidget eventMouseLostFocus;
-
-		/** Event : Widget got mouse focus.\n
-			signature : void method(MyGUI::Widget* _sender, MyGUI::Widget* _old)\n
-			@param _sender widget that called this event
-			@param _old widget with mouse focus or nullptr
-		*/
-		EventHandle_WidgetWidget eventMouseSetFocus;
-
-		/** Event : Widget mouse move with captured widget.\n
-			signature : void method(MyGUI::Widget* _sender, int _left, int _top)\n
-			@param _sender widget that called this event
-			@param _left - pointer position
-			@param _top - pointer position
-		*/
-		EventHandle_WidgetIntInt eventMouseDrag;
-
-		/** Event : Mouse move over widget.\n
-			signature : void method(MyGUI::Widget* _sender, int _left, int _top)\n
-			@param _sender widget that called this event
-			@param _left - pointer position
-			@param _top - pointer position
-		*/
-		EventHandle_WidgetIntInt eventMouseMove;
-
-		/** Event : Mouse wheel over widget.\n
-			signature : void method(MyGUI::Widget* _sender, int _rel)\n
-			@param _sender widget that called this event
-			@param _rel relative wheel position
-		*/
-		EventHandle_WidgetInt eventMouseWheel;
-
-		/** Event : Mouse button pressed.\n
-			signature : void method(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)\n
-			@param _sender widget that called this event
-			@param _left - pointer position
-			@param _top - pointer position
-			@param _id Mouse button id
-		*/
-		EventHandle_WidgetIntIntButton eventMouseButtonPressed;
-
-		/** Event : Mouse button released.\n
-			signature : void method(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)\n
-			@param _sender widget that called this event
-			@param _left - pointer position
-			@param _top - pointer position
-			@param _id Mouse button id
-		*/
-		EventHandle_WidgetIntIntButton eventMouseButtonReleased;
-
-		/** Event : Mouse button pressed and released.\n
-			signature : void method(MyGUI::Widget* _sender)
-			@param _sender widget that called this event
-		*/
-		EventHandle_WidgetVoid eventMouseButtonClick;
-
-		/** Event : Mouse button double click.\n
-			signature : void method(MyGUI::Widget* _sender)
-			@param _sender widget that called this event
-		*/
-		EventHandle_WidgetVoid eventMouseButtonDoubleClick;
-
-		/** Event : Widget lost keyboard focus.\n
-			signature : void method(MyGUI::Widget* _sender, MyGUI::Widget* _new)\n
-			@param _sender widget that called this event
-			@param _new widget with keyboard focus or nullptr
-		*/
-		EventHandle_WidgetWidget eventKeyLostFocus;
-
-		/** Event : Widget got keyboard focus.\n
-			signature : void method(MyGUI::Widget* _sender, MyGUI::Widget* _old)\n
-			@param _sender widget that called this event
-			@param _old widget with keyboard focus or nullptr
-		*/
-		EventHandle_WidgetWidget eventKeySetFocus;
-
-		/** Event : Key pressed.\n
-			signature : void method(MyGUI::Widget* _sender, MyGUI::KeyCode _key, MyGUI::Char _char)\n
-			@param _sender widget that called this event
-			@param _key code
-			@param _char of pressed symbol (for multilanguage applications)
-		*/
-		EventHandle_WidgetKeyCodeChar eventKeyButtonPressed;
-
-		/** Event : Key released.\n
-			signature : void method(MyGUI::Widget* _sender, MyGUI::KeyCode _key)\n
-			@param _sender widget that called this event
-			@param _key code
-		*/
-		EventHandle_WidgetKeyCode eventKeyButtonReleased;
-
-		/** Event : Root widget changed mouse focus.\n
-			info : this event sends only to root widget\n
-			signature : void method(MyGUI::Widget* _sender, bool _focus);
-			@param _sender widget that called this event
-			@param _focus Is widget got mouse focus.
-		*/
-		EventHandle_WidgetBool  eventRootMouseChangeFocus;
-
-		/** Event : Root widget changed keyboard focus.\n
-			info : this event sends only to root widget\n
-			signature : void method(MyGUI::Widget* _sender, bool _focus);
-			@param _sender widget that called this event
-			@param _focus Is widget got keyboard focus.
-		*/
-		EventHandle_WidgetBool eventRootKeyChangeFocus;
-
-		/** Event : Event about changing tooltip state.\n
-			signature : void method(MyGUI::Widget* _sender, const MyGUI::ToolTipInfo& _info);
-			@param _sender widget that called this event
-			@param _info about tooltip
-		*/
-		EventHandle_WidgetToolTip eventToolTip;
-
-		/** Event : Extendeble event for special cases or plugins.\n
-			signature : void method(MyGUI::Widget* _sender, const std::string& _key, const std::string& _value);
-			@param _sender widget that called this event
-			@param _key
-			@param _value
-		*/
-		EventHandle_WidgetStringString eventActionInfo;
-
-		/** Event : Internal request for parent and item index, used for any widget.\n
-			signature : void method(MyGUI::Widget* _sender, MyGUI::Widget*& _container, size_t& _index);
-			@param _sender widget that called this event
-			@param _container parent
-			@param _index of container
-		*/
-		EventHandle_WidgetRefWidgetRefSizeT _requestGetContainer;
-
-		/** Event : Widget property changed through setProperty (in code, or from layout)\n
-			signature : void method(MyGUI::Widget* _sender, const std::string& _key, const std::string& _value);
-			@param _sender widget that called this event
-			@param _key
-			@param _value
-		*/
-		EventHandle_WidgetStringString eventChangeProperty;
-
-	protected:
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onMouseLostFocus(Widget* _new)
-		{
-			eventMouseLostFocus(mWidgetEventSender, _new);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onMouseSetFocus(Widget* _old)
-		{
-			eventMouseSetFocus(mWidgetEventSender, _old);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onMouseDrag(int _left, int _top)
-		{
-			eventMouseDrag(mWidgetEventSender, _left, _top);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onMouseMove(int _left, int _top)
-		{
-			eventMouseMove(mWidgetEventSender, _left, _top);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onMouseWheel(int _rel)
-		{
-			eventMouseWheel(mWidgetEventSender, _rel);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onMouseButtonPressed(int _left, int _top, MouseButton _id)
-		{
-			eventMouseButtonPressed(mWidgetEventSender, _left, _top, _id);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onMouseButtonReleased(int _left, int _top, MouseButton _id)
-		{
-			eventMouseButtonReleased(mWidgetEventSender, _left, _top, _id);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onMouseButtonClick()
-		{
-			eventMouseButtonClick(mWidgetEventSender);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onMouseButtonDoubleClick()
-		{
-			eventMouseButtonDoubleClick(mWidgetEventSender);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onKeyLostFocus(Widget* _new)
-		{
-			eventKeyLostFocus(mWidgetEventSender, _new);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onKeySetFocus(Widget* _old)
-		{
-			eventKeySetFocus(mWidgetEventSender, _old);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onKeyButtonPressed(KeyCode _key, Char _char)
-		{
-			eventKeyButtonPressed(mWidgetEventSender, _key, _char);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onKeyButtonReleased(KeyCode _key)
-		{
-			eventKeyButtonReleased(mWidgetEventSender, _key);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onMouseChangeRootFocus(bool _focus)
-		{
-			eventRootMouseChangeFocus(mWidgetEventSender, _focus);
-		}
-
-		// !!! ОБЯЗАТЕЛЬНО в родительском классе вызывать последним
-		virtual void onKeyChangeRootFocus(bool _focus)
-		{
-			eventRootKeyChangeFocus(mWidgetEventSender, _focus);
-		}
-
-		// от чьего имени мы посылаем сообщения
-		Widget* mWidgetEventSender;
-
-	private:
-		bool mRootMouseActive;
-		bool mRootKeyActive;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_WIDGET_EVENT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetManager.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetManager.h
deleted file mode 100644
index dad77b7bb6..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetManager.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_WIDGET_MANAGER_H__
-#define __MYGUI_WIDGET_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_IWidgetCreator.h"
-#include "MyGUI_IUnlinkWidget.h"
-#include "MyGUI_ICroppedRectangle.h"
-#include "MyGUI_Widget.h"
-#include <set>
-
-namespace MyGUI
-{
-
-	//OBSOLETE
-	typedef delegates::CDelegate3<Widget*,  const std::string &, const std::string &> ParseDelegate;
-
-	class MYGUI_EXPORT WidgetManager
-	{
-		MYGUI_INSTANCE_HEADER( WidgetManager )
-
-	public:
-		//OBSOLETE
-		typedef std::map<std::string, ParseDelegate> MapDelegate;
-		//OBSOLETE
-		typedef std::set<IWidgetFactory*> SetWidgetFactory;
-
-	public:
-		void initialise();
-		void shutdown();
-
-		Widget* createWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, Widget* _parent, ICroppedRectangle * _cropeedParent, IWidgetCreator * _creator, const std::string& _name);
-
-		/** Destroy _widget */
-		void destroyWidget(Widget* _widget);
-		/** Destroy vector of widgets */
-		void destroyWidgets(const VectorWidgetPtr &_widgets);
-		/** Destroy Enumerator of widgets */
-		void destroyWidgets(EnumeratorWidgetPtr _widgets);
-
-		/** Register unlinker (call unlink if for any destroyed widget)*/
-		void registerUnlinker(IUnlinkWidget * _unlink);
-		/** Unregister unlinker (call unlink if for any destroyed widget)*/
-		void unregisterUnlinker(IUnlinkWidget * _unlink);
-		/** Unlink widget */
-		void unlinkFromUnlinkers(Widget* _widget);
-
-		// добавляет виджет в список для анлинка
-		void addWidgetToUnlink(Widget* _widget);
-
-		// проверяет, и если надо обнуляет виджет из списка анликнутых
-		void removeWidgetFromUnlink(Widget*& _widget);
-
-		bool isFactoryExist(const std::string& _type);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void WidgetManager::destroyWidgets(VectorWidgetPtr &_widgets)")
-		void destroyWidgetsVector(VectorWidgetPtr &_widgets) { destroyWidgets(_widgets); }
-		MYGUI_OBSOLETE("")
-		Widget* findWidgetT(const std::string& _name, bool _throw = true);
-		MYGUI_OBSOLETE("")
-		Widget* findWidgetT(const std::string& _name, const std::string& _prefix, bool _throw = true);
-		MYGUI_OBSOLETE("")
-		void registerFactory(IWidgetFactory * _factory);
-		MYGUI_OBSOLETE("")
-		void unregisterFactory(IWidgetFactory * _factory);
-		MYGUI_OBSOLETE("use : void Widget::setProperty(const std::string &_key, const std::string &_value)")
-		void parse(Widget* _widget, const std::string &_key, const std::string &_value);
-		MYGUI_OBSOLETE("")
-		ParseDelegate& registerDelegate(const std::string& _key);
-		MYGUI_OBSOLETE("")
-		void unregisterDelegate(const std::string& _key);
-
-		template <typename T>
-		MYGUI_OBSOLETE("")
-		T* findWidget(const std::string& _name, bool _throw = true)
-		{
-			Widget* widget = findWidgetT(_name, _throw);
-			if (nullptr == widget) return nullptr;
-			return widget->castType<T>(_throw);
-		}
-
-		template <typename T>
-		MYGUI_OBSOLETE("")
-		T* findWidget(const std::string& _name, const std::string& _prefix, bool _throw = true)
-		{
-			return findWidget<T>(_prefix + _name, _throw);
-		}
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	protected:
-		SetWidgetFactory mFactoryList;
-		//MapWidgetPtr mWidgets;
-		MapDelegate mDelegates;
-
-		// список менеджеров для отписки при удалении
-		VectorIUnlinkWidget mVectorIUnlinkWidget;
-
-		// список виджетов для отписки
-		VectorWidgetPtr mUnlinkWidgets;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_WIDGET_MANAGER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetStyle.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetStyle.h
deleted file mode 100644
index a0d3998ee5..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetStyle.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_WIDGET_TYPE_H__
-#define __MYGUI_WIDGET_TYPE_H__
-
-#include "MyGUI_Prerequest.h"
-#include <string.h>
-
-namespace MyGUI
-{
-
-	struct MYGUI_EXPORT WidgetStyle
-	{
-		enum Enum
-		{
-			Child, /**< child widget, cropped by parent widget borders, no overlapping (used by default for child widgets) */
-			Popup, /**< popup widget, have parent widget, but not cropped on its borders */
-			Overlapped, /**< child widget, cropped by parent widget borders, can overlap (used by default for root widgets) */
-			MAX
-		};
-
-		static WidgetStyle parse(const std::string& _value)
-		{
-			WidgetStyle type;
-			int value = 0;
-			while (true)
-			{
-				const char * name = type.getValueName(value);
-				if (strcmp(name, "") == 0 || name == _value) break;
-				value++;
-			}
-			type.value = (Enum)value;
-			return type;
-		}
-
-		WidgetStyle() : value(MAX) { }
-		WidgetStyle(Enum _value) : value(_value) { }
-
-		friend bool operator == (WidgetStyle const& a, WidgetStyle const& b) { return a.value == b.value; }
-		friend bool operator != (WidgetStyle const& a, WidgetStyle const& b) { return a.value != b.value; }
-
-		friend std::ostream& operator << ( std::ostream& _stream, const WidgetStyle&  _value )
-		{
-			_stream << _value.getValueName(_value.value);
-			return _stream;
-		}
-
-		friend std::istream& operator >> ( std::istream& _stream, WidgetStyle&  _value )
-		{
-			std::string value;
-			_stream >> value;
-			_value = WidgetStyle::parse(value);
-			return _stream;
-		}
-
-		std::string print() const { return getValueName(value); }
-
-	private:
-		const char * getValueName(int _index) const
-		{
-			static const char * values[MAX + 1] = { "Child", "Popup", "Overlapped", "" };
-			return values[(_index < MAX && _index >= 0) ? _index : MAX];
-		}
-
-	private:
-		Enum value;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_WIDGET_TYPE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetToolTip.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetToolTip.h
deleted file mode 100644
index d2ba7f0518..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetToolTip.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		07/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_WIDGET_TOOLTIP_H__
-#define __MYGUI_WIDGET_TOOLTIP_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include "MyGUI_WidgetToolTip.h"
-
-namespace MyGUI
-{
-
-	/** Info about tootip state */
-	struct ToolTipInfo
-	{
-		enum ToolTipType
-		{
-			Hide,
-			Show
-		};
-
-		ToolTipInfo(ToolTipType _type) :
-			type(_type), index(ITEM_NONE) { }
-
-		ToolTipInfo(ToolTipType _type, size_t _index, const IntPoint& _point) :
-			type(_type), index(_index), point(_point) { }
-
-		ToolTipType type;
-		size_t index;
-		IntPoint point;
-	};
-
-} // namespace MyGUI
-
-#endif //__MYGUI_WIDGET_TOOLTIP_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetTranslate.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetTranslate.h
deleted file mode 100644
index 3fb930a5cd..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetTranslate.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_WIDGET_TRANSLATE_H__
-#define __MYGUI_WIDGET_TRANSLATE_H__
-
-#include "MyGUI_Prerequest.h"
-
-namespace MyGUI
-{
-
-	inline int getWidgetWidth(Widget* _widget, bool _vert)
-	{
-		return _vert ? _widget->getWidth() : _widget->getHeight();
-	}
-
-	inline int getWidgetHeight(Widget* _widget, bool _vert)
-	{
-		return _vert ? _widget->getHeight() : _widget->getWidth();
-	}
-
-	inline int getWidgetLeft(Widget* _widget, bool _vert)
-	{
-		return _vert ? _widget->getLeft() : _widget->getTop();
-	}
-
-	inline int getWidgetTop(Widget* _widget, bool _vert)
-	{
-		return _vert ? _widget->getTop() : _widget->getLeft();
-	}
-
-	inline void setWidgetSize(Widget* _widget, int _width, int _height, bool _vert)
-	{
-		_vert ? _widget->setSize(_width, _height) : _widget->setSize(_height, _width);
-	}
-
-	inline void setWidgetCoord(Widget* _widget, int _left, int _top, int _width, int _height, bool _vert)
-	{
-		_vert ? _widget->setCoord(_left, _top, _width, _height) : _widget->setCoord(_top, _left, _height, _width);
-	}
-
-	inline void convertWidgetCoord(IntCoord& _coord, bool _vert)
-	{
-		if ( ! _vert )
-		{
-			std::swap(_coord.left, _coord.top);
-			std::swap(_coord.width, _coord.height);
-		}
-	}
-
-} // namespace MyGUI
-
-#endif // __MYGUI_WIDGET_TRANSLATE_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetUserData.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetUserData.h
deleted file mode 100644
index fd807d0769..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_WidgetUserData.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_WIDGET_USER_DATA_H__
-#define __MYGUI_WIDGET_USER_DATA_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_WidgetDefines.h"
-#include "MyGUI_Any.h"
-
-namespace MyGUI
-{
-	/** UserData is parent of Widget class. Used to store any user data and strings inside widget */
-	class MYGUI_EXPORT UserData
-	{
-	public:
-		UserData() { }
-		virtual ~UserData() { }
-
-		/** Set user string */
-		void setUserString(const std::string& _key, const std::string& _value)
-		{
-			mMapUserString[_key] = _value;
-		}
-
-		/** Get user string or "" if not found */
-		const std::string& getUserString(const std::string& _key)
-		{
-			MapString::iterator iter = mMapUserString.find(_key);
-			if (iter == mMapUserString.end())
-			{
-				static std::string empty;
-				return empty;
-			}
-			return iter->second;
-		}
-
-		/** Delete user string */
-		bool clearUserString(const std::string& _key)
-		{
-			MapString::iterator iter = mMapUserString.find(_key);
-			if (iter != mMapUserString.end())
-			{
-				mMapUserString.erase(iter);
-				return true;
-			}
-			return false;
-		}
-
-		/** Return true if user string with such key exist */
-		bool isUserString(const std::string& _key)
-		{
-			return mMapUserString.find(_key) != mMapUserString.end();
-		}
-
-		/** Delete all user strings */
-		void clearUserStrings()
-		{
-			mMapUserString.clear();
-		}
-
-		/** Set any user data to store inside widget */
-		void setUserData(Any _data) { mUserData = _data; }
-
-		/** Get user data and cast it to ValueType */
-		template <typename ValueType>
-		ValueType * getUserData(bool _throw = true)
-		{
-			return mUserData.castType<ValueType>(_throw);
-		}
-
-	/*internal:*/
-		void _setInternalData(Any _data) { mInternalData = _data; }
-
-		template <typename ValueType>
-		ValueType * _getInternalData(bool _throw = true)
-		{
-			return mInternalData.castType<ValueType>(_throw);
-		}
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : template <typename ValueType> ValueType * UserData::getUserData(bool _throw)")
-		void * getUserData()
-		{
-			return mUserData.castUnsafe();
-		}
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	private:
-		// пользовательские данные
-		MapString mMapUserString;
-		Any mUserData;
-
-		// для внутренниего использования
-		Any mInternalData;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_WIDGET_USER_DATA_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Window.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Window.h
deleted file mode 100644
index 12f4685d73..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Window.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_WINDOW_H__
-#define __MYGUI_WINDOW_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_EventPair.h"
-#include "MyGUI_ControllerFadeAlpha.h"
-
-namespace MyGUI
-{
-
-	// OBSOLETE
-	typedef delegates::CDelegate2<Widget*, const std::string&> EventHandle_WidgetString;
-	typedef delegates::CDelegate2<Window*, const std::string&> EventHandle_WindowPtrCStringRef;
-	typedef delegates::CDelegate1<Window*> EventHandle_WindowPtr;
-
-	class MYGUI_EXPORT Window :
-		public Widget
-	{
-		MYGUI_RTTI_DERIVED( Window )
-
-	public:
-		Window();
-
-		/** @copydoc Widget::setVisible */
-		virtual void setVisible(bool _value);
-
-		/** Hide or show window smooth */
-		void setVisibleSmooth(bool _value);
-		/** Hide window smooth and then destroy it */
-		void destroySmooth();
-
-		/** Enable or disable auto alpha mode */
-		void setAutoAlpha(bool _value);
-		/** Get auto alpha mode flag */
-		bool getAutoAlpha() { return mIsAutoAlpha; }
-
-		/** Set window caption */
-		virtual void setCaption(const UString& _value);
-		/** Get window caption */
-		virtual const UString& getCaption();
-
-		/** Get window caption widget */
-		Widget* getCaptionWidget() { return mWidgetCaption; }
-
-		/** Set minimal possible window size */
-		void setMinSize(const IntSize& _value);
-		/** Set minimal possible window size */
-		void setMinSize(int _width, int _height) { setMinSize(IntSize(_width, _height)); }
-		/** Get minimal possible window size */
-		IntSize getMinSize();
-
-		/** Set maximal possible window size */
-		void setMaxSize(const IntSize& _value);
-		/** Set maximal possible window size */
-		void setMaxSize(int _width, int _height) { setMaxSize(IntSize(_width, _height)); }
-		/** Get maximal possible window size */
-		IntSize getMaxSize();
-
-		//! @copydoc Widget::setPosition(const IntPoint& _value)
-		virtual void setPosition(const IntPoint& _value);
-		//! @copydoc Widget::setSize(const IntSize& _value)
-		virtual void setSize(const IntSize& _value);
-		//! @copydoc Widget::setCoord(const IntCoord& _value)
-		virtual void setCoord(const IntCoord& _value);
-
-		/** @copydoc Widget::setPosition(int _left, int _top) */
-		void setPosition(int _left, int _top) { setPosition(IntPoint(_left, _top)); }
-		/** @copydoc Widget::setSize(int _width, int _height) */
-		void setSize(int _width, int _height) { setSize(IntSize(_width, _height)); }
-		/** @copydoc Widget::setCoord(int _left, int _top, int _width, int _height) */
-		void setCoord(int _left, int _top, int _width, int _height) { setCoord(IntCoord(_left, _top, _width, _height)); }
-
-		/** Get snap to borders mode flag */
-		bool getSnap() { return mSnap; }
-		/** Enable or disable snap to borders mode */
-		void setSnap(bool _value) { mSnap = _value; }
-
-		/** @copydoc Widget::setProperty(const std::string& _key, const std::string& _value) */
-		virtual void setProperty(const std::string& _key, const std::string& _value);
-
-	/*event:*/
-		/** Event : Window button pressed.\n
-			signature : void method(MyGUI::Window* _sender, const std::string& _name)
-			@param _sender widget that called this event
-			@param _name of pressed button
-		*/
-		EventPair<EventHandle_WidgetString, EventHandle_WindowPtrCStringRef> eventWindowButtonPressed;
-
-		/** Event : Window coordinate changed (window was resized or moved).\n
-			signature : void method(MyGUI::Window* _sender)
-			@param _sender widget that called this event
-		*/
-		EventPair<EventHandle_WidgetVoid, EventHandle_WindowPtr> eventWindowChangeCoord;
-
-	/*internal:*/
-		virtual void _initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name);
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_OBSOLETE("use : void Widget::setCoord(const IntCoord& _coord)")
-		void setPosition(const IntCoord& _coord) { setCoord(_coord); }
-		MYGUI_OBSOLETE("use : void Widget::setCoord(int _left, int _top, int _width, int _height)")
-		void setPosition(int _left, int _top, int _width, int _height) { setCoord(_left, _top, _width, _height); }
-		MYGUI_OBSOLETE("use : void setVisibleSmooth(bool _visible)")
-		void showSmooth(bool _reset = false) { setVisibleSmooth(true); }
-		MYGUI_OBSOLETE("use : void setVisibleSmooth(bool _visible)")
-		void hideSmooth() { setVisibleSmooth(false); }
-		MYGUI_OBSOLETE("use : void setMinSize(const IntSize& _min) , void setMaxSize(const IntSize& _min)")
-		void setMinMax(const IntRect& _minmax) { setMinSize(_minmax.left, _minmax.top); setMaxSize(_minmax.right, _minmax.bottom); }
-		MYGUI_OBSOLETE("use : void setMinSize(const IntSize& _min) , void setMaxSize(const IntSize& _min)")
-		void setMinMax(int _min_w, int _min_h, int _max_w, int _max_h) { setMinSize(_min_w, _min_h); setMaxSize(_max_w, _max_h); }
-		MYGUI_OBSOLETE("use : IntSize getMinSize() , IntSize getMaxSize()")
-		IntRect getMinMax() { return IntRect(getMinSize().width, getMinSize().height, getMaxSize().width, getMaxSize().height); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-	protected:
-		virtual ~Window();
-
-		void baseChangeWidgetSkin(ResourceSkin* _info);
-
-		// переопределяем для присвоению клиенту
-		virtual Widget* baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name);
-
-		void onMouseChangeRootFocus(bool _focus);
-		void onKeyChangeRootFocus(bool _focus);
-		void onMouseDrag(int _left, int _top);
-		void onMouseButtonPressed(int _left, int _top, MouseButton _id);
-
-		void notifyMousePressed(MyGUI::Widget* _sender, int _left, int _top, MouseButton _id);
-		void notifyPressedButtonEvent(MyGUI::Widget* _sender);
-		void notifyMouseDrag(MyGUI::Widget* _sender, int _left, int _top);
-
-		// просто обновляет альфу взависимости от флагов
-		void updateAlpha();
-
-		void animateStop(Widget* _widget);
-
-	private:
-		void initialiseWidgetSkin(ResourceSkin* _info);
-		void shutdownWidgetSkin();
-
-		float getAlphaVisible();
-		void getSnappedCoord(IntCoord& _coord);
-
-		ControllerFadeAlpha* createControllerFadeAlpha(float _alpha, float _coef, bool _enable);
-
-	private:
-		Widget* mWidgetCaption;
-
-		// размеры окна перед началом его изменений
-		IntCoord mPreActionCoord;
-
-		// наши главные фокусы
-		bool mMouseRootFocus;
-		bool mKeyRootFocus;
-
-		// автоматическое или ручное управление альфой
-		bool mIsAutoAlpha;
-
-		// минимальные и максимальные размеры окна
-		IntRect mMinmax;
-
-		bool mSnap; // прилеплять ли к краям
-
-		IntCoord mCurrentActionScale;
-		bool mAnimateSmooth;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_WINDOW_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_XmlDocument.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_XmlDocument.h
deleted file mode 100644
index fbcdba7886..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_XmlDocument.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_XML_DOCUMENT_H__
-#define __MYGUI_XML_DOCUMENT_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_UString.h"
-#include "MyGUI_Diagnostic.h"
-#include "MyGUI_DataStream.h"
-
-#include <vector>
-#include <string>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <assert.h>
-
-namespace MyGUI
-{
-	namespace xml
-	{
-
-		struct ElementType
-		{
-			enum Enum
-			{
-				Comment,
-				Declaration,
-				Normal,
-				MAX
-			};
-
-			ElementType(Enum _value = MAX) : value(_value) { }
-			friend bool operator == (ElementType const& a, ElementType const& b) { return a.value == b.value; }
-			friend bool operator != (ElementType const& a, ElementType const& b) { return a.value != b.value; }
-
-		private:
-			Enum value;
-		};
-
-		struct ErrorType
-		{
-			enum Enum
-			{
-				OpenFileFail,
-				CreateFileFail,
-				IncorrectContent,
-				NotClosedElements,
-				NoXMLDeclaration,
-				CloseNotOpenedElement,
-				InconsistentOpenCloseElements,
-				MoreThanOneXMLDeclaration,
-				MoreThanOneRootElement,
-				IncorrectAttribute,
-				MAX
-			};
-
-			ErrorType(Enum _value = MAX) : value(_value) { }
-
-			std::string print() const { return getValueName(value); }
-
-		private:
-			const char * getValueName(int _index) const
-			{
-				static const char * values[MAX + 1] =
-				{
-					"Failed to open XML file",
-					"Failed to ceate XML file",
-					"XML file contain incorrect content",
-					"XML file contain not closed elements",
-					"XML file without declaration",
-					"XML file contain closed but not opened element",
-					"XML file contain inconsistent elements",
-					"XML file contain more than one declaration",
-					"XML file contain more than one root element",
-					"XML file contain incorrect attribute",
-					""
-				};
-				return values[(_index < MAX && _index >= 0) ? _index : MAX];
-			}
-		private:
-			Enum value;
-		};
-
-		class Element;
-		class Document;
-
-		typedef Element * ElementPtr;
-		typedef std::pair<std::string, std::string> PairAttribute;
-		typedef std::vector<PairAttribute> VectorAttributes;
-		typedef std::vector<ElementPtr> VectorElement;
-
-		//----------------------------------------------------------------------//
-		// class ElementEnumerator
-		//----------------------------------------------------------------------//
-		class MYGUI_EXPORT ElementEnumerator
-		{
-			friend class Element;
-
-		private:
-			ElementEnumerator(VectorElement::iterator _begin, VectorElement::iterator _end);
-
-		public:
-			bool next();
-			bool next(const std::string& _name);
-
-			ElementPtr operator->() const { assert(m_current != m_end); return (*m_current); }
-			ElementPtr current() { assert(m_current != m_end); return (*m_current); }
-
-	/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-			MYGUI_OBSOLETE("use : bool ElementEnumerator::next()")
-			bool nextNode() { return next(); }
-			MYGUI_OBSOLETE("use : bool ElementEnumerator::next(const std::string& _name)")
-			bool nextNode(const std::string& _name) { return next(_name); }
-			MYGUI_OBSOLETE("use : ElementPtr ElementEnumerator::current()")
-			ElementPtr currentNode() { return current(); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-		private:
-			bool m_first;
-			VectorElement::iterator m_current, m_end;
-		};
-
-
-		//----------------------------------------------------------------------//
-		// class Element
-		//----------------------------------------------------------------------//
-		class MYGUI_EXPORT Element
-		{
-			friend class Document;
-
-		public:
-			~Element();
-
-		private:
-			Element(const std::string &_name, ElementPtr _parent, ElementType _type = ElementType::Normal, const std::string& _content = "");
-			void save(std::ostream& _stream, size_t _level);
-
-		public:
-			ElementPtr createChild(const std::string& _name, const std::string& _content = "");
-
-			template <typename T>
-			void addAttribute(const std::string &_key, const T& _value)
-			{
-				mAttributes.push_back(PairAttribute(_key, utility::toString(_value)));
-			}
-
-			void addAttribute(const std::string& _key, const std::string& _value);
-
-			void removeAttribute(const std::string& _key);
-
-			void setAttribute(const std::string& _key, const std::string& _value);
-
-			template <typename T>
-			void addContent(const T& _content)
-			{
-				mContent.empty() ? mContent = utility::toString(_content) : mContent += utility::toString(" ", _content);
-			}
-
-			void addContent(const std::string& _content);
-
-			template <typename T>
-			void setContent(const T& _content)
-			{
-				mContent = utility::toString(_content);
-			}
-
-			void setContent(const std::string& _content) { mContent = _content; }
-
-			void clear();
-
-			bool findAttribute(const std::string& _name, std::string& _value);
-			std::string findAttribute(const std::string& _name);
-
-			const std::string& getName() const { return mName; }
-			const std::string& getContent() const { return mContent; }
-			const VectorAttributes& getAttributes() const { return mAttributes; }
-			ElementPtr getParent() const { return mParent; }
-
-			ElementEnumerator getElementEnumerator() { return ElementEnumerator(mChilds.begin(), mChilds.end()); }
-
-			ElementType getType() const { return mType; }
-
-			ElementPtr createCopy();
-
-		/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-			template <typename T>
-			MYGUI_OBSOLETE("use : template <typename T> void Element::addAttribute(const std::string &_key, const T& _value)")
-			void addAttributes(const std::string &_key, const T& _value) { addAttribute<T>(_key, _value); }
-			MYGUI_OBSOLETE("use : void Element::addAttribute(const std::string& _key, const std::string& _value)")
-			void addAttributes(const std::string& _key, const std::string& _value) { addAttribute(_key, _value); }
-
-			template <typename T>
-			MYGUI_OBSOLETE("use : template <typename T> void Element::addContent(const T& _content)")
-			void addBody(const T& _content) { addContent<T>(_content); }
-			MYGUI_OBSOLETE("use : void Element::addContent(const std::string& _content)")
-			void addBody(const std::string& _content) { addContent(_content); }
-			template <typename T>
-			MYGUI_OBSOLETE("use : template <typename T> void Element::setContent(const T& _content)")
-			void setBody(const T& _content) { setContent<T>(_content); }
-			MYGUI_OBSOLETE("use : void Element::setContent(const std::string& _content)")
-			void setBody(const std::string& _content) { setContent(_content); }
-
-			MYGUI_OBSOLETE("use : const std::string& Element::getContent()")
-			const std::string& getBody() { return getContent(); }
-			MYGUI_OBSOLETE("use : ElementEnumerator Element::getElementEnumerator()")
-			ElementEnumerator getNodeIterator() { return getElementEnumerator(); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-		private:
-			std::string mName;
-			std::string mContent;
-			VectorAttributes mAttributes;
-			VectorElement mChilds;
-			ElementPtr mParent;
-			ElementType mType;
-		};
-
-		//----------------------------------------------------------------------//
-		// class Document
-		//----------------------------------------------------------------------//
-		class MYGUI_EXPORT Document
-		{
-		public:
-			Document();
-			~Document();
-
-			// открывает обычным файлом, имя файла в utf8
-			bool open(const std::string& _filename);
-
-			// открывает обычным файлом, имя файла в utf16 или utf32
-			bool open(const std::wstring& _filename);
-
-			// открывает обычным потоком
-			bool open(std::istream& _stream);
-
-			bool open(const UString& _filename) { return open(_filename.asWStr()); }
-
-			bool open(IDataStream* _data);
-
-			// сохраняет файл
-			bool save(const std::string& _filename);
-
-			// сохраняет файл
-			bool save(const std::wstring& _filename);
-
-			bool save(std::ostream& _stream);
-
-			bool save(const UString& _filename) { return save(_filename.asWStr()); }
-
-			void clear();
-
-			std::string getLastError();
-
-			void clearLastError() { mLastError = ErrorType::MAX; }
-
-			ElementPtr createDeclaration(const std::string& _version = "1.0", const std::string& _encoding = "UTF-8");
-			ElementPtr createRoot(const std::string& _name);
-
-			ElementPtr getRoot() const { return mRoot; }
-
-		/*obsolete:*/
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-			MYGUI_OBSOLETE("use : ElementPtr Document::createDeclaration(const std::string& _version, const std::string& _encoding)")
-			ElementPtr createInfo(const std::string& _version = "1.0", const std::string& _encoding = "UTF-8") { return createDeclaration(_version, _encoding); }
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-		private:
-			void setLastFileError(const std::string& _filename) { mLastErrorFile = _filename; }
-
-			void setLastFileError(const std::wstring& _filename) { mLastErrorFile = UString(_filename).asUTF8(); }
-
-			bool parseTag(ElementPtr &_currentNode, std::string _content);
-
-			bool checkPair(std::string &_key, std::string &_value);
-
-			bool parseLine(std::string& _line, ElementPtr& _element);
-
-			// ищет символ без учета ковычек
-			size_t find(const std::string& _text, char _char, size_t _start = 0);
-
-			void clearDeclaration();
-			void clearRoot();
-
-		private:
-			ElementPtr mRoot;
-			ElementPtr mDeclaration;
-			ErrorType mLastError;
-			std::string mLastErrorFile;
-			size_t mLine;
-			size_t mCol;
-
-		}; // class Document
-
-		MYGUI_OBSOLETE("use : class MyGUI::xml::ElementEnumerator")
-		typedef ElementEnumerator xmlNodeIterator;
-		MYGUI_OBSOLETE("use : class MyGUI::xml::ElementPtr")
-		typedef ElementPtr xmlNodePtr;
-		MYGUI_OBSOLETE("use : class MyGUI::xml::Document")
-		typedef Document xmlDocument;
-
-	} // namespace xml
-
-} // namespace MyGUI
-
-#endif // __MYGUI_XML_DOCUMENT_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ActionController.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ActionController.cpp
deleted file mode 100644
index 86904bd6f1..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ActionController.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		03/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ActionController.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_WidgetManager.h"
-
-namespace MyGUI
-{
-
-	namespace action
-	{
-
-		void actionWidgetHide(Widget* _widget)
-		{
-			_widget->setVisible(false);
-		}
-
-		void actionWidgetShow(Widget* _widget)
-		{
-			_widget->setVisible(true);
-		}
-
-		void actionWidgetDestroy(Widget* _widget)
-		{
-			WidgetManager::getInstance().destroyWidget(_widget);
-		}
-
-		void linearMoveFunction(const IntCoord& _startRect, const IntCoord& _destRect, IntCoord& _result, float _k)
-		{
-			_result.set(_startRect.left   - int( float(_startRect.left   - _destRect.left)   * _k ),
-			            _startRect.top    - int( float(_startRect.top    - _destRect.top)    * _k ),
-			            _startRect.width  - int( float(_startRect.width  - _destRect.width)  * _k ),
-			            _startRect.height - int( float(_startRect.height - _destRect.height) * _k )
-			           );
-		}
-
-		void inertionalMoveFunction(const IntCoord& _startRect, const IntCoord& _destRect, IntCoord& _result, float _current_time)
-		{
-#ifndef M_PI
-			const float M_PI = 3.141593f;
-#endif
-			float k = sin(M_PI * _current_time - M_PI/2.0f);
-			if (k<0) k = (-pow(-k, 0.7f) + 1)/2;
-			else k = (pow(k, 0.7f) + 1)/2;
-			linearMoveFunction(_startRect, _destRect, _result, k);
-		}
-
-	} // namespace action
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Any.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Any.cpp
deleted file mode 100644
index 09a5f95444..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Any.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		10/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Any.h"
-
-namespace MyGUI
-{
-
-	Any::AnyEmpty Any::Null;
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Button.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Button.cpp
deleted file mode 100644
index 7714020302..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Button.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Button.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_StaticImage.h"
-#include "MyGUI_InputManager.h"
-
-namespace MyGUI
-{
-
-	Button::Button() :
-		mIsMousePressed(false),
-		mIsMouseFocus(false),
-		mIsStateCheck(false),
-		mImage(nullptr),
-		mModeImage(false)
-	{
-	}
-
-	void Button::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	Button::~Button()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void Button::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void Button::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// парсим свойства
-		const MapString& properties = _info->getProperties();
-		if (!properties.empty())
-		{
-			MapString::const_iterator iter = properties.find("ButtonPressed");
-			if (iter != properties.end()) setButtonPressed(utility::parseValue<bool>(iter->second));
-			iter = properties.find("StateCheck");
-			if (iter != properties.end()) setStateCheck(utility::parseValue<bool>(iter->second));
-			iter = properties.find("ModeImage");
-			if (iter != properties.end()) setModeImage(utility::parseValue<bool>(iter->second));
-		}
-
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "Image")
-			{
-				MYGUI_DEBUG_ASSERT( ! mImage, "widget already assigned");
-				mImage = (*iter)->castType<StaticImage>();
-			}
-		}
-	}
-
-	void Button::shutdownWidgetSkin()
-	{
-		mImage = nullptr;
-	}
-
-	void Button::onMouseSetFocus(Widget* _old)
-	{
-		_setMouseFocus(true);
-
-		Base::onMouseSetFocus(_old);
-	}
-
-	void Button::onMouseLostFocus(Widget* _new)
-	{
-		_setMouseFocus(false);
-
-		Base::onMouseLostFocus(_new);
-	}
-
-	void Button::onMouseButtonPressed(int _left, int _top, MouseButton _id)
-	{
-		if (_id == MouseButton::Left)
-		{
-			mIsMousePressed = true;
-			updateButtonState();
-		}
-
-		Base::onMouseButtonPressed(_left, _top, _id);
-	}
-
-	void Button::onMouseButtonReleased(int _left, int _top, MouseButton _id)
-	{
-		if (_id == MouseButton::Left)
-		{
-			mIsMousePressed = false;
-			updateButtonState();
-		}
-
-		Base::onMouseButtonReleased(_left, _top, _id);
-	}
-
-	void Button::setImageIndex(size_t _index)
-	{
-		if (mImage) mImage->setImageIndex(_index);
-	}
-
-	size_t Button::getImageIndex()
-	{
-		if (mImage) return mImage->getImageIndex();
-		return ITEM_NONE;
-	}
-
-	void Button::updateButtonState()
-	{
-		if (mIsStateCheck)
-		{
-			if (!mEnabled) { if (!_setState("disabled_checked")) _setState("disabled"); }
-			else if (mIsMousePressed) { if (!_setState("pushed_checked")) _setState("pushed"); }
-			else if (mIsMouseFocus) { if (!_setState("highlighted_checked")) _setState("pushed"); }
-			else _setState("normal_checked");
-		}
-		else
-		{
-			if (!mEnabled) _setState("disabled");
-			else if (mIsMousePressed) _setState("pushed");
-			else if (mIsMouseFocus) _setState("highlighted");
-			else _setState("normal");
-		}
-	}
-
-	void Button::setStateCheck(bool _check)
-	{
-		if (mIsStateCheck == _check) return;
-		mIsStateCheck = _check;
-		updateButtonState();
-	}
-
-	void Button::_setMouseFocus(bool _focus)
-	{
-		mIsMouseFocus = _focus;
-		updateButtonState();
-	}
-
-	void Button::setProperty(const std::string& _key, const std::string& _value)
-	{
-		/// @wproperty{Button, Button_Pressed, bool} Set pressed state.
-		if (_key == "Button_Pressed") setButtonPressed(utility::parseValue<bool>(_value));
-		else if (_key == "Button_ModeImage") setModeImage(utility::parseValue<bool>(_value));
-		else if (_key == "Button_ImageResource") setImageResource(_value);
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-	void Button::baseUpdateEnable()
-	{
-		updateButtonState();
-		if (!mEnabled)
-		{
-			mIsMouseFocus = false;
-		}
-	}
-
-	void Button::setModeImage(bool _value)
-	{
-		mModeImage = _value;
-		updateButtonState();
-	}
-
-	bool Button::_setState(const std::string& _value)
-	{
-		if (mModeImage)
-		{
-			if (mImage)
-				mImage->setItemName(_value);
-
-			setState(_value);
-			return true;
-		}
-
-		return setState(_value);
-	}
-
-	void Button::setImageResource(const std::string& _name)
-	{
-		if (mImage)
-			mImage->setItemResource(_name);
-		updateButtonState();
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Canvas.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Canvas.cpp
deleted file mode 100644
index 34948bfe43..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Canvas.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-/*!
-	@file
-	@author		Alexander Ptakhin
-	@date		01/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Canvas.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_Bitwise.h"
-
-namespace MyGUI
-{
-
-	Canvas::Canvas() :
-		mTexture( nullptr ),
-		mTexResizeMode( TRM_PT_CONST_SIZE ),
-		mTexData( 0 ),
-		mTexManaged( true ),
-		mFrameAdvise( false )
-	{
-		mGenTexName = utility::toString( this, "_Canvas" );
-	}
-
-	void Canvas::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-	}
-
-	Canvas::~Canvas()
-	{
-		_destroyTexture( false );
-	}
-
-	void Canvas::createTexture( TextureResizeMode _resizeMode, TextureUsage _usage, PixelFormat _format )
-	{
-		createTexture( getSize(), _resizeMode, _usage, _format );
-	}
-
-	void Canvas::createTexture( const IntSize& _size, TextureResizeMode _resizeMode, TextureUsage _usage, PixelFormat _format )
-	{
-		if ( _size.width <= 0 || _size.height <= 0 )
-		{
-			MYGUI_ASSERT( 0, "At least one of dimensions isn't positive!" );
-			return;
-		}
-
-		createTexture( _size.width, _size.height, _resizeMode, _usage, _format );
-	}
-
-	void Canvas::createExactTexture( int _width, int _height, TextureUsage _usage, PixelFormat _format )
-	{
-		MYGUI_ASSERT( _width >= 0 && _height >= 0, "negative size" );
-
-		destroyTexture();
-
-		mTexture = RenderManager::getInstance().createTexture(mGenTexName);
-		mTexture->setInvalidateListener(this);
-		mTexture->createManual( _width, _height, _usage, _format );
-
-		mTexManaged = true;
-
-		_setTextureName( mGenTexName );
-		correctUV();
-		requestUpdateCanvas( this, Event( true, true, false ) );
-	}
-
-	void Canvas::resize( const IntSize& _size )
-	{
-		if ( _size.width <= 0 || _size.height <= 0 || ! mTexManaged )
-			return;
-
-		mReqTexSize = _size;
-
-		frameAdvise( true );
-	}
-
-	void Canvas::createTexture( int _width, int _height, TextureResizeMode _resizeMode, TextureUsage _usage, PixelFormat _format )
-	{
-		MYGUI_ASSERT( _width >= 0 && _height >= 0, "negative size" );
-
-		if ( mReqTexSize.empty() )
-			mReqTexSize = IntSize( _width, _height );
-
-		mTexResizeMode = _resizeMode;
-
-		bool create = checkCreate( _width, _height );
-
-		_width = Bitwise::firstPO2From(_width);
-		_height = Bitwise::firstPO2From(_height);
-
-		if ( create )
-			createExactTexture( _width, _height, _usage, _format );
-	}
-
-	void Canvas::setSize( const IntSize& _size )
-	{
-		resize( _size );
-
-		Base::setSize( _size );
-	}
-
-	void Canvas::setCoord( const IntCoord& _coord )
-	{
-		resize( _coord.size() );
-
-		Base::setCoord( _coord );
-	}
-
-	void Canvas::updateTexture()
-	{
-		requestUpdateCanvas( this, Event( false, false, true ) );
-	}
-
-	bool Canvas::checkCreate( int _width, int _height ) const
-	{
-		if ( mTexture == nullptr )
-			return true;
-
-		if ( mTexture->getWidth() >= _width && mTexture->getHeight() >= _height )
-			return false;
-
-		return true;
-	}
-
-	void Canvas::validate( int& _width, int& _height, TextureUsage& _usage, PixelFormat& _format ) const
-	{
-		_width = Bitwise::firstPO2From(_width);
-		_height = Bitwise::firstPO2From(_height);
-
-		// restore usage and format
-		if ( mTexture != nullptr )
-		{
-			if ( _usage == getDefaultTextureUsage() )
-				_usage = mTexture->getUsage();
-
-			if ( _format == getDefaultTextureFormat() )
-				_format = mTexture->getFormat();
-		}
-	}
-
-	void Canvas::destroyTexture()
-	{
-		_destroyTexture( true );
-	}
-
-	void Canvas::_destroyTexture( bool _sendEvent )
-	{
-		if ( mTexture != nullptr )
-		{
-			if ( _sendEvent )
-			{
-				eventPreTextureChanges( this );
-			}
-
-			RenderManager::getInstance().destroyTexture( mTexture );
-			mTexture = nullptr;
-		}
-
-	}
-
-	void Canvas::correctUV()
-	{
-		if ( mTexResizeMode == TRM_PT_VIEW_REQUESTED )
-		{
-			_setUVSet( FloatRect( 0, 0,
-				(float) mReqTexSize.width  / (float) getTextureRealWidth(),
-				(float) mReqTexSize.height / (float) getTextureRealHeight()
-				) );
-		}
-
-		if ( mTexResizeMode == TRM_PT_CONST_SIZE || mTexResizeMode == TRM_PT_VIEW_ALL )
-		{
-			_setUVSet( FloatRect( 0, 0, 1, 1 ) );
-		}
-	}
-
-	void* Canvas::lock(TextureUsage _usage)
-	{
-		void* data = mTexture->lock(_usage);
-
-		mTexData = reinterpret_cast< uint8* >( data );
-
-		return data;
-	}
-
-	void Canvas::unlock()
-	{
-		mTexture->unlock();
-	}
-
-	void Canvas::baseChangeWidgetSkin( ResourceSkin* _info )
-	{
-		Base::baseChangeWidgetSkin( _info );
-	}
-
-	void Canvas::initialiseWidgetSkin( ResourceSkin* _info )
-	{
-	}
-
-	void Canvas::shutdownWidgetSkin()
-	{
-	}
-
-	bool Canvas::isTextureSrcSize() const
-	{
-		return getTextureSrcSize() == getTextureRealSize();
-	}
-
-	void Canvas::frameAdvise( bool _advise )
-	{
-		if ( _advise )
-		{
-			if ( ! mFrameAdvise )
-			{
-				MyGUI::Gui::getInstance().eventFrameStart += MyGUI::newDelegate( this, &Canvas::frameEntered );
-				mFrameAdvise = true;
-			}
-		}
-		else
-		{
-			if ( mFrameAdvise )
-			{
-				MyGUI::Gui::getInstance().eventFrameStart -= MyGUI::newDelegate( this, &Canvas::frameEntered );
-				mFrameAdvise = false;
-			}
-		}
-	}
-
-	void Canvas::frameEntered( float _time )
-	{
-		int width = mReqTexSize.width;
-		int height = mReqTexSize.height;
-		TextureUsage usage = getDefaultTextureUsage();
-		PixelFormat format = getDefaultTextureFormat();
-
-		validate( width, height, usage, format );
-
-		bool create = checkCreate( width, height );
-
-		if ( mTexResizeMode == TRM_PT_CONST_SIZE )
-			create = false;
-
-		if ( create )
-		{
-			createExactTexture( width, height, usage, format );
-			correctUV();
-		}
-		else // I thought order is important
-		{
-			correctUV();
-			requestUpdateCanvas( this, Event( false, true, false ) );
-		}
-
-		frameAdvise( false );
-	}
-
-	void Canvas::textureInvalidate(ITexture* _texture)
-	{
-		updateTexture();
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ClipboardManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ClipboardManager.cpp
deleted file mode 100644
index 0de57f43d8..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ClipboardManager.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ClipboardManager.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_TextIterator.h"
-
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-#include <windows.h>
-#endif
-
-namespace MyGUI
-{
-
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-
-	HWND g_hWnd = NULL;
-
-	BOOL CALLBACK EnumWindowProc(HWND hWnd, LPARAM lParam)
-	{
-		DWORD dwProcessID = 0;
-		::GetWindowThreadProcessId(hWnd, &dwProcessID);
-
-		if (dwProcessID != (DWORD)lParam)
-			return TRUE;
-
-		if (::GetParent(hWnd) == NULL)
-		{
-			// Нашли. hWnd - то что надо
-			g_hWnd = hWnd;
-			return FALSE;
-		}
-
-		return TRUE;
-	}
-
-	BOOL CALLBACK EnumChildWindowProc(HWND hWnd, LPARAM lParam)
-	{
-		DWORD dwProcessID = 0;
-		::GetWindowThreadProcessId(hWnd, &dwProcessID);
-
-		if (dwProcessID != ::GetCurrentProcessId())
-			return TRUE;
-
-#ifdef _M_X64
-		if (::GetWindowLongPtr(hWnd, GWLP_HINSTANCE) == lParam)
-#else
-		if (::GetWindowLong(hWnd, GWL_HINSTANCE) == lParam)
-#endif
-		{
-			// Нашли. hWnd - то что надо
-			g_hWnd = hWnd;
-			return FALSE;
-		}
-
-		return TRUE;
-	}
-
-#endif
-
-	MYGUI_INSTANCE_IMPLEMENT( ClipboardManager )
-
-	void ClipboardManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-		// берем имя нашего экзешника
-		char buf[MAX_PATH];
-		::GetModuleFileName(0, (LPCH)&buf, MAX_PATH);
-		// берем инстанс нашего модуля
-		HINSTANCE instance = ::GetModuleHandle(buf);
-
-		::EnumChildWindows(::GetDesktopWindow(), (WNDENUMPROC)EnumWindowProc, (LPARAM)instance);
-		mHwnd = (size_t)g_hWnd;
-
-#endif
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void ClipboardManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	void ClipboardManager::setClipboardData(const std::string& _type, const std::string& _data)
-	{
-		mClipboardData[_type] = _data;
-
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-		if (_type == "Text")
-		{
-			mPutTextInClipboard = TextIterator::getOnlyText(UString(_data));
-			size_t size = (mPutTextInClipboard.size() + 1) * 2;
-			//открываем буфер обмена
-			if (::OpenClipboard((HWND)mHwnd))
-			{
-				::EmptyClipboard(); //очищаем буфер
-				HGLOBAL hgBuffer = ::GlobalAlloc(GMEM_DDESHARE, size);//выделяем память
-				wchar_t * chBuffer = NULL;
-				if ((hgBuffer) && (chBuffer = (wchar_t*)GlobalLock(hgBuffer)))
-				{
-					::memcpy(chBuffer, mPutTextInClipboard.asWStr_c_str(), size);
-					::GlobalUnlock(hgBuffer);//разблокируем память
-					::SetClipboardData(CF_UNICODETEXT, hgBuffer);//помещаем текст в буфер обмена
-				}
-				::CloseClipboard(); //закрываем буфер обмена
-			}
-		}
-#endif
-	}
-
-	void ClipboardManager::clearClipboardData(const std::string& _type)
-	{
-		MapString::iterator iter = mClipboardData.find(_type);
-		if (iter != mClipboardData.end()) mClipboardData.erase(iter);
-	}
-
-	std::string ClipboardManager::getClipboardData(const std::string& _type)
-	{
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-		if (_type == "Text")
-		{
-			UString buff;
-			//открываем буфер обмена
-			if ( ::OpenClipboard((HWND)mHwnd) )
-			{
-				HANDLE hData = ::GetClipboardData(CF_UNICODETEXT);//извлекаем текст из буфера обмена
-				wchar_t * chBuffer = NULL;
-				if ((hData) && (chBuffer = (wchar_t*)::GlobalLock(hData)))
-				{
-					buff = chBuffer;
-					::GlobalUnlock(hData);//разблокируем память
-				}
-				::CloseClipboard();//закрываем буфер обмена
-			}
-			// если в буфере не то что мы ложили, то берем из буфера
-			if (mPutTextInClipboard != buff)
-			{
-				// вставляем теги, если нуно
-				const UString& text = TextIterator::toTagsString(buff);
-				return text.asUTF8();
-			}
-
-			MapString::iterator iter = mClipboardData.find(_type);
-			if (iter != mClipboardData.end()) return (*iter).second;
-			return "";
-		}
-#endif
-
-		MapString::iterator iter = mClipboardData.find(_type);
-		if (iter != mClipboardData.end()) return (*iter).second;
-		return "";
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Colour.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Colour.cpp
deleted file mode 100644
index 804736cd8c..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Colour.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Colour.h"
-
-namespace MyGUI
-{
-
-	const Colour Colour::Zero = Colour(0, 0, 0, 0);
-	const Colour Colour::Black = Colour(0, 0, 0, 1);
-	const Colour Colour::White = Colour(1, 1, 1, 1);
-	const Colour Colour::Red = Colour(1, 0, 0, 1);
-	const Colour Colour::Green = Colour(0, 1, 0, 1);
-	const Colour Colour::Blue = Colour(0, 0, 1, 1);
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ComboBox.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ComboBox.cpp
deleted file mode 100644
index 3fde498e86..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ComboBox.cpp
+++ /dev/null
@@ -1,438 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ComboBox.h"
-#include "MyGUI_ControllerManager.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_List.h"
-#include "MyGUI_Button.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_LayerManager.h"
-
-namespace MyGUI
-{
-
-	const float COMBO_ALPHA_MAX  = ALPHA_MAX;
-	const float COMBO_ALPHA_MIN  = ALPHA_MIN;
-	const float COMBO_ALPHA_COEF = 4.0f;
-
-	ComboBox::ComboBox() :
-		mButton(nullptr),
-		mList(nullptr),
-		mListShow(false),
-		mMaxHeight(0),
-		mItemIndex(ITEM_NONE),
-		mModeDrop(false),
-		mDropMouse(false),
-		mShowSmooth(false),
-		mManualList(true)
-	{
-	}
-
-	void ComboBox::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	ComboBox::~ComboBox()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void ComboBox::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void ComboBox::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// парсим свойства
-		const MapString& properties = _info->getProperties();
-		if (!properties.empty())
-		{
-			MapString::const_iterator iter = properties.find("HeightList");
-			if (iter != properties.end()) mMaxHeight = utility::parseValue<int>(iter->second);
-
-			iter = properties.find("ListSmoothShow");
-			if (iter != properties.end()) setSmoothShow(utility::parseBool(iter->second));
-		}
-
-		// парсим кнопку
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "Button")
-			{
-				MYGUI_DEBUG_ASSERT( ! mButton, "widget already assigned");
-				mButton = (*iter)->castType<Button>();
-				mButton->eventMouseButtonPressed = newDelegate(this, &ComboBox::notifyButtonPressed);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "List")
-			{
-				MYGUI_DEBUG_ASSERT( ! mList, "widget already assigned");
-				mList = (*iter)->castType<List>();
-				mList->setVisible(false);
-				mList->eventKeyLostFocus = newDelegate(this, &ComboBox::notifyListLostFocus);
-				mList->eventListSelectAccept = newDelegate(this, &ComboBox::notifyListSelectAccept);
-				mList->eventListMouseItemActivate = newDelegate(this, &ComboBox::notifyListMouseItemActivate);
-				mList->eventListChangePosition = newDelegate(this, &ComboBox::notifyListChangePosition);
-			}
-		}
-
-		//OBSOLETE
-		//MYGUI_ASSERT(nullptr != mButton, "Child Button not found in skin (combobox must have Button)");
-
-		//MYGUI_ASSERT(nullptr != mList, "Child List not found in skin (combobox must have List)");
-		mManualList = (mList == nullptr);
-		if (mList == nullptr)
-		{
-			std::string list_skin;
-			MapString::const_iterator iter = properties.find("ListSkin");
-			if (iter != properties.end()) list_skin = iter->second;
-			std::string list_layer;
-			iter = properties.find("ListLayer");
-			if (iter != properties.end()) list_layer = iter->second;
-			mList = createWidget<MyGUI::List>(WidgetStyle::Popup, list_skin, IntCoord(), Align::Default, list_layer);
-			mWidgetChild.pop_back();
-
-			mList->setVisible(false);
-			mList->eventKeyLostFocus = newDelegate(this, &ComboBox::notifyListLostFocus);
-			mList->eventListSelectAccept = newDelegate(this, &ComboBox::notifyListSelectAccept);
-			mList->eventListMouseItemActivate = newDelegate(this, &ComboBox::notifyListMouseItemActivate);
-			mList->eventListChangePosition = newDelegate(this, &ComboBox::notifyListChangePosition);
-		}
-
-		// корректируем высоту списка
-		//if (mMaxHeight < mList->getFontHeight()) mMaxHeight = mList->getFontHeight();
-
-		// подписываем дочерние классы на скролл
-		if (mWidgetClient != nullptr)
-		{
-			mWidgetClient->eventMouseWheel = newDelegate(this, &ComboBox::notifyMouseWheel);
-			mWidgetClient->eventMouseButtonPressed = newDelegate(this, &ComboBox::notifyMousePressed);
-		}
-
-		// подписываемся на изменения текста
-		eventEditTextChange = newDelegate(this, &ComboBox::notifyEditTextChange);
-	}
-
-	void ComboBox::shutdownWidgetSkin()
-	{
-		if (mManualList)
-		{
-			mWidgetChild.push_back(mList);
-			WidgetManager::getInstance().destroyWidget(mList);
-		}
-		mList = nullptr;
-		mButton = nullptr;
-	}
-
-
-	void ComboBox::notifyButtonPressed(Widget* _sender, int _left, int _top, MouseButton _id)
-	{
-		if (MouseButton::Left != _id) return;
-
-		mDropMouse = true;
-
-		if (mListShow) hideList();
-		else showList();
-	}
-
-	void ComboBox::notifyListLostFocus(Widget* _sender, Widget* _new)
-	{
-		if (mDropMouse)
-		{
-			mDropMouse = false;
-			Widget* focus = InputManager::getInstance().getMouseFocusWidget();
-			// кнопка сама уберет список
-			if (focus == mButton) return;
-			// в режиме дропа все окна учавствуют
-			if ( (mModeDrop) && (focus == mWidgetClient) ) return;
-		}
-
-		hideList();
-	}
-
-	void ComboBox::notifyListSelectAccept(List* _widget, size_t _position)
-	{
-		mItemIndex = _position;
-		Base::setCaption(mItemIndex != ITEM_NONE ? mList->getItemNameAt(mItemIndex) : "");
-
-		mDropMouse = false;
-		InputManager::getInstance().setKeyFocusWidget(this);
-
-		if (mModeDrop)
-		{
-			eventComboAccept.m_eventObsolete(this);
-			eventComboAccept.m_event(this, mItemIndex);
-		}
-	}
-
-	void ComboBox::notifyListChangePosition(List* _widget, size_t _position)
-	{
-		mItemIndex = _position;
-		eventComboChangePosition(this, _position);
-	}
-
-	void ComboBox::onKeyButtonPressed(KeyCode _key, Char _char)
-	{
-		Base::onKeyButtonPressed(_key, _char);
-
-		// при нажатии вниз, показываем лист
-		if (_key == KeyCode::ArrowDown)
-		{
-			// выкидываем список только если мыша свободна
-			if (!InputManager::getInstance().isCaptureMouse())
-			{
-				showList();
-			}
-		}
-		// нажат ввод в окне редиктирования
-		else if ((_key == KeyCode::Return) || (_key == KeyCode::NumpadEnter))
-		{
-			eventComboAccept.m_eventObsolete(this);
-			eventComboAccept.m_event(this, mItemIndex);
-		}
-
-	}
-
-	void ComboBox::notifyListMouseItemActivate(List* _widget, size_t _position)
-	{
-		mItemIndex = _position;
-		Base::setCaption(mItemIndex != ITEM_NONE ? mList->getItemNameAt(mItemIndex) : "");
-
-		InputManager::getInstance().setKeyFocusWidget(this);
-
-		if (mModeDrop)
-		{
-			eventComboAccept.m_eventObsolete(this);
-			eventComboAccept.m_event(this, mItemIndex);
-		}
-	}
-
-	void ComboBox::notifyMouseWheel(Widget* _sender, int _rel)
-	{
-		if (mList->getItemCount() == 0) return;
-		if (InputManager::getInstance().getKeyFocusWidget() != this) return;
-		if (InputManager::getInstance().isCaptureMouse()) return;
-
-		if (_rel > 0)
-		{
-			if (mItemIndex != 0)
-			{
-				if (mItemIndex == ITEM_NONE) mItemIndex = 0;
-				else mItemIndex --;
-				Base::setCaption(mList->getItemNameAt(mItemIndex));
-				mList->setIndexSelected(mItemIndex);
-				mList->beginToItemAt(mItemIndex);
-				eventComboChangePosition(this, mItemIndex);
-			}
-		}
-		else if (_rel < 0)
-		{
-			if ((mItemIndex+1) < mList->getItemCount())
-			{
-				if (mItemIndex == ITEM_NONE) mItemIndex = 0;
-				else mItemIndex ++;
-				Base::setCaption(mList->getItemNameAt(mItemIndex));
-				mList->setIndexSelected(mItemIndex);
-				mList->beginToItemAt(mItemIndex);
-				eventComboChangePosition(this, mItemIndex);
-			}
-		}
-	}
-
-	void ComboBox::notifyMousePressed(Widget* _sender, int _left, int _top, MouseButton _id)
-	{
-		// обязательно отдаем отцу, а то мы у него в наглую отняли
-		Base::notifyMousePressed(_sender, _left, _top, _id);
-
-		mDropMouse = true;
-
-		// показываем список
-		if (mModeDrop) notifyButtonPressed(nullptr, _left, _top, _id);
-	}
-
-	void ComboBox::notifyEditTextChange(Edit* _sender)
-	{
-		// сбрасываем выделенный элемент
-		if (ITEM_NONE != mItemIndex)
-		{
-			mItemIndex = ITEM_NONE;
-			mList->setIndexSelected(mItemIndex);
-			mList->beginToItemFirst();
-			eventComboChangePosition(this, mItemIndex);
-		}
-	}
-
-	void ComboBox::showList()
-	{
-		// пустой список не показываем
-		if (mList->getItemCount() == 0) return;
-
-		mListShow = true;
-
-		int height = mList->getOptimalHeight();
-		if (height > mMaxHeight) height = mMaxHeight;
-
-		// берем глобальные координаты выджета
-		IntCoord coord = this->getAbsoluteCoord();
-
-		//показываем список вверх
-		if ((coord.top + coord.height + height) > Gui::getInstance().getViewSize().height)
-		{
-			coord.height = height;
-			coord.top -= coord.height;
-		}
-		// показываем список вниз
-		else
-		{
-			coord.top += coord.height;
-			coord.height = height;
-		}
-		mList->setCoord(coord);
-
-		if (mShowSmooth)
-		{
-			ControllerFadeAlpha* controller = createControllerFadeAlpha(COMBO_ALPHA_MAX, COMBO_ALPHA_COEF, true);
-			ControllerManager::getInstance().addItem(mList, controller);
-		}
-		else
-		{
-			mList->setVisible(true);
-		}
-
-		InputManager::getInstance().setKeyFocusWidget(mList);
-	}
-
-	void ComboBox::actionWidgetHide(Widget* _widget)
-	{
-		_widget->setVisible(false);
-		_widget->setEnabled(true);
-	}
-
-	void ComboBox::hideList()
-	{
-		mListShow = false;
-
-		if (mShowSmooth)
-		{
-			ControllerFadeAlpha* controller = createControllerFadeAlpha(COMBO_ALPHA_MIN, COMBO_ALPHA_COEF, false);
-			controller->eventPostAction = newDelegate(this, &ComboBox::actionWidgetHide);
-			ControllerManager::getInstance().addItem(mList, controller);
-		}
-		else
-		{
-			mList->setVisible(false);
-		}
-	}
-
-	void ComboBox::setIndexSelected(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE_AND_NONE(_index, mList->getItemCount(), "ComboBox::setIndexSelected");
-		mItemIndex = _index;
-		mList->setIndexSelected(_index);
-		if (_index == ITEM_NONE)
-		{
-			Base::setCaption("");
-			return;
-		}
-		Base::setCaption(mList->getItemNameAt(_index));
-		Base::updateView(); // hook for update
-	}
-
-	void ComboBox::setItemNameAt(size_t _index, const UString& _name)
-	{
-		mList->setItemNameAt(_index, _name);
-		mItemIndex = ITEM_NONE;//FIXME
-		mList->setIndexSelected(mItemIndex);//FIXME
-	}
-
-	void ComboBox::setItemDataAt(size_t _index, Any _data)
-	{
-		mList->setItemDataAt(_index, _data);
-		mItemIndex = ITEM_NONE;//FIXME
-		mList->setIndexSelected(mItemIndex);//FIXME
-	}
-
-	void ComboBox::insertItemAt(size_t _index, const UString& _item, Any _data)
-	{
-		mList->insertItemAt(_index, _item, _data);
-		mItemIndex = ITEM_NONE;//FIXME
-		mList->setIndexSelected(mItemIndex);//FIXME
-	}
-
-	void ComboBox::removeItemAt(size_t _index)
-	{
-		mList->removeItemAt(_index);
-		mItemIndex = ITEM_NONE;//FIXME
-		mList->clearIndexSelected();//FIXME
-	}
-
-	void ComboBox::removeAllItems()
-	{
-		mItemIndex = ITEM_NONE;//FIXME
-		mList->removeAllItems();//FIXME заново созданные строки криво стоят
-	}
-
-	void ComboBox::setComboModeDrop(bool _drop)
-	{
-		mModeDrop = _drop;
-		setEditStatic(mModeDrop);
-	}
-
-	ControllerFadeAlpha* ComboBox::createControllerFadeAlpha(float _alpha, float _coef, bool _enable)
-	{
-		ControllerItem* item = ControllerManager::getInstance().createItem(ControllerFadeAlpha::getClassTypeName());
-		ControllerFadeAlpha* controller = item->castType<ControllerFadeAlpha>();
-
-		controller->setAlpha(_alpha);
-		controller->setCoef(_coef);
-		controller->setEnabled(_enable);
-
-		return controller;
-	}
-
-	size_t ComboBox::findItemIndexWith(const UString& _name)
-	{
-		return mList->findItemIndexWith(_name);
-	}
-
-	void ComboBox::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "ComboBox_ModeDrop") setComboModeDrop(utility::parseValue<bool>(_value));
-		else if (_key == "ComboBox_AddItem") addItem(_value);
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ControllerEdgeHide.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ControllerEdgeHide.cpp
deleted file mode 100644
index fca06f2438..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ControllerEdgeHide.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*!
-	@file
-	@author		Evmenov Georgiy
-	@date		03/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ControllerEdgeHide.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_Widget.h"
-
-namespace MyGUI
-{
-
-#ifndef M_PI
-	const float M_PI = 3.141593f;
-#endif
-
-	ControllerEdgeHide::ControllerEdgeHide() :
-		mTime(1.0),
-		mRemainPixels(0),
-		mShadowSize(0),
-		mElapsedTime(0)
-	{
-	}
-
-	void ControllerEdgeHide::prepareItem(Widget* _widget)
-	{
-		recalculateTime(_widget);
-		// вызываем пользовательский делегат для подготовки
-		eventPreAction(_widget);
-	}
-
-	bool ControllerEdgeHide::addTime(Widget* _widget, float _time)
-	{
-		Widget* keyFocus = InputManager::getInstance().getKeyFocusWidget();
-		Widget* mouseFocus = InputManager::getInstance().getMouseFocusWidget();
-
-		while ((keyFocus != nullptr) && (_widget != keyFocus))
-			keyFocus = keyFocus->getParent();
-		while ((mouseFocus != nullptr) && (_widget != mouseFocus))
-			mouseFocus = mouseFocus->getParent();
-
-		// if our widget or its children have focus
-		bool haveFocus = ((keyFocus != nullptr) || (mouseFocus != nullptr)) || (_widget->isVisible() == false);
-
-		mElapsedTime += (1 - 2*haveFocus) * _time;
-
-		if (mElapsedTime >= mTime)
-		{
-			mElapsedTime = mTime;
-		}
-		if (mElapsedTime <= 0)
-		{
-			mElapsedTime = 0.0f;
-			return true;
-		}
-
-		float k = sin(M_PI * mElapsedTime/mTime - M_PI/2);
-		if (k<0) k = (-pow(-k, 0.7f) + 1)/2;
-		else k = (pow(k, 0.7f) + 1)/2;
-
-		MyGUI::IntCoord coord = _widget->getCoord();
-		// if widget was moved
-		if (coord != mLastCoord)
-		{
-			// if still moving - leave it alone
-			if (haveFocus)
-				return true;
-			else
-				recalculateTime(_widget);
-		}
-
-		IntSize view_size;
-		if (_widget->getCroppedParent() == nullptr)
-			view_size = _widget->getLayer()->getSize();
-		else
-			view_size = ((Widget*)_widget->getCroppedParent())->getSize();
-
-		bool nearBorder = false;
-
-		if ((coord.left <= 0) && !(coord.right() >= view_size.width - 1))
-		{
-			coord.left = - int( float(coord.width - mRemainPixels - mShadowSize) * k);
-			nearBorder = true;
-		}
-		else if ((coord.top <= 0) && !(coord.bottom() >= view_size.height - 1))
-		{
-			coord.top = - int( float(coord.height - mRemainPixels - mShadowSize) * k);
-			nearBorder = true;
-		}
-		else if ((coord.right() >= view_size.width - 1) && !(coord.left <= 0))
-		{
-			coord.left = int(float(view_size.width - 1) - float(mRemainPixels)*k - float(coord.width) * (1.f - k));
-			nearBorder = true;
-		}
-		else if ((coord.bottom() >= view_size.height-1) && !(coord.top <= 0))
-		{
-			coord.top = int(float(view_size.height-1) - float(mRemainPixels)*k - float(coord.height) * (1.f - k));
-			nearBorder = true;
-		}
-
-		if (nearBorder)
-		{
-			_widget->setCoord(coord);
-		}
-		else
-		{
-			mElapsedTime = 0;
-		}
-		mLastCoord = coord;
-
-		eventUpdateAction(_widget);
-
-		return true;
-	}
-
-	void ControllerEdgeHide::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "Time") setTime(utility::parseValue<float>(_value));
-		else if (_key == "RemainPixels") setRemainPixels(utility::parseValue<int>(_value));
-		else if (_key == "ShadowSize") setShadowSize(utility::parseValue<int>(_value));
-	}
-
-	void ControllerEdgeHide::recalculateTime(Widget* _widget)
-	{
-		float k = 0;
-		const MyGUI::IntCoord& coord = _widget->getCoord();		IntSize view_size;
-		if (_widget->getCroppedParent() == nullptr)
-			view_size = _widget->getLayer()->getSize();
-		else
-			view_size = ((Widget*)_widget->getCroppedParent())->getSize();
-
-
-		// check if widget is near any border and not near opposite borders at same time
-		if ((coord.left <= 0) && !(coord.right() >= view_size.width - 1))
-		{
-			k = - (float) coord.left / (coord.width - mRemainPixels - mShadowSize);
-		}
-		else if ((coord.top <= 0) && !(coord.bottom() >= view_size.height - 1))
-		{
-			k = - (float)coord.top / (coord.height - mRemainPixels - mShadowSize);
-		}
-		else if ((coord.right() >= view_size.width - 1) && !(coord.left <= 0))
-		{
-			k = (float)(coord.right() - view_size.width + 1 ) / (coord.width - mRemainPixels);
-		}
-		else if ((coord.bottom() >= view_size.height - 1) && !(coord.top <= 0))
-		{
-			k = (float)(coord.bottom() - view_size.height + 1 ) / (coord.height - mRemainPixels);
-		}
-
-		//mElapsedTime = (asin(k)/M_PI + 1./2) * mTime;
-		// this is reversed formula from ControllerEdgeHide::addTime k calculation
-		if (k > 0.5f)
-			mElapsedTime = (asin( pow( 2*k - 1, 1/0.7f))/M_PI + 1.f/2) * mTime;
-		else
-			mElapsedTime = (asin(-pow(-2*k + 1, 1/0.7f))/M_PI + 1.f/2) * mTime;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ControllerFadeAlpha.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ControllerFadeAlpha.cpp
deleted file mode 100644
index e76196a859..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ControllerFadeAlpha.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ControllerFadeAlpha.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_Widget.h"
-
-namespace MyGUI
-{
-
-	ControllerFadeAlpha::ControllerFadeAlpha() :
-		mAlpha(1),
-		mCoef(1),
-		mEnabled(true)
-	{
-	}
-
-	void ControllerFadeAlpha::prepareItem(Widget* _widget)
-	{
-		// подготовка виджета, блокируем если только нужно
-		if (!mEnabled) _widget->setEnabledSilent(mEnabled);
-
-		if ((ALPHA_MIN != mAlpha) && (!_widget->isVisible()))
-		{
-			_widget->setAlpha(ALPHA_MIN);
-			_widget->setVisible(true);
-		}
-
-		// отписываем его от ввода
-		if (!mEnabled) InputManager::getInstance().unlinkWidget(_widget);
-
-		// вызываем пользовательский делегат для подготовки
-		eventPreAction(_widget);
-	}
-
-	bool ControllerFadeAlpha::addTime(Widget* _widget, float _time)
-	{
-		float alpha = _widget->getAlpha();
-
-		// проверяем нужно ли к чему еще стремиться
-		if (mAlpha > alpha)
-		{
-			alpha += _time * mCoef;
-			if (mAlpha > alpha)
-			{
-				_widget->setAlpha(alpha);
-				eventUpdateAction(_widget);
-				return true;
-			}
-			else
-			{
-				_widget->setAlpha(mAlpha);
-			}
-		}
-		else if (mAlpha < alpha)
-		{
-			alpha -= _time * mCoef;
-			if (mAlpha < alpha)
-			{
-				_widget->setAlpha(alpha);
-				eventUpdateAction(_widget);
-				return true;
-			}
-			else
-			{
-				_widget->setAlpha(mAlpha);
-			}
-		}
-
-		// вызываем пользовательский делегат пост обработки
-		eventPostAction(_widget);
-
-		return false;
-	}
-
-	void ControllerFadeAlpha::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "Alpha") setAlpha(utility::parseValue<float>(_value));
-		else if (_key == "Coef") setCoef(utility::parseValue<float>(_value));
-		else if (_key == "Enabled") setEnabled(utility::parseValue<bool>(_value));
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ControllerManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ControllerManager.cpp
deleted file mode 100644
index 5abdf01c8b..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ControllerManager.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_ControllerManager.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_FactoryManager.h"
-
-#include "MyGUI_ControllerEdgeHide.h"
-#include "MyGUI_ControllerFadeAlpha.h"
-#include "MyGUI_ControllerPosition.h"
-
-namespace MyGUI
-{
-
-	MYGUI_INSTANCE_IMPLEMENT( ControllerManager )
-
-	void ControllerManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		WidgetManager::getInstance().registerUnlinker(this);
-
-		const std::string factory_type = "Controller";
-
-		FactoryManager::getInstance().registerFactory<ControllerEdgeHide>(factory_type);
-		FactoryManager::getInstance().registerFactory<ControllerFadeAlpha>(factory_type);
-		FactoryManager::getInstance().registerFactory<ControllerPosition>(factory_type);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void ControllerManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		const std::string factory_type = "Controller";
-
-		FactoryManager::getInstance().unregisterFactory<ControllerEdgeHide>(factory_type);
-		FactoryManager::getInstance().unregisterFactory<ControllerFadeAlpha>(factory_type);
-		FactoryManager::getInstance().unregisterFactory<ControllerPosition>(factory_type);
-
-		WidgetManager::getInstance().unregisterUnlinker(this);
-		clear();
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	void ControllerManager::clear()
-	{
-		for (ListControllerItem::iterator iter=mListItem.begin(); iter!=mListItem.end(); ++iter)
-		{
-			delete (*iter).second;
-		}
-		mListItem.clear();
-	}
-
-	ControllerItem* ControllerManager::createItem(const std::string& _type)
-	{
-		IObject* object = FactoryManager::getInstance().createObject("Controller", _type);
-		return object == nullptr ? nullptr : object->castType<ControllerItem>();
-	}
-
-	void ControllerManager::addItem(Widget* _widget, ControllerItem * _item)
-	{
-		// если виджет первый, то подписываемся на кадры
-		if (0 == mListItem.size()) Gui::getInstance().eventFrameStart += newDelegate(this, &ControllerManager::frameEntered);
-
-		// подготавливаем
-		_item->prepareItem(_widget);
-
-		for (ListControllerItem::iterator iter=mListItem.begin(); iter!=mListItem.end(); ++iter)
-		{
-			// такой уже в списке есть
-			if ((*iter).first == _widget)
-			{
-				if ((*iter).second->getTypeName() == _item->getTypeName())
-				{
-					delete (*iter).second;
-					(*iter).second = _item;
-					return;
-				}
-			}
-		}
-
-		// вставляем в самый конец
-		mListItem.push_back(PairControllerItem(_widget, _item));
-	}
-
-	void ControllerManager::removeItem(Widget* _widget)
-	{
-		// не удаляем из списка, а обнуляем, в цикле он будет удален
-		for (ListControllerItem::iterator iter=mListItem.begin(); iter!=mListItem.end(); ++iter)
-		{
-			if ((*iter).first == _widget) (*iter).first = nullptr;
-		}
-	}
-
-	void ControllerManager::_unlinkWidget(Widget* _widget)
-	{
-		removeItem(_widget);
-	}
-
-	void ControllerManager::frameEntered(float _time)
-	{
-		for (ListControllerItem::iterator iter=mListItem.begin(); iter!=mListItem.end(); /*added in body*/)
-		{
-			if (nullptr == (*iter).first)
-			{
-				delete (*iter).second;
-				// удаляем из списка, итератор не увеличиваем и на новый круг
-				iter = mListItem.erase(iter);
-				continue;
-			}
-
-			if ((*iter).second->addTime((*iter).first, _time))
-			{
-				++iter;
-				continue;
-			}
-
-			// на следующей итерации виджет вылетит из списка
-			(*iter).first = nullptr;
-		}
-
-		if (0 == mListItem.size()) Gui::getInstance().eventFrameStart -= newDelegate(this, &ControllerManager::frameEntered);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ControllerPosition.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ControllerPosition.cpp
deleted file mode 100644
index c4542024b8..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ControllerPosition.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*!
-	@file
-	@author		Evmenov Georgiy
-	@date		03/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ControllerPosition.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_ActionController.h"
-
-namespace MyGUI
-{
-
-	ControllerPosition::ControllerPosition() :
-		mTime(1),
-		mElapsedTime(0),
-		mCalcPosition(false),
-		mCalcSize(false)
-	{
-	}
-
-	void ControllerPosition::setCoord(const IntCoord& _destCoord)
-	{
-		mDestCoord = _destCoord;
-		mCalcPosition = true;
-		mCalcSize = true;
-	}
-
-	void ControllerPosition::setSize(const IntSize& _destSize)
-	{
-		mDestCoord.width = _destSize.width;
-		mDestCoord.height = _destSize.height;
-		mCalcPosition = false;
-		mCalcSize = true;
-	}
-
-	void ControllerPosition::setPosition(const IntPoint& _destPoint)
-	{
-		mDestCoord.left = _destPoint.left;
-		mDestCoord.top = _destPoint.top;
-		mCalcPosition = true;
-		mCalcSize = false;
-	}
-
-	void ControllerPosition::prepareItem(Widget* _widget)
-	{
-		MYGUI_DEBUG_ASSERT(mTime > 0, "Time must be > 0");
-
-		mStartCoord = _widget->getCoord();
-
-		// вызываем пользовательский делегат для подготовки
-		eventPreAction(_widget);
-	}
-
-	bool ControllerPosition::addTime(Widget* _widget, float _time)
-	{
-		mElapsedTime += _time;
-
-		if (mElapsedTime < mTime)
-		{
-			IntCoord coord;
-			eventFrameAction(mStartCoord, mDestCoord, coord, mElapsedTime/mTime);
-			if (mCalcPosition)
-			{
-				if (mCalcSize) _widget->setCoord(coord);
-				else _widget->setPosition(coord.point());
-			}
-			else if (mCalcSize) _widget->setSize(coord.size());
-
-			// вызываем пользовательский делегат обновления
-			eventUpdateAction(_widget);
-
-			return true;
-		}
-
-		// поставить точно в конец
-		IntCoord coord;
-		eventFrameAction(mStartCoord, mDestCoord, coord, 1.0f);
-		if (mCalcPosition)
-		{
-			if (mCalcSize) _widget->setCoord(coord);
-			else _widget->setPosition(coord.point());
-		}
-		else if (mCalcSize) _widget->setSize(coord.size());
-
-		// вызываем пользовательский делегат обновления
-		eventUpdateAction(_widget);
-
-		// вызываем пользовательский делегат пост обработки
-		eventPostAction(_widget);
-
-		return false;
-	}
-
-	void ControllerPosition::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "Time") setTime(utility::parseValue<float>(_value));
-		else if (_key == "Coord") setCoord(utility::parseValue<IntCoord>(_value));
-		else if (_key == "Size") setSize(utility::parseValue<IntSize>(_value));
-		else if (_key == "Position") setPosition(utility::parseValue<IntPoint>(_value));
-		else if (_key == "Function") setFunction(_value);
-	}
-
-	void ControllerPosition::setFunction(const std::string& _value)
-	{
-		if (_value == "Inertional") setAction(MyGUI::newDelegate(action::inertionalMoveFunction));
-		else if (_value == "Accelerated") setAction(MyGUI::newDelegate(action::acceleratedMoveFunction<30>));
-		else if (_value == "Slowed") setAction(MyGUI::newDelegate(action::acceleratedMoveFunction<4>));
-		else if (_value == "Jump") setAction(MyGUI::newDelegate(action::jumpMoveFunction<5>));
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DDContainer.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DDContainer.cpp
deleted file mode 100644
index e59e94e78e..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DDContainer.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		10/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_DDContainer.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_LayerManager.h"
-
-namespace MyGUI
-{
-
-	DDContainer::DDContainer() :
-		mDropResult(false),
-		mNeedDrop(false),
-		mStartDrop(false),
-		mOldDrop(nullptr),
-		mCurrentSender(nullptr),
-		mDropSenderIndex(ITEM_NONE),
-		mDropItem(nullptr),
-		mNeedDragDrop(false),
-		mReseiverContainer(nullptr)
-	{
-	}
-
-	void DDContainer::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	DDContainer::~DDContainer()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void DDContainer::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void DDContainer::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-	}
-
-	void DDContainer::shutdownWidgetSkin()
-	{
-	}
-
-	void DDContainer::onMouseButtonPressed(int _left, int _top, MouseButton _id)
-	{
-		// смещение внутри виджета, куда кликнули мышкой
-		mClickInWidget = InputManager::getInstance().getLastLeftPressed() - getAbsolutePosition();
-
-		mouseButtonPressed(_id);
-
-		Base::onMouseButtonPressed(_left, _top, _id);
-	}
-
-	void DDContainer::onMouseButtonReleased(int _left, int _top, MouseButton _id)
-	{
-		mouseButtonReleased(_id);
-
-		Base::onMouseButtonReleased(_left, _top, _id);
-	}
-
-	void DDContainer::onMouseDrag(int _left, int _top)
-	{
-		mouseDrag();
-
-		Base::onMouseDrag(_left, _top);
-	}
-
-	void DDContainer::mouseButtonPressed(MouseButton _id)
-	{
-		if (MouseButton::Left == _id)
-		{
-			// сбрасываем инфу для дропа
-			mDropResult = false;
-			mOldDrop = nullptr;
-			mDropInfo.reset();
-			mReseiverContainer = nullptr;
-
-			// сбрасываем, чтобы обновился дропный виджет
-			mCurrentSender = nullptr;
-			mStartDrop = false;
-
-		}
-		// если нажата другая клавиша и был дроп то сбрасываем
-		else
-		{
-			endDrop(true);
-		}
-	}
-
-	void DDContainer::mouseButtonReleased(MouseButton _id)
-	{
-		if (MouseButton::Left == _id)
-		{
-			endDrop(false);
-		}
-	}
-
-	void DDContainer::mouseDrag()
-	{
-		// нужно ли обновить данные
-		bool update = false;
-
-		// первый раз дропаем елемент
-		if (!mStartDrop && mDropSenderIndex != ITEM_NONE)
-		{
-			mStartDrop = true;
-			mNeedDrop = false;
-			update = true;
-			// запрос на нужность дропа по индексу
-			mDropInfo.set(this, mDropSenderIndex, nullptr, ITEM_NONE);
-			mReseiverContainer = nullptr;
-
-			eventStartDrag(this, mDropInfo, mNeedDrop);
-
-			if (mNeedDrop)
-			{
-				eventChangeDDState(this, DDItemState::Start);
-				setEnableToolTip(false);
-			}
-			else
-			{
-				// сбрасываем фокус мыши (не обязательно)
-				InputManager::getInstance().resetMouseCaptureWidget();
-			}
-		}
-
-		// дроп не нужен
-		if (!mNeedDrop)
-		{
-			return;
-		}
-
-		// делаем запрос, над кем наша мыша
-		const IntPoint& point = InputManager::getInstance().getMousePosition();
-		Widget* item = LayerManager::getInstance().getWidgetFromPoint(point.left, point.top);
-
-		updateDropItems();
-
-		// если равно, значит уже спрашивали
-		if (mOldDrop == item) return;
-		mOldDrop = item;
-
-		// сбрасываем старую подсветку
-		if (mReseiverContainer) mReseiverContainer->_setContainerItemInfo(mDropInfo.receiver_index, false, false);
-
-		mDropResult = false;
-		mReseiverContainer = nullptr;
-		Widget* receiver = nullptr;
-		size_t receiver_index = ITEM_NONE;
-		// есть виджет под нами
-		if (item)
-		{
-			// делаем запрос на индекс по произвольному виджету
-			item->_getContainer(receiver, receiver_index);
-			// работаем только с контейнерами
-			if (receiver && receiver->isType<DDContainer>())
-			{
-				// подписываемся на информацию о валидности дропа
-				mReseiverContainer = static_cast<DDContainer*>(receiver);
-				mReseiverContainer->_eventInvalideContainer = newDelegate(this, &DDContainer::notifyInvalideDrop);
-
-				// делаем запрос на возможность дропа
-				mDropInfo.set(this, mDropSenderIndex, mReseiverContainer, receiver_index);
-
-				eventRequestDrop(this, mDropInfo, mDropResult);
-
-				// устанавливаем новую подсветку
-				mReseiverContainer->_setContainerItemInfo(mDropInfo.receiver_index, true, mDropResult);
-			}
-			else
-			{
-				mDropInfo.set(this, mDropSenderIndex, nullptr, ITEM_NONE);
-			}
-		}
-		// нет виджета под нами
-		else
-		{
-			mDropInfo.set(this, mDropSenderIndex, nullptr, ITEM_NONE);
-		}
-
-		DDItemState state;
-
-		DDWidgetState data(mDropSenderIndex);
-		data.update = update;
-
-		if (receiver == nullptr)
-		{
-			data.accept = false;
-			data.refuse = false;
-			state = DDItemState::Miss;
-		}
-		else if (mDropResult)
-		{
-			data.accept = true;
-			data.refuse = false;
-			state = DDItemState::Accept;
-		}
-		else
-		{
-			data.accept = false;
-			data.refuse = true;
-			state = DDItemState::Refuse;
-		}
-
-		updateDropItemsState(data);
-
-		eventChangeDDState(this, state);
-	}
-
-	void DDContainer::endDrop(bool _reset)
-	{
-		if (mStartDrop)
-		{
-			removeDropItems();
-
-			// сбрасываем старую подсветку
-			if (mReseiverContainer) mReseiverContainer->_setContainerItemInfo(mDropInfo.receiver_index, false, false);
-
-			if (_reset) mDropResult = false;
-			eventDropResult(this, mDropInfo, mDropResult);
-			eventChangeDDState(this, DDItemState::End);
-			setEnableToolTip(true);
-
-			// сбрасываем инфу для дропа
-			mStartDrop = false;
-			mDropResult = false;
-			mNeedDrop = false;
-			mOldDrop = nullptr;
-			mDropInfo.reset();
-			mReseiverContainer = nullptr;
-			mDropSenderIndex = ITEM_NONE;
-		}
-	}
-
-	void DDContainer::removeDropItems()
-	{
-		mDropItem = nullptr;
-	}
-
-	void DDContainer::updateDropItems()
-	{
-
-		if (mDropItem == nullptr)
-		{
-			requestDragWidgetInfo(this, mDropItem, mDropDimension);
-		}
-
-		const IntPoint& point = InputManager::getInstance().getMousePositionByLayer();
-
-		if (mDropItem)
-		{
-			mDropItem->setCoord(point.left - mClickInWidget.left + mDropDimension.left, point.top - mClickInWidget.top + mDropDimension.top, mDropDimension.width, mDropDimension.height);
-			mDropItem->setVisible(true);
-		}
-	}
-
-	void DDContainer::updateDropItemsState(const DDWidgetState& _state)
-	{
-		eventUpdateDropState(this, mDropItem, _state);
-	}
-
-	void DDContainer::notifyInvalideDrop(DDContainer* _sender)
-	{
-		mouseDrag();
-	}
-
-	void DDContainer::_getContainer(Widget*& _container, size_t& _index)
-	{
-		_container = this;
-		_index = ITEM_NONE;
-	}
-
-	void DDContainer::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "DDContainer_NeedDragDrop") setNeedDragDrop(utility::parseValue<bool>(_value));
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DataFileStream.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DataFileStream.cpp
deleted file mode 100644
index 0248318337..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DataFileStream.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		08/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_DataFileStream.h"
-
-namespace MyGUI
-{
-
-	DataFileStream::DataFileStream() :
-		DataStream(),
-		mFileStream(nullptr)
-	{
-	}
-
-	DataFileStream::DataFileStream(std::ifstream* _stream) :
-		DataStream(_stream),
-		mFileStream(_stream)
-	{
-	}
-
-	DataFileStream::~DataFileStream()
-	{
-		if (mFileStream != nullptr)
-		{
-			mFileStream->close();
-			mFileStream = nullptr;
-		}
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DataManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DataManager.cpp
deleted file mode 100644
index e1a5c7a90f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DataManager.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_DataManager.h"
-
-namespace MyGUI
-{
-
-	const std::string INSTANCE_TYPE_NAME("DataManager");
-
-	DataManager* DataManager::msInstance = 0;
-
-	DataManager::DataManager() :
-		mIsInitialise(false)
-	{
-		MYGUI_ASSERT(0 == msInstance, "instance " << INSTANCE_TYPE_NAME << " is exsist");
-		msInstance = this;
-	}
-
-	DataManager::~DataManager()
-	{
-		msInstance = 0;
-	}
-
-	DataManager* DataManager::getInstancePtr()
-	{
-		return msInstance;
-	}
-
-	DataManager& DataManager::getInstance()
-	{
-		MYGUI_ASSERT(0 != msInstance, "instance " << INSTANCE_TYPE_NAME << " was not created");
-		return (*msInstance);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DataStream.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DataStream.cpp
deleted file mode 100644
index 6a057ec62b..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DataStream.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		08/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_DataStream.h"
-
-namespace MyGUI
-{
-
-	DataStream::DataStream() :
-		mStream(nullptr),
-		mSize((size_t)-1)
-	{
-	}
-
-	DataStream::DataStream(std::istream* _stream) :
-		mStream(_stream),
-		mSize((size_t)-1)
-	{
-	}
-
-	DataStream::~DataStream()
-	{
-	}
-
-	size_t DataStream::size()
-	{
-		if (mStream == nullptr) return 0;
-		if (mSize == (size_t)-1)
-		{
-			mStream->seekg (0, std::ios::end);
-			mSize = mStream->tellg();
-			mStream->seekg (0, std::ios::beg);
-		}
-		return mSize;
-	}
-
-	bool DataStream::eof()
-	{
-		return mStream == nullptr ? true : mStream->eof();
-	}
-
-	void DataStream::readline(std::string& _source, Char _delim)
-	{
-		if (mStream == nullptr) return;
-		std::getline(*mStream, _source, (char)_delim);
-	}
-
-	size_t DataStream::read(void* _buf, size_t _count)
-	{
-		if (mStream == nullptr) return 0;
-		size_t count = std::min(size(), _count);
-		mStream->read((char*)_buf, count);
-		return count;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DynLib.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DynLib.cpp
deleted file mode 100644
index 0b7df33357..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DynLib.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*!
-	@file
-	@author		Denis Koronchik
-	@author		Georgiy Evmenov
-	@date		09/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_DynLib.h"
-
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-#	include <Windows.h>
-#elif MYGUI_PLATFORM == MYGUI_PLATFORM_LINUX
-#       include <dlfcn.h>
-#endif
-
-namespace MyGUI
-{
-	DynLib::DynLib( const std::string& name )
-	{
-		mName = name;
-		mInstance = nullptr;
-	}
-
-
-	DynLib::~DynLib()
-	{
-	}
-
-
-	bool DynLib::load()
-	{
-		// Log library load
-		MYGUI_LOG(Info, "Loading library " << mName);
-
-		#if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
-			//APPLE SPECIFIC CODE HERE
-		#else
-			mInstance = (MYGUI_DYNLIB_HANDLE)MYGUI_DYNLIB_LOAD( mName.c_str() );
-		#endif
-
-		return mInstance != 0;
-	}
-
-
-	void DynLib::unload()
-	{
-		// Log library unload
-		MYGUI_LOG(Info, "Unloading library " << mName);
-		#if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
-			//APPLE SPECIFIC CODE HERE
-		#else
-			if (MYGUI_DYNLIB_UNLOAD(mInstance))
-			{
-				MYGUI_EXCEPT("Could not unload dynamic library '" << mName << "'. System Error: " << dynlibError());
-			}
-		#endif
-	}
-
-	void* DynLib::getSymbol( const std::string& strName ) const throw()
-	{
-		#if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
-			//APPLE SPECIFIC CODE HERE
-			return nullptr;
-		#else
-			return (void*)MYGUI_DYNLIB_GETSYM(mInstance, strName.c_str());
-		#endif
-	}
-
-	std::string DynLib::dynlibError( void )
-	{
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-		LPVOID lpMsgBuf;
-		FormatMessage(
-			FORMAT_MESSAGE_ALLOCATE_BUFFER |
-			FORMAT_MESSAGE_FROM_SYSTEM |
-			FORMAT_MESSAGE_IGNORE_INSERTS,
-			NULL,
-			GetLastError(),
-			MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-			(LPTSTR) &lpMsgBuf,
-			0,
-			NULL
-			);
-		std::string ret = (char*)lpMsgBuf;
-		// Free the buffer.
-		LocalFree( lpMsgBuf );
-		return ret;
-#else
-		return "no unix error function defined yet";
-#endif
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DynLibManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DynLibManager.cpp
deleted file mode 100644
index 46dafbbd55..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_DynLibManager.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*!
-	@file
-	@author		Denis Koronchik
-	@date		09/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_DynLibManager.h"
-
-namespace MyGUI
-{
-
-	MYGUI_INSTANCE_IMPLEMENT( DynLibManager )
-
-	void DynLibManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void DynLibManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		StringDynLibMap::iterator it;
-
-		// unload and delete resources
-		for (it = mLibsMap.begin(); it != mLibsMap.end(); ++it)
-		{
-			it->second->unload();
-			delete it->second;
-		}
-
-		// Empty the list
-		mLibsMap.clear();
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	DynLib* DynLibManager::load(const std::string &fileName)
-	{
-		StringDynLibMap::iterator it = mLibsMap.find(fileName);
-
-		if (it != mLibsMap.end())
-		{
-			return it->second;
-		}
-
-		DynLib *pLib = new DynLib(fileName);
-		if (!pLib->load())
-		{
-			delete pLib;
-			return 0;
-		}
-
-		mLibsMap[fileName] = pLib;
-		return pLib;
-	}
-
-	void DynLibManager::unload(DynLib *library)
-	{
-		StringDynLibMap::iterator it = mLibsMap.find(library->getName());
-
-		if (it != mLibsMap.end())
-			mLibsMap.erase(it);
-
-		library->unload();
-		delete library;
-	}
-}
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Edit.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Edit.cpp
deleted file mode 100644
index 8d1338b917..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Edit.cpp
+++ /dev/null
@@ -1,1947 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_Edit.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_ClipboardManager.h"
-#include "MyGUI_PointerManager.h"
-#include "MyGUI_ISubWidgetText.h"
-#include "MyGUI_VScroll.h"
-#include "MyGUI_HScroll.h"
-
-namespace MyGUI
-{
-
-	const float EDIT_CURSOR_TIMER  = 0.7f;
-	const float EDIT_ACTION_MOUSE_TIMER  = 0.05f;
-	const int EDIT_CURSOR_MAX_POSITION = 100000;
-	const int EDIT_CURSOR_MIN_POSITION = -100000;
-	const size_t EDIT_MAX_UNDO = 128;
-	const size_t EDIT_DEFAULT_MAX_TEXT_LENGTH = 2048;
-	const float EDIT_OFFSET_HORZ_CURSOR = 10.0f; // дополнительное смещение для курсора
-	const int EDIT_ACTION_MOUSE_ZONE = 1500; // область для восприятия мыши за пределом эдита
-	const std::string EDIT_CLIPBOARD_TYPE_TEXT = "Text";
-	const int EDIT_MOUSE_WHEEL = 50; // область для восприятия мыши за пределом эдита
-
-	Edit::Edit() :
-		mIsPressed(false),
-		mIsFocus(false),
-		mCursorActive(false),
-		mCursorTimer(0),
-		mActionMouseTimer(0),
-		mCursorPosition(0),
-		mTextLength(0),
-		mStartSelect(ITEM_NONE),
-		mEndSelect(0),
-		mMouseLeftPressed(false),
-		mModeReadOnly(false),
-		mModePassword(false),
-		mModeMultiline(false),
-		mModeStatic(false),
-		mModeWordWrap(false),
-		mTabPrinting(false),
-		mCharPassword('*'),
-		mOverflowToTheLeft(false),
-		mMaxTextLength(EDIT_DEFAULT_MAX_TEXT_LENGTH)
-	{
-		mChangeContentByResize = true;
-	}
-
-	void Edit::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	Edit::~Edit()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void Edit::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void Edit::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		mOriginalPointer = mPointer;
-
-		// нам нужен фокус клавы
-		mNeedKeyFocus = true;
-
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "Client")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetClient, "widget already assigned");
-				mWidgetClient = (*iter);
-				mWidgetClient->eventMouseSetFocus = newDelegate(this, &Edit::notifyMouseSetFocus);
-				mWidgetClient->eventMouseLostFocus = newDelegate(this, &Edit::notifyMouseLostFocus);
-				mWidgetClient->eventMouseButtonPressed = newDelegate(this, &Edit::notifyMousePressed);
-				mWidgetClient->eventMouseButtonReleased = newDelegate(this, &Edit::notifyMouseReleased);
-				mWidgetClient->eventMouseDrag = newDelegate(this, &Edit::notifyMouseDrag);
-				mWidgetClient->eventMouseButtonDoubleClick = newDelegate(this, &Edit::notifyMouseButtonDoubleClick);
-				mWidgetClient->eventMouseWheel = newDelegate(this, &Edit::notifyMouseWheel);
-				mClient = mWidgetClient;
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "VScroll")
-			{
-				MYGUI_DEBUG_ASSERT( ! mVScroll, "widget already assigned");
-				mVScroll = (*iter)->castType<VScroll>();
-				mVScroll->eventScrollChangePosition = newDelegate(this, &Edit::notifyScrollChangePosition);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "HScroll")
-			{
-				MYGUI_DEBUG_ASSERT( ! mHScroll, "widget already assigned");
-				mHScroll = (*iter)->castType<HScroll>();
-				mHScroll->eventScrollChangePosition = newDelegate(this, &Edit::notifyScrollChangePosition);
-			}
-		}
-
-		//MYGUI_ASSERT(nullptr != mWidgetClient, "Child Widget Client not found in skin (Edit must have Client)");
-
-		if (mWidgetClient != nullptr)
-		{
-			ISubWidgetText* text = mWidgetClient->getSubWidgetText();
-			if (text) mText = text;
-		}
-
-		//MYGUI_ASSERT(nullptr != mText, "TextEdit not found in skin (Edit or Client must have TextEdit)");
-
-		// парсим свойства
-		const MapString& properties = _info->getProperties();
-		if (!properties.empty())
-		{
-			MapString::const_iterator iter = properties.end();
-			if ((iter = properties.find("WordWrap")) != properties.end()) setEditWordWrap(utility::parseValue<bool>(iter->second));
-			else if ((iter = properties.find("InvertSelected")) != properties.end()) setInvertSelected(utility::parseValue<bool>(iter->second));
-		}
-
-		updateScrollSize();
-
-		// первоначальная инициализация курсора
-		if (mText != nullptr)
-			mText->setCursorPosition(mCursorPosition);
-		updateSelectText();
-	}
-
-	void Edit::shutdownWidgetSkin()
-	{
-		mWidgetClient = nullptr;
-		mVScroll= nullptr;
-		mHScroll = nullptr;
-	}
-
-	void Edit::notifyMouseSetFocus(Widget* _sender, Widget* _old)
-	{
-		if ( (_old == mWidgetClient) || (mIsFocus) ) return;
-		mIsFocus = true;
-		updateEditState();
-	}
-
-	void Edit::notifyMouseLostFocus(Widget* _sender, Widget* _new)
-	{
-		if ( (_new == mWidgetClient) || (!mIsFocus) ) return;
-		mIsFocus = false;
-		updateEditState();
-	}
-
-	void Edit::notifyMousePressed(Widget* _sender, int _left, int _top, MouseButton _id)
-	{
-		if (mText == nullptr)
-			return;
-
-		// в статике все недоступно
-		if (mModeStatic)
-			return;
-
-		IntPoint point = InputManager::getInstance().getLastLeftPressed();
-		mCursorPosition = mText->getCursorPosition(point);
-		mText->setCursorPosition(mCursorPosition);
-		mText->setVisibleCursor(true);
-		mCursorTimer = 0;
-		updateSelectText();
-
-		if (_id == MouseButton::Left) mMouseLeftPressed = true;
-	}
-
-	void Edit::notifyMouseReleased(Widget* _sender, int _left, int _top, MouseButton _id)
-	{
-		// сбрасываем всегда
-		mMouseLeftPressed = false;
-	}
-
-	void Edit::notifyMouseDrag(Widget* _sender, int _left, int _top)
-	{
-		if (mText == nullptr)
-			return;
-
-		// в статике все недоступно
-		if (mModeStatic) return;
-
-		// останавливаем курсор
-		mText->setVisibleCursor(true);
-
-		// сбрасываем все таймеры
-		mCursorTimer = 0;
-		mActionMouseTimer = 0;
-
-		size_t Old = mCursorPosition;
-		IntPoint point(_left, _top);
-		mCursorPosition = mText->getCursorPosition(point);
-		if (Old == mCursorPosition) return;
-
-		mText->setCursorPosition(mCursorPosition);
-
-		// если не было выделения
-		if (mStartSelect == ITEM_NONE) mStartSelect = Old;
-
-		// меняем выделение
-		mEndSelect = (size_t)mCursorPosition;
-		if (mStartSelect > mEndSelect) mText->setTextSelection(mEndSelect, mStartSelect);
-		else mText->setTextSelection(mStartSelect, mEndSelect);
-
-	}
-
-	void Edit::notifyMouseButtonDoubleClick(Widget* _sender)
-	{
-		if (mText == nullptr)
-			return;
-
-		// в статике все недоступно
-		if (mModeStatic)
-			return;
-
-		const IntPoint& lastPressed = InputManager::getInstance().getLastLeftPressed();
-
-		size_t cursorPosition = mText->getCursorPosition(lastPressed);
-		mStartSelect = cursorPosition;
-		mEndSelect = cursorPosition;
-
-		UString text = this->getOnlyText();
-		UString::reverse_iterator iterBack = text.rend() - cursorPosition;
-		UString::iterator iterForw = text.begin() + cursorPosition;
-
-		while (iterBack != text.rend())
-		{
-			if (((*iterBack)<265) && (ispunct(*iterBack) || isspace(*iterBack))) break;
-			iterBack++;
-			mStartSelect--;
-		}
-		while (iterForw != text.end())
-		{
-			if (((*iterForw)<265) && (ispunct(*iterForw) || isspace(*iterForw))) break;
-			iterForw++;
-			mEndSelect++;
-		}
-
-		mText->setCursorPosition(mEndSelect);
-		mText->setTextSelection(mStartSelect, mEndSelect);
-	}
-
-	void Edit::onMouseDrag(int _left, int _top)
-	{
-		notifyMouseDrag(nullptr, _left, _top);
-
-		Base::onMouseDrag(_left, _top);
-	}
-
-	void Edit::onKeySetFocus(Widget* _old)
-	{
-		if (!mIsPressed)
-		{
-			mIsPressed = true;
-			updateEditState();
-
-			if (!mModeStatic)
-			{
-				if (mText != nullptr)
-				{
-					mCursorActive = true;
-					Gui::getInstance().eventFrameStart += newDelegate(this, &Edit::frameEntered);
-					mText->setVisibleCursor(true);
-					mText->setSelectBackground(true);
-					mCursorTimer = 0;
-				}
-			}
-		}
-
-		Base::onKeySetFocus(_old);
-	}
-
-	void Edit::onKeyLostFocus(Widget* _new)
-	{
-		if (mIsPressed)
-		{
-			mIsPressed = false;
-			updateEditState();
-
-			if (mText != nullptr)
-			{
-				mCursorActive = false;
-				Gui::getInstance().eventFrameStart -= newDelegate(this, &Edit::frameEntered);
-				mText->setVisibleCursor(false);
-				mText->setSelectBackground(false);
-			}
-		}
-
-		Base::onKeyLostFocus(_new);
-	}
-
-	void Edit::onKeyButtonPressed(KeyCode _key, Char _char)
-	{
-		if (mText == nullptr || mWidgetClient == nullptr)
-		{
-			Base::onKeyButtonPressed(_key, _char);
-			return;
-		}
-
-		// в статическом режиме ничего не доступно
-		if (mModeStatic)
-		{
-			Base::onKeyButtonPressed(_key, _char);
-			return;
-		}
-
-		InputManager& input = InputManager::getInstance();
-
-		mText->setVisibleCursor(true);
-		mCursorTimer = 0.0f;
-
-		if (_key == KeyCode::Escape)
-		{
-			InputManager::getInstance().setKeyFocusWidget(nullptr);
-		}
-		else if (_key == KeyCode::Backspace)
-		{
-			// если нуно то удаляем выделенный текст
-			if (!mModeReadOnly)
-			{
-				if (!deleteTextSelect(true))
-				{
-					// прыгаем на одну назад и удаляем
-					if (mCursorPosition != 0)
-					{
-						mCursorPosition--;
-						eraseText(mCursorPosition, 1, true);
-					}
-				}
-				// отсылаем событие о изменении
-				eventEditTextChange(this);
-			}
-
-		}
-		else if (_key == KeyCode::Delete)
-		{
-			if (input.isShiftPressed()) commandCut();
-			else if (!mModeReadOnly)
-			{
-				// если нуно то удаляем выделенный текст
-				if (!deleteTextSelect(true))
-				{
-					if (mCursorPosition != mTextLength)
-					{
-						eraseText(mCursorPosition, 1, true);
-					}
-				}
-				// отсылаем событие о изменении
-				eventEditTextChange(this);
-			}
-
-		}
-		else if (_key == KeyCode::Insert)
-		{
-			if (input.isShiftPressed()) commandPast();
-			else if (input.isControlPressed()) commandCopy();
-
-		}
-		else if ((_key == KeyCode::Return) || (_key == KeyCode::NumpadEnter))
-		{
-			// работаем только в режиме редактирования
-			if (!mModeReadOnly)
-			{
-				if ((mModeMultiline) && (!input.isControlPressed()))
-				{
-					// попытка объединения двух комманд
-					size_t size = mVectorUndoChangeInfo.size();
-					// непосредственно операции
-					deleteTextSelect(true);
-					insertText(TextIterator::getTextNewLine(), mCursorPosition, true);
-					// проверяем на возможность объединения
-					if ((size+2) == mVectorUndoChangeInfo.size()) commandMerge();
-					// отсылаем событие о изменении
-					eventEditTextChange(this);
-				}
-				// при сингл лайн и и мульти+сонтрол шлем эвент
-				else
-				{
-					eventEditSelectAccept(this);
-				}
-			}
-
-		}
-		else if (_key == KeyCode::ArrowRight)
-		{
-			if ((mCursorPosition) < mTextLength)
-			{
-				mCursorPosition ++;
-				mText->setCursorPosition(mCursorPosition);
-				updateSelectText();
-			}
-			// сбрасываем выделение
-			else if (isTextSelection() && !input.isShiftPressed())
-			{
-				resetSelect();
-			}
-
-		}
-		else if (_key == KeyCode::ArrowLeft)
-		{
-			if (mCursorPosition != 0)
-			{
-				mCursorPosition --;
-				mText->setCursorPosition(mCursorPosition);
-				updateSelectText();
-			}
-			// сбрасываем выделение
-			else if (isTextSelection() && !input.isShiftPressed())
-			{
-				resetSelect();
-			}
-
-		}
-		else if (_key == KeyCode::ArrowUp)
-		{
-			IntPoint point = mText->getCursorPoint(mCursorPosition);
-			point.top -= mText->getFontHeight();
-			size_t old = mCursorPosition;
-			mCursorPosition = mText->getCursorPosition(point);
-			// самая верхняя строчка
-			if ( old == mCursorPosition )
-			{
-				if (mCursorPosition != 0)
-				{
-					mCursorPosition = 0;
-					mText->setCursorPosition(mCursorPosition);
-					updateSelectText();
-				}
-				// сбрасываем выделение
-				else if (isTextSelection() && !input.isShiftPressed())
-				{
-					resetSelect();
-				}
-			}
-			else
-			{
-				mText->setCursorPosition(mCursorPosition);
-				updateSelectText();
-			}
-
-		}
-		else if (_key == KeyCode::ArrowDown)
-		{
-			IntPoint point = mText->getCursorPoint(mCursorPosition);
-			point.top += mText->getFontHeight();
-			size_t old = mCursorPosition;
-			mCursorPosition = mText->getCursorPosition(point);
-			// самая нижняя строчка
-			if ( old == mCursorPosition )
-			{
-				if (mCursorPosition != mTextLength)
-				{
-					mCursorPosition = mTextLength;
-					mText->setCursorPosition(mCursorPosition);
-					updateSelectText();
-				}
-				// сбрасываем выделение
-				else if (isTextSelection() && !input.isShiftPressed())
-				{
-					resetSelect();
-				}
-			}
-			else
-			{
-				mText->setCursorPosition(mCursorPosition);
-				updateSelectText();
-			}
-
-		}
-		else if (_key == KeyCode::Home)
-		{
-			// в начало строки
-			if ( !input.isControlPressed())
-			{
-				IntPoint point = mText->getCursorPoint(mCursorPosition);
-				point.left = EDIT_CURSOR_MIN_POSITION;
-				size_t old = mCursorPosition;
-				mCursorPosition = mText->getCursorPosition(point);
-				if ( old != mCursorPosition )
-				{
-					mText->setCursorPosition(mCursorPosition);
-					updateSelectText();
-				}
-				else if (isTextSelection() && !input.isShiftPressed())
-				{
-					resetSelect();
-				}
-			}
-			// в начало всего текста
-			else
-			{
-				if (0 != mCursorPosition)
-				{
-					mCursorPosition = 0;
-					mText->setCursorPosition(mCursorPosition);
-					updateSelectText();
-				}
-				else if (isTextSelection() && !input.isShiftPressed())
-				{
-					resetSelect();
-				}
-			}
-
-		}
-		else if (_key == KeyCode::End)
-		{
-			// в конец строки
-			if ( !  input.isControlPressed())
-			{
-				IntPoint point = mText->getCursorPoint(mCursorPosition);
-				point.left = EDIT_CURSOR_MAX_POSITION;
-				size_t old = mCursorPosition;
-				mCursorPosition = mText->getCursorPosition(point);
-				if ( old != mCursorPosition )
-				{
-					mText->setCursorPosition(mCursorPosition);
-					updateSelectText();
-				}
-				else if (isTextSelection() && !input.isShiftPressed())
-				{
-					resetSelect();
-				}
-			}
-			// в самый конец
-			else
-			{
-				if (mTextLength != mCursorPosition)
-				{
-					mCursorPosition = mTextLength;
-					mText->setCursorPosition(mCursorPosition);
-					updateSelectText();
-				}
-				else if (isTextSelection() && !input.isShiftPressed())
-				{
-					resetSelect();
-				}
-			}
-
-		}
-		else if (_key == KeyCode::PageUp)
-		{
-			// на размер окна, но не меньше одной строки
-			IntPoint point = mText->getCursorPoint(mCursorPosition);
-			point.top -= (mWidgetClient->getHeight() > mText->getFontHeight()) ? mWidgetClient->getHeight() : mText->getFontHeight();
-			size_t old = mCursorPosition;
-			mCursorPosition = mText->getCursorPosition(point);
-			// самая верхняя строчка
-			if ( old == mCursorPosition )
-			{
-				if (mCursorPosition != 0)
-				{
-					mCursorPosition = 0;
-					mText->setCursorPosition(mCursorPosition);
-					updateSelectText();
-				}
-				// сбрасываем выделение
-				else if (isTextSelection() && !input.isShiftPressed())
-				{
-					resetSelect();
-				}
-			}
-			else
-			{
-				mText->setCursorPosition(mCursorPosition);
-				updateSelectText();
-			}
-
-		}
-		else if (_key == KeyCode::PageDown)
-		{
-			// на размер окна, но не меньше одной строки
-			IntPoint point = mText->getCursorPoint(mCursorPosition);
-			point.top += (mWidgetClient->getHeight() > mText->getFontHeight()) ? mWidgetClient->getHeight() : mText->getFontHeight();
-			size_t old = mCursorPosition;
-			mCursorPosition = mText->getCursorPosition(point);
-			// самая нижняя строчка
-			if ( old == mCursorPosition )
-			{
-				if (mCursorPosition != mTextLength)
-				{
-					mCursorPosition = mTextLength;
-					mText->setCursorPosition(mCursorPosition);
-					updateSelectText();
-				}
-				// сбрасываем выделение
-				else if (isTextSelection() && !input.isShiftPressed())
-				{
-					resetSelect();
-				}
-			}
-			else
-			{
-				mText->setCursorPosition(mCursorPosition);
-				updateSelectText();
-			}
-
-		}
-		else if ((_key == KeyCode::LeftShift) || (_key == KeyCode::RightShift))
-		{
-			// для правильно выделения
-			if (mStartSelect == ITEM_NONE)
-			{
-				mStartSelect = mEndSelect = mCursorPosition;
-			}
-		}
-		else if (_char != 0)
-		{
-
-			// если не нажат контрл, то обрабатываем как текст
-			if (!input.isControlPressed())
-			{
-				if (!mModeReadOnly)
-				{
-					// таб только если нужно
-					if (_char != '\t' || mTabPrinting)
-					{
-						// попытка объединения двух комманд
-						size_t size = mVectorUndoChangeInfo.size();
-						// непосредственно операции
-						deleteTextSelect(true);
-						insertText(TextIterator::getTextCharInfo(_char), mCursorPosition, true);
-						// проверяем на возможность объединения
-						if ((size+2) == mVectorUndoChangeInfo.size()) commandMerge();
-						// отсылаем событие о изменении
-						eventEditTextChange(this);
-					}
-				}
-			}
-			else if (_key == KeyCode::C)
-			{
-				commandCopy();
-
-			}
-			else if (_key == KeyCode::X)
-			{
-				commandCut();
-
-			}
-			else if (_key == KeyCode::V)
-			{
-				commandPast();
-
-			}
-			else if (_key == KeyCode::A)
-			{
-				// выделяем весь текст
-				setTextSelection(0, mTextLength);
-
-			}
-			else if (_key == KeyCode::Z)
-			{
-				// отмена
-				commandUndo();
-
-			}
-			else if (_key == KeyCode::Y)
-			{
-				// повтор
-				commandRedo();
-
-			}
-		}
-
-		Base::onKeyButtonPressed(_key, _char);
-	}
-
-	void Edit::frameEntered(float _frame)
-	{
-		if (mText == nullptr)
-			return;
-
-		// в статике все недоступно
-		if (mModeStatic)
-			return;
-
-		if (mCursorActive)
-		{
-			mCursorTimer += _frame;
-
-			if (mCursorTimer > EDIT_CURSOR_TIMER)
-			{
-				mText->setVisibleCursor(!mText->isVisibleCursor());
-				while (mCursorTimer > EDIT_CURSOR_TIMER) mCursorTimer -= EDIT_CURSOR_TIMER;
-			}
-		}
-
-		// сдвигаем курсор по положению мыши
-		if (mMouseLeftPressed)
-		{
-			mActionMouseTimer += _frame;
-
-			if (mActionMouseTimer > EDIT_ACTION_MOUSE_TIMER)
-			{
-
-				IntPoint mouse = InputManager::getInstance().getMousePositionByLayer();
-				const IntRect& view = mWidgetClient->getAbsoluteRect();
-				mouse.left -= view.left;
-				mouse.top -= view.top;
-				IntPoint point;
-
-				bool action = false;
-
-				// вверх на одну строчку
-				if ( (mouse.top < 0) && (mouse.top > -EDIT_ACTION_MOUSE_ZONE) )
-				{
-					if ( (mouse.left > 0) && (mouse.left <= mWidgetClient->getWidth()) )
-					{
-						point = mText->getCursorPoint(mCursorPosition);
-						point.top -= mText->getFontHeight();
-						action = true;
-					}
-				}
-				// вниз на одну строчку
-				else if ( (mouse.top > mWidgetClient->getHeight()) && (mouse.top < (mWidgetClient->getHeight() + EDIT_ACTION_MOUSE_ZONE)) )
-				{
-					if ( (mouse.left > 0) && (mouse.left <= mWidgetClient->getWidth()) )
-					{
-						point = mText->getCursorPoint(mCursorPosition);
-						point.top += mText->getFontHeight();
-						action = true;
-					}
-				}
-
-				// влево на небольшое расстояние
-				if ( (mouse.left < 0) && (mouse.left > -EDIT_ACTION_MOUSE_ZONE) )
-				{
-					point = mText->getCursorPoint(mCursorPosition);
-					point.left -= (int)EDIT_OFFSET_HORZ_CURSOR;
-					action = true;
-				}
-				// вправо на небольшое расстояние
-				else if ( (mouse.left > mWidgetClient->getWidth()) && (mouse.left < (mWidgetClient->getWidth() + EDIT_ACTION_MOUSE_ZONE)) )
-				{
-					point = mText->getCursorPoint(mCursorPosition);
-					point.left += (int)EDIT_OFFSET_HORZ_CURSOR;
-					action = true;
-				}
-
-				if (action)
-				{
-					size_t old = mCursorPosition;
-					mCursorPosition = mText->getCursorPosition(point);
-
-					if ( old != mCursorPosition )
-					{
-
-						mText->setCursorPosition(mCursorPosition);
-
-						mEndSelect = (size_t)mCursorPosition;
-						if (mStartSelect > mEndSelect) mText->setTextSelection(mEndSelect, mStartSelect);
-						else mText->setTextSelection(mStartSelect, mEndSelect);
-
-						// пытаемся показать курсор
-						updateViewWithCursor();
-					}
-
-				}
-				// если в зону не попадает то сбрасываем
-				else mActionMouseTimer = 0;
-
-				while (mActionMouseTimer > EDIT_ACTION_MOUSE_TIMER) mActionMouseTimer -= EDIT_ACTION_MOUSE_TIMER;
-			}
-
-		} // if (mMouseLeftPressed)
-	}
-
-	void Edit::setTextCursor(size_t _index)
-	{
-		// сбрасываем выделение
-		resetSelect();
-
-		// новая позиция
-		if (_index > mTextLength) _index = mTextLength;
-		if (mCursorPosition == _index) return;
-		mCursorPosition = _index;
-
-		// обновляем по позиции
-		if (mText != nullptr)
-			mText->setCursorPosition(mCursorPosition);
-		updateSelectText();
-	}
-
-	void Edit::setTextSelection(size_t _start, size_t _end)
-	{
-		if (_start > mTextLength) _start = mTextLength;
-		if (_end > mTextLength) _end = mTextLength;
-
-		mStartSelect = _start;
-		mEndSelect = _end;
-
-		if (mText != nullptr)
-		{
-			if (mStartSelect > mEndSelect) mText->setTextSelection(mEndSelect, mStartSelect);
-			else mText->setTextSelection(mStartSelect, mEndSelect);
-		}
-
-		if (mCursorPosition == mEndSelect) return;
-		// курсор на конец выделения
-		mCursorPosition = mEndSelect;
-
-		// обновляем по позиции
-		if (mText != nullptr)
-			mText->setCursorPosition(mCursorPosition);
-	}
-
-	bool Edit::deleteTextSelect(bool _history)
-	{
-		if ( ! isTextSelection()) return false;
-
-		// начало и конец выделения
-		size_t start = getTextSelectionStart();
-		size_t end =  getTextSelectionEnd();
-
-		eraseText(start, end - start, _history);
-
-		return true;
-	}
-
-	void Edit::resetSelect()
-	{
-		if (mStartSelect != ITEM_NONE)
-		{
-			mStartSelect = ITEM_NONE;
-			if (mText != nullptr)
-				mText->setTextSelection(0, 0);
-		}
-	}
-
-	void Edit::commandPosition(size_t _undo, size_t _redo, size_t _length, VectorChangeInfo * _info)
-	{
-		if (_info != nullptr) _info->push_back(TextCommandInfo(_undo, _redo, _length));
-	}
-
-	void Edit::commandMerge()
-	{
-		if (mVectorUndoChangeInfo.size() < 2) return; // на всякий
-		// сохраняем последние набор отмен
-		VectorChangeInfo info = mVectorUndoChangeInfo.back();
-		mVectorUndoChangeInfo.pop_back();
-
-		// объединяем последовательности
-		for (VectorChangeInfo::iterator iter=info.begin(); iter!=info.end(); ++iter)
-		{
-			mVectorUndoChangeInfo.back().push_back((*iter));
-		}
-	}
-
-	bool Edit::commandUndo()
-	{
-		if (mVectorUndoChangeInfo.empty()) return false;
-
-		// сбрасываем выделение
-		resetSelect();
-
-		// сохраняем последние набор отмен
-		VectorChangeInfo info = mVectorUndoChangeInfo.back();
-		// перекидываем последний набор отмен
-		mVectorUndoChangeInfo.pop_back();
-		mVectorRedoChangeInfo.push_back(info);
-
-		// берем текст для издевательств
-		UString text = getRealString();
-
-		// восстанавливаем последовательность
-		for (VectorChangeInfo::reverse_iterator iter=info.rbegin(); iter!=info.rend(); iter++)
-		{
-
-			if ((*iter).type == TextCommandInfo::COMMAND_INSERT) text.erase((*iter).start, (*iter).text.size());
-			else if ((*iter).type == TextCommandInfo::COMMAND_ERASE) text.insert((*iter).start, (*iter).text);
-			else
-			{
-				mCursorPosition = (*iter).undo;
-				mTextLength = (*iter).length;
-			}
-		}
-
-		// возвращаем текст
-		setRealString(text);
-
-		// обновляем по позиции
-		if (mText != nullptr)
-			mText->setCursorPosition(mCursorPosition);
-		updateSelectText();
-
-		// отсылаем событие о изменении
-		eventEditTextChange(this);
-
-		return true;
-	}
-
-	bool Edit::commandRedo()
-	{
-		if (mVectorRedoChangeInfo.empty()) return false;
-
-		// сбрасываем выделение
-		resetSelect();
-
-		// сохраняем последние набор отмен
-		VectorChangeInfo info = mVectorRedoChangeInfo.back();
-		// перекидываем последний набор отмен
-		mVectorRedoChangeInfo.pop_back();
-		mVectorUndoChangeInfo.push_back(info);
-
-		// берем текст для издевательств
-		UString text = getRealString();
-
-		// восстанавливаем последовательность
-		for (VectorChangeInfo::iterator iter=info.begin(); iter!=info.end(); ++iter)
-		{
-
-			if ((*iter).type == TextCommandInfo::COMMAND_INSERT) text.insert((*iter).start, (*iter).text);
-			else if ((*iter).type == TextCommandInfo::COMMAND_ERASE) text.erase((*iter).start, (*iter).text.size());
-			else
-			{
-				mCursorPosition = (*iter).redo;
-				mTextLength = (*iter).length;
-			}
-
-		}
-
-		// возвращаем текст
-		setRealString(text);
-
-		// обновляем по позиции
-		if (mText != nullptr)
-			mText->setCursorPosition(mCursorPosition);
-		updateSelectText();
-
-		// отсылаем событие о изменении
-		eventEditTextChange(this);
-
-		return true;
-	}
-
-	void Edit::saveInHistory(VectorChangeInfo * _info)
-	{
-		if (_info == nullptr) return;
-		// если нет информации об изменении
-		if ( _info->empty() ) return;
-		if ( (_info->size() == 1) && (_info->back().type == TextCommandInfo::COMMAND_POSITION)) return;
-
-		mVectorUndoChangeInfo.push_back(*_info);
-		// проверяем на максимальный размер
-		if (mVectorUndoChangeInfo.size() > EDIT_MAX_UNDO)
-			mVectorUndoChangeInfo.pop_front();
-	}
-
-	// возвращает текст
-	UString Edit::getTextInterval(size_t _start, size_t _count)
-	{
-		// подстраховка
-		if (_start > mTextLength) _start = mTextLength;
-		// конец диапазона
-		size_t end = _start + _count;
-
-		// итератор нашей строки
-		TextIterator iterator(getRealString());
-
-		// дефолтный цвет
-		UString colour = mText == nullptr ? "" : TextIterator::convertTagColour(mText->getTextColour());
-
-		// нужно ли вставлять цвет
-		bool need_colour = true;
-
-		// цикл прохода по строке
-		while (iterator.moveNext())
-		{
-			// текущаяя позиция
-			size_t pos = iterator.getPosition();
-
-			// еще рано
-			if (pos < _start)
-			{
-				// берем цвет из позиции и запоминаем
-				iterator.getTagColour(colour);
-
-				continue;
-			}
-
-			// проверяем на надобность начального тега
-			else if (pos == _start)
-			{
-				need_colour = ! iterator.getTagColour(colour);
-				// сохраняем место откуда начинается
-				iterator.saveStartPoint();
-
-			}
-
-			// а теперь просто до конца диапазона
-			else if (pos == end) break;
-
-		}
-
-		// возвращаем строку
-		if (need_colour) return colour + iterator.getFromStart();
-		return iterator.getFromStart();
-	}
-
-	// выделяет цветом диапазон
-	void Edit::_setTextColour(size_t _start, size_t _count, const Colour& _colour, bool _history)
-	{
-		// при изменениях сразу сбрасываем повтор
-		commandResetRedo();
-
-		// история изменений
-		VectorChangeInfo * history = nullptr;
-		if (_history) history = new VectorChangeInfo();
-
-		// конец диапазона
-		size_t end = _start + _count;
-
-		// итератор нашей строки
-		TextIterator iterator(getRealString(), history);
-
-		// дефолтный цвет
-		UString colour = mText == nullptr ? "" : TextIterator::convertTagColour(mText->getTextColour());
-
-		// цикл прохода по строке
-		while (iterator.moveNext())
-		{
-
-			// текущаяя позиция
-			size_t pos = iterator.getPosition();
-
-			// берем цвет из позиции и запоминаем
-			iterator.getTagColour(colour);
-
-			// еще рано
-			if (pos < _start) continue;
-
-			// ставим начальный тег
-			else if (pos == _start)
-				iterator.setTagColour(_colour);
-
-			// внутри диапазона очищаем все
-			else if (pos < end)
-				iterator.clearTagColour();
-
-			// на конец ставим последний найденный или дефолтный
-			else if (pos == end)
-			{
-				iterator.setTagColour(colour);
-				// и выходим из цикла
-				break;
-			}
-
-		}
-
-		// сохраняем позицию для восстановления курсора
-		commandPosition(_start, _start+_count, mTextLength, history);
-
-		// запоминаем в историю
-		if (_history)
-		{
-			saveInHistory(history);
-			delete history;
-		}
-		// сбрасываем историю
-		else commandResetHistory();
-
-		// и возвращаем строку на место
-		setRealString(iterator.getText());
-
-	}
-
-	void Edit::setTextSelectColour(const Colour& _colour, bool _history)
-	{
-		// нужно выделение
-		if ( !isTextSelection()) return;
-		// начало и конец выделения
-		size_t start = getTextSelectionStart();
-		size_t end =  getTextSelectionEnd();
-		_setTextColour(start, end-start, _colour, _history);
-	}
-
-	UString Edit::getTextSelection()
-	{
-		if ( !isTextSelection()) return "";
-		size_t start = getTextSelectionStart();
-		size_t end =  getTextSelectionEnd();
-		return getTextInterval(start, end-start);
-	}
-
-	void Edit::setEditPassword(bool _password)
-	{
-		if (mModePassword == _password) return;
-		mModePassword = _password;
-		if (mModePassword)
-		{
-			if (mText != nullptr)
-			{
-				mPasswordText = mText->getCaption();
-				mText->setCaption(UString(mTextLength, '*'));
-			}
-		}
-		else
-		{
-			if (mText != nullptr)
-			{
-				mText->setCaption(mPasswordText);
-				mPasswordText.clear();
-			}
-		}
-		// обновляем по размерам
-		updateView();
-		// сбрасываем историю
-		commandResetHistory();
-	}
-
-	void Edit::setText(const UString& _caption, bool _history)
-	{
-		// сбрасываем выделение
-		resetSelect();
-
-		// история изменений
-		VectorChangeInfo * history = nullptr;
-		if (_history) history = new VectorChangeInfo();
-
-		// итератор нашей строки
-		TextIterator iterator(getRealString(), history);
-
-		// вставляем текст
-		iterator.setText(_caption, mModeMultiline || mModeWordWrap);
-
-		if (mOverflowToTheLeft)
-		{
-			iterator.cutMaxLengthFromBeginning(mMaxTextLength);
-		}
-		else
-		{
-			// обрезаем по максимальной длинне
-			iterator.cutMaxLength(mMaxTextLength);
-		}
-
-		// запоминаем размер строки
-		size_t old = mTextLength;
-		// новая позиция и положение на конец вставки
-		mCursorPosition = mTextLength = iterator.getSize();
-
-		// сохраняем позицию для восстановления курсора
-		commandPosition(0, mTextLength, old, history);
-
-		// запоминаем в историю
-		if (_history)
-		{
-			saveInHistory(history);
-			delete history;
-		}
-		// сбрасываем историю
-		else commandResetHistory();
-
-		// и возвращаем строку на место
-		setRealString(iterator.getText());
-
-		// обновляем по позиции
-		if (mText != nullptr)
-			mText->setCursorPosition(mCursorPosition);
-		updateSelectText();
-	}
-
-	void Edit::insertText(const UString& _text, size_t _start, bool _history)
-	{
-		// сбрасываем выделение
-		resetSelect();
-
-		// если строка пустая, или размер максимален
-		if (_text.empty()) return;
-
-		if ((mOverflowToTheLeft == false) && (mTextLength == mMaxTextLength)) return;
-
-		// история изменений
-		VectorChangeInfo * history = nullptr;
-		if (_history) history = new VectorChangeInfo();
-
-		// итератор нашей строки
-		TextIterator iterator(getRealString(), history);
-
-		// дефолтный цвет
-		UString colour = mText == nullptr ? "" : TextIterator::convertTagColour(mText->getTextColour());
-		// нужен ли тег текста
-		// потом переделать через TextIterator чтобы отвязать понятие тег от эдита
-		bool need_colour = ( (_text.size() > 6) && (_text[0] == L'#') && (_text[1] != L'#') );
-
-		// цикл прохода по строке
-		while (iterator.moveNext())
-		{
-
-			// текущаяя позиция
-			size_t pos = iterator.getPosition();
-
-			// текущий цвет
-			if (need_colour) iterator.getTagColour(colour);
-
-			// если дошли то выходим
-			if (pos == _start) break;
-
-		}
-
-		// если нужен цвет то вставляем
-		if (need_colour) iterator.setTagColour(colour);
-
-		// а теперь вставляем строку
-		iterator.insertText(_text, mModeMultiline || mModeWordWrap);
-
-		if (mOverflowToTheLeft)
-		{
-			iterator.cutMaxLengthFromBeginning(mMaxTextLength);
-		}
-		else
-		{
-			// обрезаем по максимальной длинне
-			iterator.cutMaxLength(mMaxTextLength);
-		}
-
-		// запоминаем размер строки
-		size_t old = mTextLength;
-		// новая позиция и положение на конец вставки
-		mTextLength = iterator.getSize();
-		mCursorPosition += mTextLength - old;
-
-		// сохраняем позицию для восстановления курсора
-		commandPosition(_start, _start + mTextLength - old, old, history);
-
-		// запоминаем в историю
-		if (_history)
-		{
-			saveInHistory(history);
-			delete history;
-		}
-		// сбрасываем историю
-		else commandResetHistory();
-
-		// и возвращаем строку на место
-		setRealString(iterator.getText());
-
-		// обновляем по позиции
-		if (mText != nullptr)
-			mText->setCursorPosition(mCursorPosition);
-		updateSelectText();
-	}
-
-	void Edit::eraseText(size_t _start, size_t _count, bool _history)
-	{
-		// чета маловато
-		if (_count == 0) return;
-
-		// сбрасываем выделение
-		resetSelect();
-
-		// история изменений
-		VectorChangeInfo * history = nullptr;
-		if (_history) history = new VectorChangeInfo();
-
-		// итератор нашей строки
-		TextIterator iterator(getRealString(), history);
-
-		// дефолтный цвет
-		UString colour;
-		// конец диапазона
-		size_t end = _start + _count;
-		bool need_colour = false;
-
-		// цикл прохода по строке
-		while (iterator.moveNext())
-		{
-
-			// текущаяя позиция
-			size_t pos = iterator.getPosition();
-
-			// еще рано
-			if (pos < _start)
-			{
-				// берем цвет из позиции и запоминаем
-				iterator.getTagColour(colour);
-				continue;
-			}
-
-			// сохраняем место откуда начинается
-			else if (pos == _start)
-			{
-				// если до диапазона был цвет, то нужно закрыть тег
-				if ( ! colour.empty())
-				{
-					need_colour = true;
-					colour.clear();
-				}
-				// берем цвет из позиции и запоминаем
-				iterator.getTagColour(colour);
-				iterator.saveStartPoint();
-			}
-
-			// внутри диапазона
-			else if (pos < end)
-			{
-				// берем цвет из позиции и запоминаем
-				iterator.getTagColour(colour);
-			}
-
-			// окончание диапазона
-			else if (pos == end)
-			{
-				// нужно ставить тег или нет
-				if ( ! colour.empty()) need_colour = true;
-				if ( iterator.getTagColour(colour)) need_colour = false;
-
-				break;
-			}
-
-		}
-
-		// удаляем диапазон
-		iterator.eraseFromStart();
-		// и вставляем последний цвет
-		if (need_colour) iterator.setTagColour(colour);
-
-		// сохраняем позицию для восстановления курсора
-		commandPosition(_start + _count, _start, mTextLength, history);
-
-		// на месте удаленного
-		mCursorPosition = _start;
-		mTextLength -= _count;
-
-		// запоминаем в историю
-		if (_history)
-		{
-			saveInHistory(history);
-			delete history;
-		}
-		// сбрасываем историю
-		else commandResetHistory();
-
-		// и возвращаем строку на место
-		setRealString(iterator.getText());
-
-		// обновляем по позиции
-		if (mText != nullptr)
-			mText->setCursorPosition(mCursorPosition);
-		updateSelectText();
-	}
-
-	void Edit::commandCut()
-	{
-		// вырезаем в буфер обмена
-		if ( isTextSelection() && (!mModePassword) )
-		{
-			ClipboardManager::getInstance().setClipboardData(EDIT_CLIPBOARD_TYPE_TEXT, getTextSelection());
-			if (!mModeReadOnly)
-			{
-				deleteTextSelect(true);
-				// отсылаем событие о изменении
-				eventEditTextChange(this);
-			}
-		}
-		else ClipboardManager::getInstance().clearClipboardData(EDIT_CLIPBOARD_TYPE_TEXT);
-	}
-
-	void Edit::commandCopy()
-	{
-		// копируем в буфер обмена
-		if ( isTextSelection() && (!mModePassword) ) ClipboardManager::getInstance().setClipboardData(EDIT_CLIPBOARD_TYPE_TEXT, getTextSelection());
-		else ClipboardManager::getInstance().clearClipboardData(EDIT_CLIPBOARD_TYPE_TEXT);
-	}
-
-	void Edit::commandPast()
-	{
-		// копируем из буфера обмена
-		std::string clipboard = ClipboardManager::getInstance().getClipboardData(EDIT_CLIPBOARD_TYPE_TEXT);
-		if ( (!mModeReadOnly) && ( !clipboard.empty()) )
-		{
-			// попытка объединения двух комманд
-			size_t size = mVectorUndoChangeInfo.size();
-			// непосредственно операции
-			deleteTextSelect(true);
-			insertText(clipboard, mCursorPosition, true);
-			// проверяем на возможность объединения
-			if ((size+2) == mVectorUndoChangeInfo.size()) commandMerge();
-			// отсылаем событие о изменении
-			eventEditTextChange(this);
-		}
-	}
-
-	const UString& Edit::getRealString()
-	{
-		if (mModePassword) return mPasswordText;
-		else if (mText == nullptr) return mPasswordText;
-
-		return mText->getCaption();
-	}
-
-	void Edit::setRealString(const UString& _caption)
-	{
-		if (mModePassword)
-		{
-			mPasswordText = _caption;
-			if (mText != nullptr)
-				mText->setCaption(UString(mTextLength, mCharPassword));
-		}
-		else
-		{
-			if (mText != nullptr)
-				mText->setCaption(_caption);
-		}
-	}
-
-	void Edit::setPasswordChar(Char _char)
-	{
-		mCharPassword = _char;
-		if (mModePassword)
-		{
-			if (mText != nullptr)
-				mText->setCaption(UString(mTextLength, mCharPassword));
-		}
-	}
-
-	void Edit::updateEditState()
-	{
-		if (!mEnabled) setState("disabled");
-		else if (mIsPressed)
-		{
-			if (mIsFocus) setState("pushed");
-			else setState("normal_checked");
-		}
-		else if (mIsFocus) setState("highlighted");
-		else setState("normal");
-	}
-
-	void Edit::setPosition(const IntPoint& _point)
-	{
-		Base::setPosition(_point);
-	}
-
-	void Edit::eraseView()
-	{
-		// если перенос, то сбрасываем размер текста
-		if (mModeWordWrap)
-		{
-			if (mText != nullptr)
-				mText->setWordWrap(true);
-		}
-
-		updateView();
-	}
-
-	void Edit::setSize(const IntSize& _size)
-	{
-		Base::setSize(_size);
-
-		eraseView();
-	}
-
-	void Edit::setCoord(const IntCoord& _coord)
-	{
-		Base::setCoord(_coord);
-
-		eraseView();
-	}
-
-	void Edit::setCaption(const UString& _value)
-	{
-		setText(_value, false);
-	}
-
-	const UString& Edit::getCaption()
-	{
-		return getRealString();
-	}
-
-	void Edit::updateSelectText()
-	{
-		if (!mModeStatic)
-		{
-
-			InputManager& input = InputManager::getInstance();
-			if ( (input.isShiftPressed()) && (mStartSelect != ITEM_NONE) )
-			{
-				// меняем выделение
-				mEndSelect = (size_t)mCursorPosition;
-				if (mText != nullptr)
-				{
-					if (mStartSelect > mEndSelect) mText->setTextSelection(mEndSelect, mStartSelect);
-					else mText->setTextSelection(mStartSelect, mEndSelect);
-				}
-
-			}
-			else if (mStartSelect != ITEM_NONE)
-			{
-				// сбрасываем шифт
-				mStartSelect = ITEM_NONE;
-				if (mText != nullptr)
-					mText->setTextSelection(0, 0);
-			}
-		}
-
-		// пытаемся показать курсор
-		updateViewWithCursor();
-	}
-
-	void Edit::setTextAlign(Align _align)
-	{
-		Base::setTextAlign(_align);
-
-		// так как мы сами рулим смещениями
-		updateView();
-	}
-
-	void Edit::notifyScrollChangePosition(VScroll* _sender, size_t _position)
-	{
-		if (mText == nullptr)
-			return;
-
-		if (_sender == mVScroll)
-		{
-			IntPoint point = mText->getViewOffset();
-			point.top = _position;
-			mText->setViewOffset(point);
-		}
-		else if (_sender == mHScroll)
-		{
-			IntPoint point = mText->getViewOffset();
-			point.left = _position;
-			mText->setViewOffset(point);
-		}
-	}
-
-	void Edit::notifyMouseWheel(Widget* _sender, int _rel)
-	{
-		if (mText == nullptr)
-			return;
-
-		if (mVRange != 0)
-		{
-			IntPoint point = mText->getViewOffset();
-			int offset = point.top;
-			if (_rel < 0) offset += EDIT_MOUSE_WHEEL;
-			else  offset -= EDIT_MOUSE_WHEEL;
-
-			if (offset < 0) offset = 0;
-			else if (offset > (int)mVRange) offset = mVRange;
-
-			if (offset != point.top)
-			{
-				point.top = offset;
-				if (mVScroll != nullptr)
-					mVScroll->setScrollPosition(offset);
-				mText->setViewOffset(point);
-			}
-		}
-		else if (mHRange != 0)
-		{
-			IntPoint point = mText->getViewOffset();
-			int offset = point.left;
-			if (_rel < 0) offset += EDIT_MOUSE_WHEEL;
-			else  offset -= EDIT_MOUSE_WHEEL;
-
-			if (offset < 0) offset = 0;
-			else if (offset > (int)mHRange) offset = mHRange;
-
-			if (offset != point.left)
-			{
-				point.left = offset;
-				if (mHScroll != nullptr)
-					mHScroll->setScrollPosition(offset);
-				mText->setViewOffset(point);
-			}
-		}
-	}
-
-	void Edit::setEditWordWrap(bool _value)
-	{
-		mModeWordWrap = _value;
-		if (mText != nullptr)
-			mText->setWordWrap(mModeWordWrap);
-
-		eraseView();
-	}
-
-	void Edit::setFontName(const std::string& _value)
-	{
-		Base::setFontName(_value);
-
-		eraseView();
-	}
-
-	void Edit::setFontHeight(int _value)
-	{
-		Base::setFontHeight(_value);
-
-		eraseView();
-	}
-
-	void Edit::updateView()
-	{
-		updateScrollSize();
-		updateScrollPosition();
-	}
-
-	void Edit::updateViewWithCursor()
-	{
-		updateScrollSize();
-		updateCursorPosition();
-		updateScrollPosition();
-	}
-
-	void Edit::updateCursorPosition()
-	{
-		if (mText == nullptr || mWidgetClient == nullptr)
-			return;
-
-		// размер контекста текста
-		IntSize textSize = mText->getTextSize();
-
-		// текущее смещение контекста текста
-		IntPoint point = mText->getViewOffset();
-		// расчетное смещение
-		IntPoint offset = point;
-
-		// абсолютные координаты курсора
-		IntRect cursor = mText->getCursorRect(mCursorPosition);
-		cursor.right ++;
-
-		// абсолютные координаты вью
-		const IntRect& view = mWidgetClient->getAbsoluteRect();
-
-		// проверяем и показываем курсор
-		if (!view.inside(cursor))
-		{
-			// горизонтальное смещение
-			// FIXME проверить, помоему просто >
-			if (textSize.width >= view.width())
-			{
-				if (cursor.left < view.left)
-				{
-					offset.left = point.left - (view.left - cursor.left);
-					// добавляем смещение, только если курсор не перепрыгнет
-					if ((float(view.width()) - EDIT_OFFSET_HORZ_CURSOR) > EDIT_OFFSET_HORZ_CURSOR) offset.left -= int(EDIT_OFFSET_HORZ_CURSOR);
-				}
-				else if (cursor.right > view.right)
-				{
-					offset.left = point.left + (cursor.right - view.right);
-					// добавляем смещение, только если курсор не перепрыгнет
-					if ((float(view.width()) - EDIT_OFFSET_HORZ_CURSOR) > EDIT_OFFSET_HORZ_CURSOR) offset.left += int(EDIT_OFFSET_HORZ_CURSOR);
-				}
-			}
-
-			// вертикальное смещение
-			// FIXME проверить, помоему просто >
-			if (textSize.height >= view.height())
-			{
-				if (cursor.top < view.top)
-				{
-					offset.top = point.top - (view.top - cursor.top);
-				}
-				else if (cursor.bottom > view.bottom)
-				{
-					offset.top = point.top + (cursor.bottom - view.bottom);
-				}
-			}
-
-		}
-
-		if (offset != point)
-		{
-			mText->setViewOffset(offset);
-			// обновить скролы
-			if (mVScroll != nullptr)
-				mVScroll->setScrollPosition(offset.top);
-			if (mHScroll != nullptr)
-				mHScroll->setScrollPosition(offset.left);
-		}
-	}
-
-	void Edit::setContentPosition(const IntPoint& _point)
-	{
-		if (mText != nullptr)
-			mText->setViewOffset(_point);
-	}
-
-	IntSize Edit::getViewSize() const
-	{
-		return mWidgetClient == nullptr ? getSize() : mWidgetClient->getSize();
-	}
-
-	IntSize Edit::getContentSize()
-	{
-		return mText == nullptr ? IntSize() : mText->getTextSize();
-	}
-
-	size_t Edit::getVScrollPage()
-	{
-		return (size_t)getFontHeight();
-	}
-
-	size_t Edit::getHScrollPage()
-	{
-		return (size_t)getFontHeight();
-	}
-
-	IntPoint Edit::getContentPosition()
-	{
-		return mText == nullptr ? IntPoint() : mText->getViewOffset();
-	}
-
-	Align Edit::getContentAlign()
-	{
-		return mText == nullptr ? Align::Default : mText->getTextAlign();
-	}
-
-	void Edit::setTextIntervalColour(size_t _start, size_t _count, const Colour& _colour)
-	{
-		_setTextColour(_start, _count, _colour, false);
-	}
-
-	size_t Edit::getTextSelectionStart()
-	{
-		return (mStartSelect == ITEM_NONE) ? ITEM_NONE : (mStartSelect > mEndSelect ? mEndSelect : mStartSelect);
-	}
-
-	size_t Edit::getTextSelectionEnd()
-	{
-		return (mStartSelect == ITEM_NONE) ? ITEM_NONE : (mStartSelect > mEndSelect ? mStartSelect : mEndSelect);
-	}
-
-	bool Edit::isTextSelection()
-	{
-		return ( (mStartSelect != ITEM_NONE) && (mStartSelect != mEndSelect) );
-	}
-
-	void Edit::deleteTextSelection()
-	{
-		deleteTextSelect(false);
-	}
-
-	void Edit::setTextSelectionColour(const Colour& _colour)
-	{
-		setTextSelectColour(_colour, false);
-	}
-
-	size_t Edit::getTextSelectionLength()
-	{
-		return mEndSelect - mStartSelect;
-	}
-
-	void Edit::setOnlyText(const UString& _text)
-	{
-		setText(TextIterator::toTagsString(_text), false);
-	}
-
-	UString Edit::getOnlyText()
-	{
-		return TextIterator::getOnlyText(getRealString());
-	}
-
-	void Edit::insertText(const UString& _text, size_t _index)
-	{
-		insertText(_text, _index, false);
-	}
-
-	void Edit::addText(const UString& _text)
-	{
-		insertText(_text, ITEM_NONE, false);
-	}
-
-	void Edit::eraseText(size_t _start, size_t _count)
-	{
-		eraseText(_start, _count, false);
-	}
-
-	void Edit::setEditReadOnly(bool _read)
-	{
-		mModeReadOnly = _read;
-		// сбрасываем историю
-		commandResetHistory();
-	}
-
-	void Edit::setEditMultiLine(bool _multi)
-	{
-		mModeMultiline = _multi;
-		// на всякий, для уберания переносов
-		if (!mModeMultiline)
-		{
-			setText(getRealString(), false);
-		}
-		// обновляем по размерам
-		else updateView();
-		// сбрасываем историю
-		commandResetHistory();
-	}
-
-	void Edit::setEditStatic(bool _static)
-	{
-		mModeStatic = _static;
-		resetSelect();
-
-		if (mWidgetClient != nullptr)
-		{
-			if (mModeStatic) mWidgetClient->setPointer("");
-			else mWidgetClient->setPointer(mOriginalPointer);
-		}
-	}
-
-	void Edit::setPasswordChar(const UString& _char)
-	{
-		if (!_char.empty()) setPasswordChar(_char[0]);
-	}
-
-	void Edit::setVisibleVScroll(bool _value)
-	{
-		mVisibleVScroll = _value;
-		updateView();
-	}
-
-	void Edit::setVisibleHScroll(bool _value)
-	{
-		mVisibleHScroll = _value;
-		updateView();
-	}
-
-	void Edit::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "Edit_CursorPosition") setTextCursor(utility::parseValue<size_t>(_value));
-		else if (_key == "Edit_TextSelect") setTextSelection(utility::parseValue< types::TSize<size_t> >(_value).width, utility::parseValue< types::TSize<size_t> >(_value).height);
-		else if (_key == "Edit_ReadOnly") setEditReadOnly(utility::parseValue<bool>(_value));
-		else if (_key == "Edit_Password") setEditPassword(utility::parseValue<bool>(_value));
-		else if (_key == "Edit_MultiLine") setEditMultiLine(utility::parseValue<bool>(_value));
-		else if (_key == "Edit_PasswordChar") setPasswordChar(_value);
-		else if (_key == "Edit_MaxTextLength") setMaxTextLength(utility::parseValue<size_t>(_value));
-		else if (_key == "Edit_OverflowToTheLeft") setOverflowToTheLeft(utility::parseValue<bool>(_value));
-		else if (_key == "Edit_Static") setEditStatic(utility::parseValue<bool>(_value));
-		else if (_key == "Edit_VisibleVScroll") setVisibleVScroll(utility::parseValue<bool>(_value));
-		else if (_key == "Edit_VisibleHScroll") setVisibleHScroll(utility::parseValue<bool>(_value));
-		else if (_key == "Edit_WordWrap") setEditWordWrap(utility::parseValue<bool>(_value));
-		else if (_key == "Edit_TabPrinting") setTabPrinting(utility::parseValue<bool>(_value));
-		else if (_key == "Edit_InvertSelected") setInvertSelected(utility::parseValue<bool>(_value));
-
-#ifndef MYGUI_DONT_USE_OBSOLETE
-		else if (_key == "Edit_ShowVScroll")
-		{
-			MYGUI_LOG(Warning, "Edit_ShowVScroll is obsolete, use Edit_VisibleVScroll");
-			setVisibleVScroll(utility::parseValue<bool>(_value));
-		}
-		else if (_key == "Edit_ShowHScroll")
-		{
-			MYGUI_LOG(Warning, "Edit_ShowHScroll is obsolete, use Edit_VisibleHScroll");
-			setVisibleHScroll(utility::parseValue<bool>(_value));
-		}
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-	size_t Edit::getVScrollRange()
-	{
-		return mVRange + 1;
-	}
-
-	size_t Edit::getVScrollPosition()
-	{
-		return mText == nullptr ? 0 : mText->getViewOffset().top;
-	}
-
-	void Edit::setVScrollPosition(size_t _index)
-	{
-		if (mText == nullptr)
-			return;
-
-		if (_index > mVRange)
-			_index = mVRange;
-
-		IntPoint point = mText->getViewOffset();
-		point.top = _index;
-
-		mText->setViewOffset(point);
-		// обновить скролы
-		if (mVScroll != nullptr)
-			mVScroll->setScrollPosition(point.top);
-	}
-
-	size_t Edit::getHScrollRange()
-	{
-		return mHRange + 1;
-	}
-
-	size_t Edit::getHScrollPosition()
-	{
-		return mText == nullptr ? 0 : mText->getViewOffset().left;
-	}
-
-	void Edit::setHScrollPosition(size_t _index)
-	{
-		if (mText == nullptr)
-			return;
-
-		if (_index > mHRange)
-			_index = mHRange;
-
-		IntPoint point = mText->getViewOffset();
-		point.left = _index;
-
-		mText->setViewOffset(point);
-		// обновить скролы
-		if (mHScroll != nullptr)
-			mHScroll->setScrollPosition(point.left);
-	}
-
-	bool Edit::getInvertSelected()
-	{
-		return mText == nullptr ? false : mText->getInvertSelected();
-	}
-
-	void Edit::setInvertSelected(bool _value)
-	{
-		if (mText != nullptr)
-			mText->setInvertSelected(_value);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_EditText.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_EditText.cpp
deleted file mode 100644
index 40a0540d27..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_EditText.cpp
+++ /dev/null
@@ -1,834 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_EditText.h"
-#include "MyGUI_RenderItem.h"
-#include "MyGUI_FontManager.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_LanguageManager.h"
-#include "MyGUI_TextIterator.h"
-#include "MyGUI_IRenderTarget.h"
-#include "MyGUI_FontData.h"
-#include "MyGUI_CommonStateInfo.h"
-
-namespace MyGUI
-{
-
-	const size_t VERTEX_IN_QUAD = 6;
-	const size_t SIMPLETEXT_COUNT_VERTEX = 32 * VERTEX_IN_QUAD;
-
-	MYGUI_FORCEINLINE void DrawQuad(
-		MyGUI::Vertex*& _buff,
-		float v_left,
-		float v_top,
-		float v_rignt,
-		float v_bottom,
-		float v_z,
-		MyGUI::uint32 _colour,
-		float t_left,
-		float t_top,
-		float t_right,
-		float t_bottom,
-		size_t& _count)
-	{
-		_buff[0].x = v_left;
-		_buff[0].y = v_top;
-		_buff[0].z = v_z;
-		_buff[0].colour = _colour;
-		_buff[0].u = t_left;
-		_buff[0].v = t_top;
-
-		_buff[1].x = v_left;
-		_buff[1].y = v_bottom;
-		_buff[1].z = v_z;
-		_buff[1].colour = _colour;
-		_buff[1].u = t_left;
-		_buff[1].v = t_bottom;
-
-		_buff[2].x = v_rignt;
-		_buff[2].y = v_top;
-		_buff[2].z = v_z;
-		_buff[2].colour = _colour;
-		_buff[2].u = t_right;
-		_buff[2].v = t_top;
-
-		_buff[3].x = v_rignt;
-		_buff[3].y = v_top;
-		_buff[3].z = v_z;
-		_buff[3].colour = _colour;
-		_buff[3].u = t_right;
-		_buff[3].v = t_top;
-
-		_buff[4].x = v_left;
-		_buff[4].y = v_bottom;
-		_buff[4].z = v_z;
-		_buff[4].colour = _colour;
-		_buff[4].u = t_left;
-		_buff[4].v = t_bottom;
-
-		_buff[5].x = v_rignt;
-		_buff[5].y = v_bottom;
-		_buff[5].z = v_z;
-		_buff[5].colour = _colour;
-		_buff[5].u = t_right;
-		_buff[5].v = t_bottom;
-
-		_buff += VERTEX_IN_QUAD;
-		_count += VERTEX_IN_QUAD;
-	}
-
-	EditText::EditText() :
-		ISubWidgetText(),
-		mEmptyView(false),
-		mCurrentColour(0x00FFFFFF),
-		mInverseColour(0x00000000),
-		mCurrentAlpha(0xFF000000),
-		mTextOutDate(false),
-		mTextAlign(Align::Default),
-		mColour(Colour::White),
-		mAlpha(ALPHA_MAX),
-		mFont(nullptr),
-		mTexture(nullptr),
-		mFontHeight(0),
-		mBackgroundNormal(true),
-		mStartSelect(0),
-		mEndSelect(0),
-		mCursorPosition(0),
-		mVisibleCursor(false),
-		mInvertSelect(true),
-		mNode(nullptr),
-		mRenderItem(nullptr),
-		mCountVertex(SIMPLETEXT_COUNT_VERTEX),
-		mIsAddCursorWidth(true),
-		mShiftText(false),
-		mWordWrap(false),
-		mOldWidth(0)
-	{
-		mVertexFormat = RenderManager::getInstance().getVertexFormat();
-
-		mCurrentColour = texture_utility::toColourARGB(mColour);
-		texture_utility::convertColour(mCurrentColour, mVertexFormat);
-
-		mCurrentColour = (mCurrentColour & 0x00FFFFFF) | mCurrentAlpha;
-		mInverseColour = mCurrentColour ^ 0x00FFFFFF;
-	}
-
-	EditText::~EditText()
-	{
-	}
-
-	void EditText::setVisible(bool _visible)
-	{
-		if (mVisible == _visible) return;
-		mVisible = _visible;
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void EditText::_correctView()
-	{
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void EditText::_setAlign(const IntCoord& _oldcoord, bool _update)
-	{
-		_setAlign(_oldcoord.size(), _update);
-	}
-
-	void EditText::_setAlign(const IntSize& _oldsize, bool _update)
-	{
-
-		if (mWordWrap)
-		{
-			// передается старая координата всегда
-			int width = mCroppedParent->getWidth();
-			if (mOldWidth != width)
-			{
-				mOldWidth = width;
-				mTextOutDate = true;
-			}
-		}
-
-		// необходимо разобраться
-		bool need_update = true;//_update;
-
-		// первоначальное выравнивание
-		if (mAlign.isHStretch())
-		{
-			// растягиваем
-			mCoord.width = mCoord.width + (mCroppedParent->getWidth() - _oldsize.width);
-			need_update = true;
-			mIsMargin = true; // при изменении размеров все пересчитывать
-		}
-		else if (mAlign.isRight())
-		{
-			// двигаем по правому краю
-			mCoord.left = mCoord.left + (mCroppedParent->getWidth() - _oldsize.width);
-			need_update = true;
-		}
-		else if (mAlign.isHCenter())
-		{
-			// выравнивание по горизонтали без растяжения
-			mCoord.left = (mCroppedParent->getWidth() - mCoord.width) / 2;
-			need_update = true;
-		}
-
-		if (mAlign.isVStretch())
-		{
-			// растягиваем
-			mCoord.height = mCoord.height + (mCroppedParent->getHeight() - _oldsize.height);
-			need_update = true;
-			mIsMargin = true; // при изменении размеров все пересчитывать
-		}
-		else if (mAlign.isBottom())
-		{
-			// двигаем по нижнему краю
-			mCoord.top = mCoord.top + (mCroppedParent->getHeight() - _oldsize.height);
-			need_update = true;
-		}
-		else if (mAlign.isVCenter())
-		{
-			// выравнивание по вертикали без растяжения
-			mCoord.top = (mCroppedParent->getHeight() - mCoord.height) / 2;
-			need_update = true;
-		}
-
-		if (need_update)
-		{
-			mCurrentCoord = mCoord;
-			_updateView();
-		}
-
-	}
-
-	void EditText::_updateView()
-	{
-		bool margin = _checkMargin();
-
-		mEmptyView = ((0 >= _getViewWidth()) || (0 >= _getViewHeight()));
-
-		mCurrentCoord.left = mCoord.left + mMargin.left;
-		mCurrentCoord.top = mCoord.top + mMargin.top;
-
-		// вьюпорт стал битым
-		if (margin)
-		{
-			// проверка на полный выход за границу
-			if (_checkOutside())
-			{
-				// запоминаем текущее состояние
-				mIsMargin = margin;
-
-				// обновить перед выходом
-				if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-				return;
-			}
-		}
-
-		// мы обрезаны или были обрезаны
-		if ((mIsMargin) || (margin))
-		{
-			mCurrentCoord.width = _getViewWidth();
-			mCurrentCoord.height = _getViewHeight();
-		}
-
-		// запоминаем текущее состояние
-		mIsMargin = margin;
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void EditText::setCaption(const UString& _value)
-	{
-		mCaption = _value;
-		mTextOutDate = true;
-
-		// если вершин не хватит, делаем реалок, с учетом выделения * 2 и курсора
-		size_t need = (mCaption.size() * 2 + 2) * VERTEX_IN_QUAD;
-		if (mCountVertex < need)
-		{
-			mCountVertex = need + SIMPLETEXT_COUNT_VERTEX;
-			if (nullptr != mRenderItem) mRenderItem->reallockDrawItem(this, mCountVertex);
-		}
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	const UString& EditText::getCaption()
-	{
-		return mCaption;
-	}
-
-	void EditText::setTextColour(const Colour& _value)
-	{
-		if (mColour == _value) return;
-		mColour = _value;
-		mCurrentColour = texture_utility::toColourARGB(mColour);
-
-		texture_utility::convertColour(mCurrentColour, mVertexFormat);
-
-		mCurrentColour = (mCurrentColour & 0x00FFFFFF) | mCurrentAlpha;
-		mInverseColour = mCurrentColour ^ 0x00FFFFFF;
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	const Colour& EditText::getTextColour()
-	{
-		return mColour;
-	}
-
-	void EditText::setAlpha(float _value)
-	{
-		if (mAlpha == _value) return;
-		mAlpha = _value;
-		mCurrentAlpha = ((uint8)(mAlpha*255) << 24);
-		mCurrentColour = (mCurrentColour & 0x00FFFFFF) | mCurrentAlpha;
-		mInverseColour = mCurrentColour ^ 0x00FFFFFF;
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	float EditText::getAlpha()
-	{
-		return mAlpha;
-	}
-
-	void EditText::setFontName(const std::string& _value)
-	{
-		mTexture = 0;
-		mFont = FontManager::getInstance().getByName(_value);
-		if (mFont != nullptr)
-		{
-			mTexture = mFont->getTextureFont();
-
-			// если надо, устанавливаем дефолтный размер шрифта
-			if (mFont->getDefaultHeight() != 0)
-			{
-				mFontHeight = mFont->getDefaultHeight();
-			}
-		}
-
-		mTextOutDate = true;
-
-		// если мы были приаттаченны, то удаляем себя
-		if (nullptr != mRenderItem)
-		{
-			mRenderItem->removeDrawItem(this);
-			mRenderItem = nullptr;
-		}
-
-		// если есть текстура, то приаттачиваемся
-		if (nullptr != mTexture && nullptr != mNode)
-		{
-			mRenderItem = mNode->addToRenderItem(mTexture, this);
-			mRenderItem->addDrawItem(this, mCountVertex);
-		}
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	const std::string& EditText::getFontName()
-	{
-		return mFont->getResourceName();
-	}
-
-	void EditText::setFontHeight(int _value)
-	{
-		mFontHeight = _value;
-		mTextOutDate = true;
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	int EditText::getFontHeight()
-	{
-		return mFontHeight;
-	}
-
-	void EditText::createDrawItem(ITexture* _texture, ILayerNode * _node)
-	{
-		mNode = _node;
-		// если уже есть текстура, то атачимся, актуально для смены леера
-		if (nullptr != mTexture)
-		{
-			MYGUI_ASSERT(!mRenderItem, "mRenderItem must be nullptr");
-
-			mRenderItem = mNode->addToRenderItem(mTexture, this);
-			mRenderItem->addDrawItem(this, mCountVertex);
-		}
-	}
-
-	void EditText::destroyDrawItem()
-	{
-		if (nullptr != mRenderItem)
-		{
-			mRenderItem->removeDrawItem(this);
-			mRenderItem = nullptr;
-		}
-		mNode = nullptr;
-	}
-
-	size_t EditText::getTextSelectionStart()
-	{
-		return mStartSelect;
-	}
-
-	size_t EditText::getTextSelectionEnd()
-	{
-		return mEndSelect;
-	}
-
-	void EditText::setTextSelection(size_t _start, size_t _end)
-	{
-		mStartSelect=_start;
-		mEndSelect=_end;
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	bool EditText::getSelectBackground()
-	{
-		return mBackgroundNormal;
-	}
-
-	void EditText::setSelectBackground(bool _normal)
-	{
-		if (mBackgroundNormal == _normal) return;
-		mBackgroundNormal = _normal;
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	bool EditText::isVisibleCursor()
-	{
-		return mVisibleCursor;
-	}
-
-	void EditText::setVisibleCursor(bool _value)
-	{
-		if (mVisibleCursor == _value) return;
-		mVisibleCursor = _value;
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	size_t EditText::getCursorPosition()
-	{
-		return mCursorPosition;
-	}
-
-	void EditText::setCursorPosition(size_t _index)
-	{
-		if (mCursorPosition == _index) return;
-		mCursorPosition = _index;
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void EditText::setTextAlign(Align _value)
-	{
-		mTextAlign = _value;
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	Align EditText::getTextAlign()
-	{
-		return mTextAlign;
-	}
-
-	IntSize EditText::getTextSize()
-	{
-		// если нуно обновить, или изменились пропорции экрана
-		if (mTextOutDate) updateRawData();
-
-		IntSize size = mTextView.getViewSize();
-		// плюс размер курсора
-		if (mIsAddCursorWidth)
-			size.width += 2;
-		return size;
-	}
-
-	void EditText::setViewOffset(const IntPoint& _point)
-	{
-		mViewOffset = _point;
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	IntPoint EditText::getViewOffset()
-	{
-		return mViewOffset;
-	}
-
-	size_t EditText::getCursorPosition(const IntPoint& _point)
-	{
-		if (nullptr == mFont) return 0;
-		if (mTextOutDate) updateRawData();
-
-		IntPoint point = _point;
-		point -= mCroppedParent->getAbsolutePosition();
-		point += mViewOffset;
-		point -= mCoord.point();
-
-		return mTextView.getCursorPosition(point);
-	}
-
-	IntCoord EditText::getCursorCoord(size_t _position)
-	{
-		if (nullptr == mFont) return IntCoord();
-		if (mTextOutDate) updateRawData();
-
-		IntPoint point = mTextView.getCursorPoint(_position);
-		point += mCroppedParent->getAbsolutePosition();
-		point -= mViewOffset;
-		point += mCoord.point();
-
-		return IntCoord(point.left, point.top, 2, mFontHeight);
-	}
-
-	void EditText::setShiftText(bool _value)
-	{
-		if (mShiftText == _value) return;
-		mShiftText = _value;
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void EditText::setWordWrap(bool _value)
-	{
-		mWordWrap = _value;
-		mTextOutDate = true;
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void EditText::updateRawData()
-	{
-		if (nullptr == mFont) return;
-		// сбрасывам флаги
-		mTextOutDate = false;
-
-		int width = -1;
-		if (mWordWrap)
-		{
-			width = mCoord.width;
-			// обрезать слова нужно по шарине, которую мы реально используем
-			if (mIsAddCursorWidth)
-				width -= 2;
-		}
-
-		mTextView.update(mCaption, mFont, mFontHeight, mTextAlign, mVertexFormat, width);
-	}
-
-	void EditText::setStateData(IStateInfo* _data)
-	{
-		EditTextStateInfo* data = _data->castType<EditTextStateInfo>();
-		if (data->getColour() != Colour::Zero) setTextColour(data->getColour());
-		setShiftText(data->getShift());
-	}
-
-	void EditText::doRender()
-	{
-		if (nullptr == mFont) return;
-		if (!mVisible || mEmptyView) return;
-
-		bool _update = mRenderItem->getCurrentUpdate();
-		if (_update) mTextOutDate = true;
-
-		if (mTextOutDate) updateRawData();
-
-		Vertex* _vertex = mRenderItem->getCurrentVertextBuffer();
-
-		const RenderTargetInfo& info = mRenderItem->getRenderTarget()->getInfo();
-
-		// колличество отрисованных вершин
-		size_t vertex_count = 0;
-
-		// текущие цвета
-		uint32 colour_current = mCurrentColour;
-		uint32 colour = mCurrentColour;
-		uint32 colour_inverse = mInverseColour;
-
-		GlyphInfo* back_glyph = mFont->getGlyphInfo(mBackgroundNormal ? FontCodeType::Selected : FontCodeType::SelectedBack);
-
-		float vertex_z = info.maximumDepth;
-
-		const VectorLineInfo& data = mTextView.getData();
-
-		int left = - mViewOffset.left + mCoord.left;
-		int top = - mViewOffset.top + mCoord.top;
-		int width = 0;
-		const int height = mFontHeight;
-
-		size_t index = 0;
-		for (VectorLineInfo::const_iterator line=data.begin(); line!=data.end(); ++line)
-		{
-			left = line->offset - mViewOffset.left + mCoord.left;
-			for (VectorCharInfo::const_iterator sim=line->simbols.begin(); sim!=line->simbols.end(); ++sim)
-			{
-				if (sim->isColour())
-				{
-					colour = sim->getColour() | (colour & 0xFF000000);
-					colour_inverse = colour ^ 0x00FFFFFF;
-					continue;
-				}
-
-				// смещение текстуры для фона
-				bool select = !((index >= mEndSelect) || (index < mStartSelect));
-
-				uint32 back_colour = 0;
-
-				// выделение символа
-				if (!select || !mInvertSelect)
-				{
-					colour_current = colour;
-					back_colour = colour | 0x00FFFFFF;
-				}
-				else
-				{
-					colour_current = colour_inverse;
-					back_colour = colour_inverse;
-				}
-
-				bool draw = true;
-
-				// текущие размеры
-				MyGUI::FloatRect texture_rect = sim->getUVRect();
-				width = sim->getWidth();
-
-				// конечные размеры
-				int result_left = left;
-				int result_top = top;
-				int result_right = left + width;
-				int result_bottom = top + height;
-
-				float texture_width = texture_rect.right - texture_rect.left;
-				float texture_height = texture_rect.bottom - texture_rect.top;
-
-				// символ залазиет влево
-				if (left < mCurrentCoord.left)
-				{
-					// символ вообще не виден
-					if (left + width <= mCurrentCoord.left)
-					{
-						draw = false;
-					}
-					// символ обрезан
-					else
-					{
-						result_left = mCurrentCoord.left;
-						texture_rect.left += (texture_width * (float)(result_left - left) / (float)width);
-					}
-				}
-
-				// символ залазиет вправо
-				if (left + width > mCurrentCoord.right())
-				{
-					// символ вообще не виден
-					if (left >= mCurrentCoord.right())
-					{
-						draw = false;
-					}
-					// символ обрезан
-					else
-					{
-						result_right = mCurrentCoord.right();
-						texture_rect.right -= (texture_width * (float)((left + width) - result_right) / (float)width);
-					}
-				}
-
-				// символ залазиет вверх
-				if (top < mCurrentCoord.top)
-				{
-					// символ вообще не виден
-					if (top + height <= mCurrentCoord.top)
-					{
-						draw = false;
-					}
-					// символ обрезан
-					else
-					{
-						result_top = mCurrentCoord.top;
-						texture_rect.top += (texture_height * (float)(result_top - top) / (float)height);
-					}
-				}
-
-				// символ залазиет вниз
-				if (top + height > mCurrentCoord.bottom())
-				{
-					// символ вообще не виден
-					if (top >= mCurrentCoord.bottom())
-					{
-						draw = false;
-					}
-					// символ обрезан
-					else
-					{
-						result_bottom = mCurrentCoord.bottom();
-						texture_rect.bottom -= (texture_height * (float)((top + height) - result_bottom) / (float)height);
-					}
-				}
-
-				if (draw)
-				{
-					int pix_left = mCroppedParent->getAbsoluteLeft() - info.leftOffset + result_left;
-					int pix_top = mCroppedParent->getAbsoluteTop() - info.topOffset + (mShiftText ? 1 : 0) + result_top;
-
-					float real_left = ((info.pixScaleX * (float)(pix_left) + info.hOffset) * 2) - 1;
-					float real_top = - (((info.pixScaleY * (float)(pix_top) + info.vOffset) * 2) - 1);
-					float real_right = ((info.pixScaleX * (float)(pix_left + result_right - result_left) + info.hOffset) * 2) - 1;
-					float real_bottom = - (((info.pixScaleY * (float)(pix_top + result_bottom - result_top) + info.vOffset) * 2) - 1);
-
-					// если нужно рисуем выделение
-					if (select)
-					{
-						const FloatRect& background_current = back_glyph->uvRect;
-						DrawQuad(_vertex, real_left, real_top, real_right, real_bottom, vertex_z, back_colour,
-							background_current.left, background_current.top, background_current.left, background_current.top, vertex_count);
-					}
-
-					DrawQuad(_vertex, real_left, real_top, real_right, real_bottom, vertex_z, colour_current,
-						texture_rect.left, texture_rect.top, texture_rect.right, texture_rect.bottom, vertex_count);
-				}
-
-				left += width;
-				index++;
-			}
-
-			top += height;
-			index++;
-		}
-
-		if (mVisibleCursor)
-		{
-			MyGUI::IntPoint point = mTextView.getCursorPoint(mCursorPosition);
-			point -= mViewOffset;
-			point += mCoord.point();
-
-			bool draw = true;
-
-			GlyphInfo* cursor_glyph = mFont->getGlyphInfo(FontCodeType::Cursor);
-			MyGUI::FloatRect texture_rect = cursor_glyph->uvRect;
-			left = point.left;
-			top = point.top;
-			width = 2;//cursor_glyph->width;
-
-			// конечные размеры
-			int result_left = left;
-			int result_top = top;
-			int result_width = width;
-			int result_height = height;
-
-			// символ залазиет влево
-			if (left < mCurrentCoord.left)
-			{
-				// символ вообще не виден
-				if (left + width <= mCurrentCoord.left)
-				{
-					draw = false;
-				}
-				// символ обрезан
-				else
-				{
-					result_left = mCurrentCoord.left;
-					result_width = width - (mCurrentCoord.left - left);
-
-					float texture_width = texture_rect.right - texture_rect.left;
-					texture_rect.left = texture_rect.right - (texture_width * (float)result_width / (float)width);
-				}
-			}
-
-			// символ залазиет вправо
-			if (left + width > mCurrentCoord.right())
-			{
-				// символ вообще не виден
-				if (left >= mCurrentCoord.right())
-				{
-					draw = false;
-				}
-				// символ обрезан
-				else
-				{
-					result_width = mCurrentCoord.right() - left;
-
-					float texture_width = texture_rect.right - texture_rect.left;
-					texture_rect.right = texture_rect.left + (texture_width * (float)result_width / (float)width);
-				}
-			}
-
-			// символ залазиет вверх
-			if (top < mCurrentCoord.top)
-			{
-				// символ вообще не виден
-				if (top + height <= mCurrentCoord.top)
-				{
-					draw = false;
-				}
-				// символ обрезан
-				else
-				{
-					result_top = mCurrentCoord.top;
-					result_height = height - (mCurrentCoord.top - top);
-
-					float texture_height = texture_rect.bottom - texture_rect.top;
-					texture_rect.top = texture_rect.bottom - (texture_height * (float)result_height / (float)height);
-				}
-			}
-
-			// символ залазиет вниз
-			if (top + height > mCurrentCoord.bottom())
-			{
-				// символ вообще не виден
-				if (top >= mCurrentCoord.bottom())
-				{
-					draw = false;
-				}
-				// символ обрезан
-				else
-				{
-					result_height = mCurrentCoord.bottom() - top;
-
-					float texture_height = texture_rect.bottom - texture_rect.top;
-					texture_rect.bottom = texture_rect.top + (texture_height * (float)result_height / (float)height);
-				}
-			}
-
-			if (draw)
-			{
-				int pix_left = mCroppedParent->getAbsoluteLeft() - info.leftOffset + result_left;
-				int pix_top = mCroppedParent->getAbsoluteTop() - info.topOffset + (mShiftText ? 1 : 0) + result_top;
-
-				float real_left = ((info.pixScaleX * (float)(pix_left) + info.hOffset) * 2) - 1;
-				float real_top = - (((info.pixScaleY * (float)(pix_top) + info.vOffset) * 2) - 1);
-				float real_right = ((info.pixScaleX * (float)(pix_left + result_width) + info.hOffset) * 2) - 1;
-				float real_bottom = - (((info.pixScaleY * (float)(pix_top + result_height) + info.vOffset) * 2) - 1);
-
-				DrawQuad(_vertex, real_left, real_top, real_right, real_bottom, vertex_z, colour_current | 0x00FFFFFF,
-					texture_rect.left, texture_rect.top, texture_rect.right, texture_rect.bottom, vertex_count);
-			}
-		}
-
-		// колличество реально отрисованных вершин
-		mRenderItem->setLastVertexCount(vertex_count);
-	}
-
-	void EditText::setInvertSelected(bool _value)
-	{
-		if (mInvertSelect == _value) return;
-		mInvertSelect = _value;
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Exception.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Exception.cpp
deleted file mode 100644
index 38ed25798f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Exception.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Exception.h"
-#include "MyGUI_Utility.h"
-
-namespace MyGUI
-{
-
-	Exception::Exception(const std::string& _description, const std::string& _source, const char* _file, long _line ) :
-		mDescription(_description),
-		mSource(_source),
-		mFile(_file),
-		mLine(_line)
-	{
-	}
-
-	Exception::Exception(const Exception& _rhs) :
-		mDescription(_rhs.mDescription),
-		mSource(_rhs.mSource),
-		mFile(_rhs.mFile),
-		mLine(_rhs.mLine)
-	{
-	}
-
-	Exception& Exception::operator = (const Exception& _rhs)
-	{
-		mDescription = _rhs.mDescription;
-		mSource = _rhs.mSource;
-		mFile = _rhs.mFile;
-		mLine = _rhs.mLine;
-		mFullDesc = _rhs.mFullDesc;
-		return *this;
-	}
-
-
-	const std::string& Exception::getFullDescription() const
-	{
-		if (mFullDesc.empty())
-		{
-			if ( mLine > 0 )
-			{
-				mFullDesc = utility::toString("MyGUI EXCEPTION : ", mDescription, " in ", mSource, " at ", mFile, " (line ", mLine, ")");
-			}
-			else
-			{
-				mFullDesc = utility::toString("MyGUI EXCEPTION : ", mDescription, " in ", mSource);
-			}
-		}
-
-		return mFullDesc;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_FactoryManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_FactoryManager.cpp
deleted file mode 100644
index 206c327001..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_FactoryManager.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_FactoryManager.h"
-
-namespace MyGUI
-{
-
-	MYGUI_INSTANCE_IMPLEMENT( FactoryManager )
-
-	void FactoryManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void FactoryManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	void FactoryManager::registerFactory(const std::string& _category, const std::string& _type, Delegate::IDelegate* _delegate)
-	{
-		//FIXME
-		mRegisterFactoryItems[_category][_type] = _delegate;
-	}
-
-	void FactoryManager::unregisterFactory(const std::string& _category, const std::string& _type)
-	{
-		MapRegisterFactoryItem::iterator category = mRegisterFactoryItems.find(_category);
-		if (category == mRegisterFactoryItems.end())
-		{
-			return;
-		}
-		MapFactoryItem::iterator type = category->second.find(_type);
-		if (type == category->second.end())
-		{
-			return;
-		}
-
-		category->second.erase(type);
-	}
-
-	void FactoryManager::unregisterFactory(const std::string& _category)
-	{
-		MapRegisterFactoryItem::iterator category = mRegisterFactoryItems.find(_category);
-		if (category == mRegisterFactoryItems.end())
-		{
-			return;
-		}
-		mRegisterFactoryItems.erase(category);
-	}
-
-	IObject* FactoryManager::createObject(const std::string& _category, const std::string& _type)
-	{
-		MapRegisterFactoryItem::iterator category = mRegisterFactoryItems.find(_category);
-		if (category == mRegisterFactoryItems.end())
-		{
-			return nullptr;
-		}
-		MapFactoryItem::iterator type = category->second.find(_type);
-		if (type == category->second.end())
-		{
-			return nullptr;
-		}
-		if (type->second.empty())
-		{
-			return nullptr;
-		}
-
-		IObject* result = nullptr;
-		type->second(result);
-		return result;
-	}
-
-	void FactoryManager::destroyObject(IObject* _object)
-	{
-		delete _object;
-
-		/*MapRegisterFactoryItem::iterator category = mRegisterFactoryItems.find(_category);
-		if (category == mRegisterFactoryItems.end())
-		{
-			return;
-		}
-		MapFactoryItem::iterator type = category->second.find(_type);
-		if (type == category->second.end())
-		{
-			return;
-		}
-		if (type->second.empty())
-		{
-			return;
-		}
-
-		type->second(_object, nullptr, _version);*/
-	}
-
-	bool FactoryManager::isFactoryExist(const std::string& _category, const std::string& _type)
-	{
-		MapRegisterFactoryItem::iterator category = mRegisterFactoryItems.find(_category);
-		if (category == mRegisterFactoryItems.end())
-		{
-			return false;
-		}
-		MapFactoryItem::iterator type = category->second.find(_type);
-		if (type == category->second.end())
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_FontManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_FontManager.cpp
deleted file mode 100644
index 65695917d0..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_FontManager.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_FactoryManager.h"
-#include "MyGUI_FontManager.h"
-#include "MyGUI_XmlDocument.h"
-
-#include "MyGUI_ResourceManualFont.h"
-#include "MyGUI_ResourceTrueTypeFont.h"
-
-namespace MyGUI
-{
-	const std::string XML_TYPE("Font");
-	const std::string XML_TYPE_RESOURCE("Resource");
-	const std::string XML_TYPE_PROPERTY("Property");
-	const std::string RESOURCE_DEFAULT_NAME("Default");
-
-	MYGUI_INSTANCE_IMPLEMENT( FontManager )
-
-	void FontManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		ResourceManager::getInstance().registerLoadXmlDelegate(XML_TYPE) = newDelegate(this, &FontManager::_load);
-
-		FactoryManager::getInstance().registerFactory<ResourceManualFont>(XML_TYPE_RESOURCE);
-		FactoryManager::getInstance().registerFactory<ResourceTrueTypeFont>(XML_TYPE_RESOURCE);
-
-		mDefaultName = "Default";
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void FontManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		MyGUI::ResourceManager::getInstance().unregisterLoadXmlDelegate(XML_TYPE);
-
-		FactoryManager::getInstance().unregisterFactory<ResourceManualFont>(XML_TYPE_RESOURCE);
-		FactoryManager::getInstance().unregisterFactory<ResourceTrueTypeFont>(XML_TYPE_RESOURCE);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	bool FontManager::load(const std::string& _file)
-	{
-		return MyGUI::ResourceManager::getInstance()._loadImplement(_file, true, XML_TYPE, INSTANCE_TYPE_NAME);
-	}
-
-	void FontManager::_load(xml::ElementPtr _node, const std::string& _file, Version _version)
-	{
-		xml::ElementEnumerator font = _node->getElementEnumerator();
-		while (font.next())
-		{
-			if (font->getName() == XML_TYPE)
-			{
-				std::string name;
-				if (!font->findAttribute("name", name)) continue;
-
-				std::string type;
-				if (type.empty())
-				{
-					if (font->findAttribute("resolution").empty()) type = "ResourceManualFont";
-					else type = "ResourceTrueTypeFont";
-				}
-
-				xml::Document doc;
-				xml::ElementPtr root = doc.createRoot("MyGUI");
-				xml::ElementPtr node = root->createChild("Resource");
-				node->addAttribute("type", type);
-				node->addAttribute("name", name);
-
-				std::string tmp;
-				if (font->findAttribute("source", tmp))
-				{
-					xml::ElementPtr prop = node->createChild("Property");
-					prop->addAttribute("key", "Source");
-					prop->addAttribute("value", tmp);
-				}
-
-				if (font->findAttribute("size", tmp))
-				{
-					xml::ElementPtr prop = node->createChild("Property");
-					prop->addAttribute("key", "Size");
-					prop->addAttribute("value", tmp);
-				}
-
-				if (font->findAttribute("resolution", tmp))
-				{
-					xml::ElementPtr prop = node->createChild("Property");
-					prop->addAttribute("key", "Resolution");
-					prop->addAttribute("value", tmp);
-				}
-
-				if (font->findAttribute("antialias_colour", tmp))
-				{
-					xml::ElementPtr prop = node->createChild("Property");
-					prop->addAttribute("key", "Antialias");
-					prop->addAttribute("value", tmp);
-				}
-
-				if (font->findAttribute("space_width", tmp))
-				{
-					xml::ElementPtr prop = node->createChild("Property");
-					prop->addAttribute("key", "SpaceWidth");
-					prop->addAttribute("value", tmp);
-				}
-
-				if (font->findAttribute("tab_width", tmp))
-				{
-					xml::ElementPtr prop = node->createChild("Property");
-					prop->addAttribute("key", "TabWidth");
-					prop->addAttribute("value", tmp);
-				}
-
-				if (font->findAttribute("cursor_width", tmp))
-				{
-					xml::ElementPtr prop = node->createChild("Property");
-					prop->addAttribute("key", "CursorWidth");
-					prop->addAttribute("value", tmp);
-				}
-
-				if (font->findAttribute("distance", tmp))
-				{
-					xml::ElementPtr prop = node->createChild("Property");
-					prop->addAttribute("key", "Distance");
-					prop->addAttribute("value", tmp);
-				}
-
-				if (font->findAttribute("offset_height", tmp))
-				{
-					xml::ElementPtr prop = node->createChild("Property");
-					prop->addAttribute("key", "OffsetHeight");
-					prop->addAttribute("value", tmp);
-				}
-
-				if (font->findAttribute("default_height", tmp))
-				{
-					xml::ElementPtr prop = node->createChild("Property");
-					prop->addAttribute("key", "DefaultHeight");
-					prop->addAttribute("value", tmp);
-				}
-
-				xml::ElementPtr codes = node->createChild("Codes");
-
-				xml::ElementEnumerator codeold = font->getElementEnumerator();
-				while (codeold.next("Code"))
-				{
-					xml::ElementPtr codenew = codes->createChild("Code");
-
-					if (codeold->findAttribute("range", tmp))
-						codenew->addAttribute("range", tmp);
-
-					if (codeold->findAttribute("hide", tmp))
-						codenew->addAttribute("hide", tmp);
-
-					if (codeold->findAttribute("index", tmp))
-						codenew->addAttribute("index", tmp);
-
-					if (codeold->findAttribute("coord", tmp))
-						codenew->addAttribute("coord", tmp);
-				}
-
-				ResourceManager::getInstance()._load(root, _file, _version);
-			}
-			else if (font->getName() == XML_TYPE_PROPERTY)
-			{
-				const std::string& key = font->findAttribute("key");
-				const std::string& value = font->findAttribute("value");
-				if (key == "Default")
-					mDefaultName = value;
-			}
-		}
-	}
-
-	void FontManager::setDefaultFont(const std::string& _value)
-	{
-		mDefaultName = _value;
-	}
-
-	IFont* FontManager::getByName(const std::string& _name) const
-	{
-		IResource* result = nullptr;
-		//FIXME ��� ������������� ����� ����� ����� ��� Default
-		if (!_name.empty() && _name != RESOURCE_DEFAULT_NAME)
-			result = ResourceManager::getInstance().getByName(_name, false);
-
-		if (result == nullptr)
-			result = ResourceManager::getInstance().getByName(mDefaultName, false);
-
-		return result ? result->castType<IFont>(false) : nullptr;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Gui.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Gui.cpp
deleted file mode 100644
index 6a66616d8f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Gui.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_Widget.h"
-
-#include "MyGUI_InputManager.h"
-#include "MyGUI_SubWidgetManager.h"
-#include "MyGUI_LogManager.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_FontManager.h"
-#include "MyGUI_ControllerManager.h"
-#include "MyGUI_PointerManager.h"
-#include "MyGUI_ClipboardManager.h"
-#include "MyGUI_LayoutManager.h"
-#include "MyGUI_PluginManager.h"
-#include "MyGUI_DynLibManager.h"
-#include "MyGUI_LanguageManager.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_FactoryManager.h"
-
-namespace MyGUI
-{
-
-	const std::string INSTANCE_TYPE_NAME("Gui");
-
-	Gui* Gui::msInstance = nullptr;
-
-	Gui* Gui::getInstancePtr()
-	{
-		return msInstance;
-	}
-
-	Gui& Gui::getInstance()
-	{
-		MYGUI_ASSERT(0 != msInstance, "instance " << INSTANCE_TYPE_NAME << " was not created");
-		return (*msInstance);
-	}
-
-	Gui::Gui() :
-		mIsInitialise(false)
-	{
-		MYGUI_ASSERT(0 == msInstance, "instance " << INSTANCE_TYPE_NAME << " is exsist");
-		msInstance = this;
-	}
-
-	Gui::~Gui()
-	{
-		msInstance = nullptr;
-	}
-
-	void Gui::initialise(const std::string& _core, const std::string& _logFileName)
-	{
-		// самый первый лог
-		LogManager::registerSection(MYGUI_LOG_SECTION, _logFileName);
-
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-		MYGUI_LOG(Info, "* MyGUI version "
-			<< MYGUI_VERSION_MAJOR << "."
-			<< MYGUI_VERSION_MINOR << "."
-			<< MYGUI_VERSION_PATCH);
-
-		// создаем и инициализируем синглтоны
-		mResourceManager = new ResourceManager();
-		mLayerManager = new LayerManager();
-		mWidgetManager = new WidgetManager();
-		mInputManager = new InputManager();
-		mSubWidgetManager = new SubWidgetManager();
-		mSkinManager = new SkinManager();
-		mFontManager = new FontManager();
-		mControllerManager = new ControllerManager();
-		mPointerManager = new PointerManager();
-		mClipboardManager = new ClipboardManager();
-		mLayoutManager = new LayoutManager();
-		mDynLibManager = new DynLibManager();
-		mPluginManager = new PluginManager();
-		mLanguageManager = new LanguageManager();
-		mFactoryManager = new FactoryManager();
-
-		mResourceManager->initialise();
-		mLayerManager->initialise();
-		mWidgetManager->initialise();
-		mInputManager->initialise();
-		mSubWidgetManager->initialise();
-		mSkinManager->initialise();
-		mFontManager->initialise();
-		mControllerManager->initialise();
-		mPointerManager->initialise();
-		mClipboardManager->initialise();
-		mLayoutManager->initialise();
-		mDynLibManager->initialise();
-		mPluginManager->initialise();
-		mLanguageManager->initialise();
-		mFactoryManager->initialise();
-
-		WidgetManager::getInstance().registerUnlinker(this);
-
-		// загружаем дефолтные настройки если надо
-		if ( _core.empty() == false ) mResourceManager->load(_core);
-
-		mViewSize = RenderManager::getInstance().getViewSize();
-		resizeWindow(mViewSize);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void Gui::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		_destroyAllChildWidget();
-
-		// деинициализируем и удаляем синглтоны
-		mPointerManager->shutdown();
-		mInputManager->shutdown();
-		mSkinManager->shutdown();
-		mSubWidgetManager->shutdown();
-		mLayerManager->shutdown();
-		mFontManager->shutdown();
-		mControllerManager->shutdown();
-		mClipboardManager->shutdown();
-		mLayoutManager->shutdown();
-		mPluginManager->shutdown();
-		mDynLibManager->shutdown();
-		mLanguageManager->shutdown();
-		mResourceManager->shutdown();
-		mFactoryManager->shutdown();
-
-		WidgetManager::getInstance().unregisterUnlinker(this);
-		mWidgetManager->shutdown();
-
-		delete mPointerManager;
-		delete mWidgetManager;
-		delete mInputManager;
-		delete mSkinManager;
-		delete mSubWidgetManager;
-		delete mLayerManager;
-		delete mFontManager;
-		delete mControllerManager;
-		delete mClipboardManager;
-		delete mLayoutManager;
-		delete mDynLibManager;
-		delete mPluginManager;
-		delete mLanguageManager;
-		delete mResourceManager;
-		delete mFactoryManager;
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-
-		// last gui log
-		LogManager::unregisterSection(MYGUI_LOG_SECTION);
-
-		mIsInitialise = false;
-	}
-
-	bool Gui::injectMouseMove( int _absx, int _absy, int _absz) { return mInputManager->injectMouseMove(_absx, _absy, _absz); }
-	bool Gui::injectMousePress( int _absx, int _absy, MouseButton _id ) { return mInputManager->injectMousePress(_absx, _absy, _id); }
-	bool Gui::injectMouseRelease( int _absx, int _absy, MouseButton _id ) { return mInputManager->injectMouseRelease(_absx, _absy, _id); }
-
-	bool Gui::injectKeyPress(KeyCode _key, Char _text) { return mInputManager->injectKeyPress(_key, _text); }
-	bool Gui::injectKeyRelease(KeyCode _key) { return mInputManager->injectKeyRelease(_key); }
-
-
-	Widget* Gui::baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name)
-	{
-		Widget* widget = WidgetManager::getInstance().createWidget(_style, _type, _skin, _coord, _align, nullptr, nullptr, this, _name);
-		mWidgetChild.push_back(widget);
-		// присоединяем виджет с уровню
-		if (!_layer.empty()) LayerManager::getInstance().attachToLayerNode(_layer, widget);
-		return widget;
-	}
-
-	Widget* Gui::findWidgetT(const std::string& _name, bool _throw)
-	{
-		for (VectorWidgetPtr::iterator iter = mWidgetChild.begin(); iter!=mWidgetChild.end(); ++iter)
-		{
-			Widget* widget = (*iter)->findWidget(_name);
-			if (widget != nullptr) return widget;
-		}
-		MYGUI_ASSERT(!_throw, "Widget '" << _name << "' not found");
-		return nullptr;
-	}
-
-	// удяляет неудачника
-	void Gui::_destroyChildWidget(Widget* _widget)
-	{
-		MYGUI_ASSERT(nullptr != _widget, "invalid widget pointer");
-
-		VectorWidgetPtr::iterator iter = std::find(mWidgetChild.begin(), mWidgetChild.end(), _widget);
-		if (iter != mWidgetChild.end())
-		{
-			// сохраняем указатель
-			MyGUI::Widget* widget = *iter;
-
-			// удаляем из списка
-			*iter = mWidgetChild.back();
-			mWidgetChild.pop_back();
-
-			// отписываем от всех
-			mWidgetManager->unlinkFromUnlinkers(_widget);
-
-			// непосредственное удаление
-			_deleteWidget(widget);
-		}
-		else MYGUI_EXCEPT("Widget '" << _widget->getName() << "' not found");
-	}
-
-	// удаляет всех детей
-	void Gui::_destroyAllChildWidget()
-	{
-		while (!mWidgetChild.empty())
-		{
-			// сразу себя отписывем, иначе вложенной удаление убивает все
-			Widget* widget = mWidgetChild.back();
-			mWidgetChild.pop_back();
-
-			//widget->detachWidget();
-
-			// отписываем от всех
-			mWidgetManager->unlinkFromUnlinkers(widget);
-
-			// и сами удалим, так как его больше в списке нет
-			_deleteWidget(widget);
-		}
-	}
-
-	bool Gui::load(const std::string& _file)
-	{
-		return mResourceManager->load(_file);
-	}
-
-	void Gui::destroyWidget(Widget* _widget)
-	{
-		mWidgetManager->destroyWidget(_widget);
-	}
-
-	void Gui::destroyWidgets(VectorWidgetPtr& _widgets)
-	{
-		mWidgetManager->destroyWidgets(_widgets);
-	}
-
-	void Gui::destroyWidgets(EnumeratorWidgetPtr& _widgets)
-	{
-		mWidgetManager->destroyWidgets(_widgets);
-	}
-
-	void Gui::setVisiblePointer(bool _value)
-	{
-		mPointerManager->setVisible(_value);
-	}
-
-	bool Gui::isVisiblePointer()
-	{
-		return mPointerManager->isVisible();
-	}
-
-	void Gui::_injectFrameEntered(float _time)
-	{
-		eventFrameStart(_time);
-	}
-
-	void Gui::_unlinkWidget(Widget* _widget)
-	{
-		eventFrameStart.clear(_widget);
-	}
-
-	void Gui::_linkChildWidget(Widget* _widget)
-	{
-		VectorWidgetPtr::iterator iter = std::find(mWidgetChild.begin(), mWidgetChild.end(), _widget);
-		MYGUI_ASSERT(iter == mWidgetChild.end(), "widget already exist");
-		mWidgetChild.push_back(_widget);
-	}
-
-	void Gui::_unlinkChildWidget(Widget* _widget)
-	{
-		VectorWidgetPtr::iterator iter = std::remove(mWidgetChild.begin(), mWidgetChild.end(), _widget);
-		MYGUI_ASSERT(iter != mWidgetChild.end(), "widget not found");
-		mWidgetChild.erase(iter);
-	}
-
-	void Gui::resizeWindow(const IntSize& _size)
-	{
-		IntSize oldViewSize = mViewSize;
-		mViewSize = _size;
-
-		// выравниваем рутовые окна
-		for (VectorWidgetPtr::iterator iter = mWidgetChild.begin(); iter!=mWidgetChild.end(); ++iter)
-		{
-			((ICroppedRectangle*)(*iter))->_setAlign(oldViewSize, true);
-		}
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Guid.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Guid.cpp
deleted file mode 100644
index 47b693ff99..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Guid.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Guid.h"
-#if   MYGUI_PLATFORM == MYGUI_PLATFORM_LINUX || MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
-#include <uuid/uuid.h>
-#elif MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-#include <objbase.h>
-#endif
-
-namespace MyGUI
-{
-	const char Guid::convert_hex[64] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 64, 64, 64, 64, 64, 64,
-										64, 10, 11, 12, 13, 14, 15, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-										64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-										64, 10, 11, 12, 13, 14, 15, 64, 64, 64, 64, 64, 64, 64, 64, 64
-	                                   };
-
-	Guid Guid::parse(const std::string& _value)
-	{
-		Guid ret;
-		size_t start=0;
-		// формат со скобками { ... }
-		if (_value.size() == 38)
-		{
-			start ++;
-#if MYGUI_DEBUG_MODE == 1
-			if ((_value[0] != '{') || (_value[37] != '}'))
-			{
-				return ret;
-			}
-#endif
-		}
-		// формат без скобок ...
-		else if (_value.size() != 36)
-		{
-			return ret;
-		}
-
-#if MYGUI_DEBUG_MODE == 1
-		if ((_value[start + 8] != '-') || (_value[start + 13] != '-') || (_value[start + 18] != '-') || (_value[start + 23] != '-'))
-		{
-			return ret;
-		}
-#endif
-
-#define MYGUI_CONVERT_HEX(value) ((convert_hex[ ((value) - 48) & 0x3F]) & 0x3F)
-
-#if MYGUI_DEBUG_MODE == 1
-	#define MYGUI_CHECK_CONVERT_HEX(value) \
-		{ \
-			char tmp = ((value) - 48); \
-			if ((tmp > 63) || (tmp < 0)) \
-			{ \
-				/*MYGUI_LOG(Error, "error parse guid'" << _value << "'");*/ \
-				return Guid(); \
-			} \
-			tmp = convert_hex[(int)tmp]; \
-			if (tmp > 63) \
-			{ \
-				/*MYGUI_LOG(Error, "error parse guid'" << _value << "'");*/ \
-				return Guid(); \
-			} \
-		}
-#else
-	#define MYGUI_CHECK_CONVERT_HEX(value)
-#endif
-
-
-		size_t count = 8;
-		size_t pos = start;
-		while (count > 0)
-		{
-			MYGUI_CHECK_CONVERT_HEX(_value[pos]);
-			ret.original.data1 <<= 4;
-			ret.original.data1 += MYGUI_CONVERT_HEX(_value[pos]);
-			count --;
-			pos ++;
-		}
-
-		count = 4;
-		pos ++;
-		while (count > 0)
-		{
-			MYGUI_CHECK_CONVERT_HEX(_value[pos]);
-			ret.original.data2 <<= 4;
-			ret.original.data2 += MYGUI_CONVERT_HEX(_value[pos]);
-			count --;
-			pos ++;
-		}
-
-		count = 4;
-		pos ++;
-		while (count > 0)
-		{
-			MYGUI_CHECK_CONVERT_HEX(_value[pos]);
-			ret.original.data3 <<= 4;
-			ret.original.data3 += MYGUI_CONVERT_HEX(_value[pos]);
-			count --;
-			pos ++;
-		}
-
-		count = 2; // здесь по два байта парсится
-		pos ++;
-		size_t num = 0;
-		while (count > 0)
-		{
-			MYGUI_CHECK_CONVERT_HEX(_value[pos]);
-			ret.original.data4[num] = MYGUI_CONVERT_HEX(_value[pos++]) << 4;
-			MYGUI_CHECK_CONVERT_HEX(_value[pos]);
-			ret.original.data4[num++] += MYGUI_CONVERT_HEX(_value[pos++]);
-			count --;
-		}
-
-		count = 6; // здесь по два байта парсится
-		pos ++;
-		while (count > 0)
-		{
-			MYGUI_CHECK_CONVERT_HEX(_value[pos]);
-			ret.original.data4[num] = MYGUI_CONVERT_HEX(_value[pos++]) << 4;
-			MYGUI_CHECK_CONVERT_HEX(_value[pos]);
-			ret.original.data4[num++] += MYGUI_CONVERT_HEX(_value[pos++]);
-			count --;
-		}
-
-#undef MYGUI_CHECK_CONVERT_HEX
-#undef MYGUI_CONVERT_HEX
-
-	    return ret;
-	}
-
-	std::string Guid::print() const
-	{
-		const size_t SIZE = 39;
-		char buff[SIZE];
-
-		sprintf(buff, "{%.8X-%.4X-%.4X-%.2X%.2X-%.2X%.2X%.2X%.2X%.2X%.2X}", (int)(original.data1), (int)(original.data2), (int)(original.data3),
-			(int)(original.data4[0]), (int)(original.data4[1]),
-			(int)(original.data4[2]), (int)(original.data4[3]), (int)(original.data4[4]), (int)(original.data4[5]), (int)(original.data4[6]), (int)(original.data4[7])
-			);
-
-		return buff;
-	}
-
-	Guid Guid::generate()
-	{
-		Guid ret;
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-		HRESULT result = CoCreateGuid((GUID*)&ret.original.data1);
-		MYGUI_ASSERT(S_OK == result, "Error generate GUID");
-#elif MYGUI_PLATFORM == MYGUI_PLATFORM_LINUX
-		uuid_generate(ret.vec._data1);
-#else
-		//FIXME
-		uuid_generate(ret.vec._data1);// or what else?
-#endif
-		return ret;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_HScroll.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_HScroll.cpp
deleted file mode 100644
index c322b3c3ae..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_HScroll.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_HScroll.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_Button.h"
-#include "MyGUI_ResourceSkin.h"
-
-namespace MyGUI
-{
-
-	HScroll::HScroll()
-	{
-	}
-
-	void HScroll::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	HScroll::~HScroll()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void HScroll::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void HScroll::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-	}
-
-	void HScroll::shutdownWidgetSkin()
-	{
-	}
-
-	void HScroll::updateTrack()
-	{
-		if (mWidgetTrack == nullptr)
-			return;
-
-		_forcePeek(mWidgetTrack);
-		// размер диапазана в пикселях
-		int pos = getLineSize();
-
-		// скрываем если диапазан маленький или места мало
-		if ((mScrollRange < 2) || (pos <= mWidgetTrack->getWidth()))
-		{
-			mWidgetTrack->setVisible(false);
-			if ( nullptr != mWidgetFirstPart ) mWidgetFirstPart->setSize(pos/2, mWidgetFirstPart->getHeight());
-			if ( nullptr != mWidgetSecondPart ) mWidgetSecondPart->setCoord(pos/2 + mSkinRangeStart, mWidgetSecondPart->getTop(), pos - pos/2, mWidgetSecondPart->getHeight());
-			return;
-		}
-		// если скрыт то покажем
-		if (!mWidgetTrack->isVisible())
-		{
-			mWidgetTrack->setVisible(true);
-		}
-
-		// и обновляем позицию
-		pos = (int)(((size_t)(pos-getTrackSize()) * mScrollPosition) / (mScrollRange-1) + mSkinRangeStart);
-
-		mWidgetTrack->setPosition(pos, mWidgetTrack->getTop());
-		if ( nullptr != mWidgetFirstPart )
-		{
-			int height = pos + mWidgetTrack->getWidth()/2 - mWidgetFirstPart->getLeft();
-			mWidgetFirstPart->setSize(height, mWidgetFirstPart->getHeight());
-		}
-		if ( nullptr != mWidgetSecondPart )
-		{
-			int top = pos + mWidgetTrack->getWidth()/2;
-			int height = mWidgetSecondPart->getWidth() + mWidgetSecondPart->getLeft() - top;
-			mWidgetSecondPart->setCoord(top, mWidgetSecondPart->getTop(), height, mWidgetSecondPart->getHeight());
-		}
-	}
-
-	void HScroll::TrackMove(int _left, int _top)
-	{
-		if (mWidgetTrack == nullptr)
-			return;
-
-		const IntPoint& point = InputManager::getInstance().getLastLeftPressed();
-
-		// расчитываем позицию виджета
-		int start = mPreActionOffset.left + (_left - point.left);
-		if (start < (int)mSkinRangeStart) start = (int)mSkinRangeStart;
-		else if (start > (mCoord.width - (int)mSkinRangeEnd - mWidgetTrack->getWidth())) start = (mCoord.width - (int)mSkinRangeEnd - mWidgetTrack->getWidth());
-		if (mWidgetTrack->getLeft() != start) mWidgetTrack->setPosition(IntPoint(start, mWidgetTrack->getTop()));
-
-		// расчитываем положение соответствующее позиции
-		// плюс пол позиции
-		int pos = start - (int)mSkinRangeStart + (getLineSize() - getTrackSize()) / (((int)mScrollRange-1) * 2);
-		// высчитываем ближайшее значение и обновляем
-		pos = pos * (int)(mScrollRange-1) / (getLineSize() - getTrackSize());
-
-		// проверяем на выходы и изменения
-		if (pos < 0) pos = 0;
-		else if (pos >= (int)mScrollRange) pos = (int)mScrollRange - 1;
-		if (pos == (int)mScrollPosition) return;
-
-		mScrollPosition = pos;
-		// отсылаем событие
-		eventScrollChangePosition(this, (int)mScrollPosition);
-	}
-
-	void HScroll::setTrackSize(int _size)
-	{
-		if (mWidgetTrack != nullptr)
-			mWidgetTrack->setSize(((int)_size < (int)mMinTrackSize)? (int)mMinTrackSize : (int)_size, mWidgetTrack->getHeight());
-		updateTrack();
-	}
-
-	int HScroll::getTrackSize()
-	{
-		return mWidgetTrack == nullptr ? 1 : mWidgetTrack->getWidth();
-	}
-
-	int HScroll::getLineSize()
-	{
-		return mCoord.width - (int)(mSkinRangeStart + mSkinRangeEnd);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_IWidgetCreator.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_IWidgetCreator.cpp
deleted file mode 100644
index 0e756a9735..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_IWidgetCreator.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		03/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_IWidgetCreator.h"
-#include "MyGUI_Widget.h"
-
-namespace MyGUI
-{
-
-	void IWidgetCreator::_deleteWidget(Widget* _widget)
-	{
-		delete _widget;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_InputManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_InputManager.cpp
deleted file mode 100644
index 16f672b5cc..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_InputManager.cpp
+++ /dev/null
@@ -1,601 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_WidgetManager.h"
-
-namespace MyGUI
-{
-	const unsigned long INPUT_TIME_DOUBLE_CLICK = 250; //measured in milliseconds
-	const float INPUT_DELAY_FIRST_KEY = 0.4f;
-	const float INPUT_INTERVAL_KEY = 0.05f;
-
-	MYGUI_INSTANCE_IMPLEMENT( InputManager )
-
-	void InputManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		mWidgetMouseFocus = 0;
-		mWidgetKeyFocus = 0;
-		mLayerMouseFocus = 0;
-		mIsWidgetMouseCapture = false;
-		mIsShiftPressed = false;
-		mIsControlPressed = false;
-		mHoldKey = KeyCode::None;
-		mHoldChar = 0;
-		mFirstPressKey = true;
-		mTimerKey = 0.0f;
-		mOldAbsZ = 0;
-
-		WidgetManager::getInstance().registerUnlinker(this);
-		Gui::getInstance().eventFrameStart += newDelegate(this, &InputManager::frameEntered);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void InputManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		Gui::getInstance().eventFrameStart -= newDelegate(this, &InputManager::frameEntered);
-		WidgetManager::getInstance().unregisterUnlinker(this);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	bool InputManager::injectMouseMove(int _absx, int _absy, int _absz)
-	{
-		// запоминаем позицию
-		mMousePosition.set(_absx, _absy);
-
-		// вычисляем прирост по колеса
-		int relz = _absz - mOldAbsZ;
-		mOldAbsZ = _absz;
-
-		// проверка на скролл
-		if (relz != 0)
-		{
-			bool isFocus = isFocusMouse();
-			if (mWidgetMouseFocus != nullptr) mWidgetMouseFocus->onMouseWheel(relz);
-			return isFocus;
-		}
-
-		if (mIsWidgetMouseCapture)
-		{
-			if (mWidgetMouseFocus != nullptr)
-			{
-				if (mLayerMouseFocus != nullptr)
-				{
-					IntPoint point = mLayerMouseFocus->getPosition(_absx, _absy);
-					mWidgetMouseFocus->onMouseDrag(point.left, point.top);
-				}
-			}
-			else
-				mIsWidgetMouseCapture = false;
-			return true;
-		}
-
-		Widget* old_mouse_focus = mWidgetMouseFocus;
-
-		// ищем активное окно
-		Widget* item = LayerManager::getInstance().getWidgetFromPoint(_absx, _absy);
-
-		// ничего не изменилось
-		if (mWidgetMouseFocus == item)
-		{
-			bool isFocus = isFocusMouse();
-			if (mWidgetMouseFocus != nullptr)
-			{
-				if (mLayerMouseFocus != nullptr)
-				{
-					IntPoint point = mLayerMouseFocus->getPosition(_absx, _absy);
-					mWidgetMouseFocus->onMouseMove(_absx, _absy);
-				}
-			}
-			return isFocus;
-		}
-
-		if (item)
-		{
-			// поднимаемся до рута
-			Widget* root = item;
-			while (root->getParent()) root = root->getParent();
-
-			// проверяем на модальность
-			if (!mVectorModalRootWidget.empty())
-			{
-				if (root != mVectorModalRootWidget.back())
-				{
-					item = nullptr;
-				}
-			}
-
-			if (item != nullptr)
-			{
-				mLayerMouseFocus = root->getLayer();
-			}
-		}
-
-		// в методе может пропасть наш виджет
-		WidgetManager::getInstance().addWidgetToUnlink(item);
-
-
-		//-------------------------------------------------------------------------------------//
-		// новый вид рутового фокуса мыши
-		Widget* save_widget = nullptr;
-
-		// спускаемся по новому виджету и устанавливаем рутовый фокус
-		Widget* root_focus = item;
-		while (root_focus != nullptr)
-		{
-			if (root_focus->mRootMouseActive)
-			{
-				save_widget = root_focus;
-				break;
-			}
-			root_focus->mRootMouseActive = true;
-
-			// в методе может пропасть наш виджет
-			WidgetManager::getInstance().addWidgetToUnlink(root_focus);
-			root_focus->onMouseChangeRootFocus(true);
-			WidgetManager::getInstance().removeWidgetFromUnlink(root_focus);
-
-			if (root_focus)
-				root_focus = root_focus->getParent();
-		}
-
-		// спускаемся по старому виджету и сбрасываем фокус
-		root_focus = mWidgetMouseFocus;
-		while (root_focus != nullptr)
-		{
-			if (root_focus == save_widget)
-			{
-				break;
-			}
-			root_focus->mRootMouseActive = false;
-
-			// в методе может пропасть наш виджет
-			WidgetManager::getInstance().addWidgetToUnlink(root_focus);
-			root_focus->onMouseChangeRootFocus(false);
-			WidgetManager::getInstance().removeWidgetFromUnlink(root_focus);
-
-			if (root_focus)
-				root_focus = root_focus->getParent();
-		}
-		//-------------------------------------------------------------------------------------//
-
-		// смена фокуса, проверяем на доступность виджета
-		if ((mWidgetMouseFocus != nullptr) && (mWidgetMouseFocus->isEnabled()))
-		{
-			mWidgetMouseFocus->onMouseLostFocus(item);
-		}
-
-		WidgetManager::getInstance().removeWidgetFromUnlink(item);
-
-
-		if ((item != nullptr) && (item->isEnabled()))
-		{
-			item->onMouseMove(_absx, _absy);
-			item->onMouseSetFocus(mWidgetMouseFocus);
-		}
-
-		// запоминаем текущее окно
-		mWidgetMouseFocus = item;
-
-		if (old_mouse_focus != mWidgetMouseFocus)
-			eventChangeMouseFocus(mWidgetMouseFocus);
-
-		return isFocusMouse();
-	}
-
-	bool InputManager::injectMousePress(int _absx, int _absy, MouseButton _id)
-	{
-		Widget* old_key_focus = mWidgetKeyFocus;
-
-		// если мы щелкнули не на гуй
-		if (!isFocusMouse())
-		{
-			resetKeyFocusWidget();
-
-			if (old_key_focus != mWidgetKeyFocus)
-				eventChangeKeyFocus(mWidgetKeyFocus);
-
-			return false;
-		}
-
-		// если активный элемент заблокирован
-		//FIXME
-		if (!mWidgetMouseFocus->isEnabled())
-			return true;
-
-		// захватываем только по левой клавише и только если виджету надо
-		if (MouseButton::Left == _id)
-		{
-			// захват окна
-			mIsWidgetMouseCapture = true;
-			// запоминаем место нажатия
-			if (mLayerMouseFocus != nullptr)
-			{
-				IntPoint point = mLayerMouseFocus->getPosition(_absx, _absy);
-				mLastLeftPressed = point;
-			}
-		}
-
-		// ищем вверх тот виджет который может принимать фокус
-		Widget* item = mWidgetMouseFocus;
-		while ((item != nullptr) && (!item->isNeedKeyFocus()))
-			item = item->getParent();
-
-		// устанавливаем перед вызовом т.к. возможно внутри ктонить поменяет фокус под себя
-		setKeyFocusWidget(item);
-
-		if (mWidgetMouseFocus != nullptr)
-		{
-			mWidgetMouseFocus->onMouseButtonPressed(_absx, _absy, _id);
-
-			// после пресса может сброситься
-			if (mWidgetMouseFocus)
-			{
-				// поднимаем виджет, надо подумать что делать если поменялся фокус клавы
-				LayerManager::getInstance().upLayerItem(mWidgetMouseFocus);
-
-				// поднимаем пикинг Overlapped окон
-				Widget* pick = mWidgetMouseFocus;
-				do
-				{
-					// если оверлаппед, то поднимаем пикинг
-					if (pick->getWidgetStyle() == WidgetStyle::Overlapped)
-					{
-						if (pick->getParent()) pick->getParent()->_forcePeek(pick);
-					}
-
-					pick = pick->getParent();
-				}
-				while (pick);
-			}
-		}
-
-		if (old_key_focus != mWidgetKeyFocus)
-			eventChangeKeyFocus(mWidgetKeyFocus);
-
-		return true;
-	}
-
-	bool InputManager::injectMouseRelease(int _absx, int _absy, MouseButton _id)
-	{
-		if (isFocusMouse())
-		{
-			// если активный элемент заблокирован
-			if (!mWidgetMouseFocus->isEnabled())
-				return true;
-
-			mWidgetMouseFocus->onMouseButtonReleased(_absx, _absy, _id);
-
-			if (mIsWidgetMouseCapture)
-			{
-				// сбрасываем захват
-				mIsWidgetMouseCapture = false;
-
-				// после вызова, виджет может быть сброшен
-				if (nullptr != mWidgetMouseFocus)
-				{
-					if ((MouseButton::Left == _id) && mTimer.getMilliseconds() < INPUT_TIME_DOUBLE_CLICK)
-					{
-						mWidgetMouseFocus->onMouseButtonClick();
-						// после вызова, виджет может быть сброшен
-						if (nullptr != mWidgetMouseFocus) mWidgetMouseFocus->onMouseButtonDoubleClick();
-					}
-					else
-					{
-						// проверяем над тем ли мы окном сейчас что и были при нажатии
-						Widget* item = LayerManager::getInstance().getWidgetFromPoint(_absx, _absy);
-						if ( item == mWidgetMouseFocus)
-						{
-							mWidgetMouseFocus->onMouseButtonClick();
-						}
-						mTimer.reset();
-					}
-				}
-			}
-
-			// для корректного отображения
-			injectMouseMove(_absx, _absy, mOldAbsZ);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	bool InputManager::injectKeyPress(KeyCode _key, Char _text)
-	{
-		// проверка на переключение языков
-		firstEncoding(_key, true);
-
-		// запоминаем клавишу
-		storeKey(_key, _text);
-
-		bool wasFocusKey = isFocusKey();
-
-		//Pass keystrokes to the current active text widget
-		if (isFocusKey())
-		{
-			mWidgetKeyFocus->onKeyButtonPressed(_key, _text);
-		}
-
-		return wasFocusKey;
-	}
-
-	bool InputManager::injectKeyRelease(KeyCode _key)
-	{
-		// проверка на переключение языков
-		firstEncoding(_key, false);
-
-		// сбрасываем клавишу
-		resetKey();
-
-		bool wasFocusKey = isFocusKey();
-
-		if (isFocusKey()) mWidgetKeyFocus->onKeyButtonReleased(_key);
-
-		return wasFocusKey;
-	}
-
-	void InputManager::firstEncoding(KeyCode _key, bool bIsKeyPressed)
-	{
-		if ((_key == KeyCode::LeftShift) || (_key == KeyCode::RightShift))
-			mIsShiftPressed = bIsKeyPressed;
-		if ((_key == KeyCode::LeftControl) || (_key == KeyCode::RightControl))
-			mIsControlPressed = bIsKeyPressed;
-	}
-
-	void InputManager::setKeyFocusWidget(Widget* _widget)
-	{
-		if (_widget == mWidgetKeyFocus)
-			return;
-
-		//-------------------------------------------------------------------------------------//
-		// новый вид рутового фокуса
-		Widget* save_widget = nullptr;
-
-		// спускаемся по новому виджету и устанавливаем рутовый фокус
-		Widget* root_focus = _widget;
-		while (root_focus != nullptr)
-		{
-			if (root_focus->mRootKeyActive)
-			{
-				save_widget = root_focus;
-				break;
-			}
-			root_focus->mRootKeyActive = true;
-
-			// в методе может пропасть наш виджет
-			WidgetManager::getInstance().addWidgetToUnlink(root_focus);
-			root_focus->onKeyChangeRootFocus(true);
-			WidgetManager::getInstance().removeWidgetFromUnlink(root_focus);
-
-			if (root_focus)
-				root_focus = root_focus->getParent();
-		}
-
-		// спускаемся по старому виджету и сбрасываем фокус
-		root_focus = mWidgetKeyFocus;
-		while (root_focus != nullptr)
-		{
-			if (root_focus == save_widget)
-			{
-				break;
-			}
-			root_focus->mRootKeyActive = false;
-
-			// в методе может пропасть наш виджет
-			WidgetManager::getInstance().addWidgetToUnlink(root_focus);
-			root_focus->onKeyChangeRootFocus(false);
-			WidgetManager::getInstance().removeWidgetFromUnlink(root_focus);
-
-			if (root_focus)
-				root_focus = root_focus->getParent();
-		}
-		//-------------------------------------------------------------------------------------//
-
-		// сбрасываем старый
-		if (mWidgetKeyFocus)
-		{
-			mWidgetKeyFocus->onKeyLostFocus(_widget);
-		}
-
-		// устанавливаем новый
-		if (_widget && _widget->isNeedKeyFocus())
-		{
-			_widget->onKeySetFocus(mWidgetKeyFocus);
-		}
-
-		mWidgetKeyFocus = _widget;
-	}
-
-	void InputManager::resetMouseFocusWidget()
-	{
-		// спускаемся по старому виджету и сбрасываем фокус
-		Widget* root_focus = mWidgetMouseFocus;
-		while (root_focus != nullptr)
-		{
-			root_focus->mRootMouseActive = false;
-
-			// в методе может пропасть наш виджет
-			WidgetManager::getInstance().addWidgetToUnlink(root_focus);
-			root_focus->onMouseChangeRootFocus(false);
-			WidgetManager::getInstance().removeWidgetFromUnlink(root_focus);
-
-			if (root_focus)
-				root_focus = root_focus->getParent();
-		}
-
-		mIsWidgetMouseCapture = false;
-		if (nullptr != mWidgetMouseFocus)
-		{
-			mWidgetMouseFocus->onMouseLostFocus(nullptr);
-			mWidgetMouseFocus = nullptr;
-		}
-
-	}
-
-	// удаляем данный виджет из всех возможных мест
-	void InputManager::_unlinkWidget(Widget* _widget)
-	{
-		if (nullptr == _widget) return;
-		if (_widget == mWidgetMouseFocus)
-		{
-			mIsWidgetMouseCapture = false;
-			mWidgetMouseFocus = nullptr;
-		}
-		if (_widget == mWidgetKeyFocus)
-		{
-			mWidgetKeyFocus = nullptr;
-		}
-
-		// ручками сбрасываем, чтобы не менять фокусы
-		for (VectorWidgetPtr::iterator iter=mVectorModalRootWidget.begin(); iter!=mVectorModalRootWidget.end(); ++iter)
-		{
-			if ((*iter == _widget))
-			{
-				mVectorModalRootWidget.erase(iter);
-				break;
-			}
-		}
-
-	}
-
-	void InputManager::addWidgetModal(Widget* _widget)
-	{
-		if (nullptr == _widget) return;
-		MYGUI_ASSERT(nullptr == _widget->getParent(), "Modal widget must be root");
-
-		resetMouseFocusWidget();
-		removeWidgetModal(_widget);
-		mVectorModalRootWidget.push_back(_widget);
-
-		setKeyFocusWidget(_widget);
-		LayerManager::getInstance().upLayerItem(_widget);
-	}
-
-	void InputManager::removeWidgetModal(Widget* _widget)
-	{
-		resetKeyFocusWidget(_widget);
-		resetMouseFocusWidget();
-
-		for (VectorWidgetPtr::iterator iter=mVectorModalRootWidget.begin(); iter!=mVectorModalRootWidget.end(); ++iter)
-		{
-			if ((*iter == _widget))
-			{
-				mVectorModalRootWidget.erase(iter);
-				break;
-			}
-		}
-		// если еще есть модальные то их фокусируем и поднимаем
-		if (!mVectorModalRootWidget.empty())
-		{
-			setKeyFocusWidget(mVectorModalRootWidget.back());
-			LayerManager::getInstance().upLayerItem(mVectorModalRootWidget.back());
-		}
-	}
-
-	void InputManager::storeKey(KeyCode _key, Char _text)
-	{
-		mHoldKey = KeyCode::None;
-		mHoldChar = 0;
-
-		if ( !isFocusKey() ) return;
-		if ( (_key == KeyCode::LeftShift) || (_key == KeyCode::RightShift)
-			|| (_key == KeyCode::LeftControl) || (_key == KeyCode::RightControl)
-			|| (_key == KeyCode::LeftAlt) || (_key == KeyCode::RightAlt)
-			) return;
-
-		mFirstPressKey = true;
-		mHoldKey = _key;
-		mHoldChar = _text;
-		mTimerKey = 0.0f;
-	}
-
-	void InputManager::resetKey()
-	{
-		mHoldKey = KeyCode::None;
-		mHoldChar = 0;
-	}
-
-	void InputManager::frameEntered(float _frame)
-	{
-		if ( mHoldKey == KeyCode::None)
-			return;
-
-		if ( !isFocusKey() )
-		{
-			mHoldKey = KeyCode::None;
-			mHoldChar = 0;
-			return;
-		}
-
-		mTimerKey += _frame;
-
-		if (mFirstPressKey)
-		{
-			if (mTimerKey > INPUT_DELAY_FIRST_KEY)
-			{
-				mFirstPressKey = false;
-				mTimerKey = 0.0f;
-			}
-		}
-		else
-		{
-			if (mTimerKey > INPUT_INTERVAL_KEY)
-			{
-				while (mTimerKey > INPUT_INTERVAL_KEY) mTimerKey -= INPUT_INTERVAL_KEY;
-				mWidgetKeyFocus->onKeyButtonPressed(mHoldKey, mHoldChar);
-				// focus can be dropped in onKeyButtonPressed
-				if ( isFocusKey() ) mWidgetKeyFocus->onKeyButtonReleased(mHoldKey);
-			}
-		}
-
-	}
-
-	void InputManager::resetKeyFocusWidget(Widget* _widget)
-	{
-		if (mWidgetKeyFocus == _widget)
-			setKeyFocusWidget(nullptr);
-	}
-
-	IntPoint InputManager::getMousePositionByLayer()
-	{
-		if (mLayerMouseFocus != nullptr)
-			return mLayerMouseFocus->getPosition(mMousePosition.left, mMousePosition.top);
-		return mMousePosition;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ItemBox.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ItemBox.cpp
deleted file mode 100644
index ccecf16ed4..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ItemBox.cpp
+++ /dev/null
@@ -1,905 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ItemBox.h"
-#include "MyGUI_Button.h"
-#include "MyGUI_VScroll.h"
-#include "MyGUI_HScroll.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_WidgetTranslate.h"
-#include "MyGUI_WidgetManager.h"
-
-namespace MyGUI
-{
-
-	ItemBox::ItemBox() :
-		mCountItemInLine(0),
-		mCountLines(0),
-		mFirstVisibleIndex(0),
-		mFirstOffsetIndex(0),
-		mIndexSelect(ITEM_NONE),
-		mIndexActive(ITEM_NONE),
-		mIndexAccept(ITEM_NONE),
-		mIndexRefuse(ITEM_NONE),
-		mIsFocus(false),
-		mItemDrag(nullptr),
-		mAlignVert(true)
-	{
-		mChangeContentByResize = true;
-	}
-
-	void ItemBox::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	ItemBox::~ItemBox()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void ItemBox::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void ItemBox::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// нам нужен фокус клавы
-		mNeedKeyFocus = true;
-		mDragLayer = "DragAndDrop";
-
-		const MapString& properties = _info->getProperties();
-		if (!properties.empty())
-		{
-			MapString::const_iterator iter = properties.find("AlignVert");
-			if (iter != properties.end()) mAlignVert = utility::parseBool(iter->second);
-			iter = properties.find("DragLayer");
-			if (iter != properties.end()) mDragLayer = iter->second;
-		}
-
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "VScroll")
-			{
-				MYGUI_DEBUG_ASSERT( ! mVScroll, "widget already assigned");
-				mVScroll = (*iter)->castType<VScroll>();
-				mVScroll->eventScrollChangePosition = newDelegate(this, &ItemBox::notifyScrollChangePosition);
-			}
-			if (*(*iter)->_getInternalData<std::string>() == "HScroll")
-			{
-				MYGUI_DEBUG_ASSERT( ! mHScroll, "widget already assigned");
-				mHScroll = (*iter)->castType<HScroll>();
-				mHScroll->eventScrollChangePosition = newDelegate(this, &ItemBox::notifyScrollChangePosition);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "Client")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetClient, "widget already assigned");
-				mWidgetClient = (*iter);
-				mWidgetClient->eventMouseWheel = newDelegate(this, &ItemBox::notifyMouseWheel);
-				mWidgetClient->eventMouseButtonPressed = newDelegate(this, &ItemBox::notifyMouseButtonPressed);
-				mClient = mWidgetClient;
-			}
-		}
-		// сли нет скрола, то клиенская зона не обязательно
-		//MYGUI_ASSERT(nullptr != mWidgetClient, "Child Widget Client not found in skin (ItemBox must have Client) skin ='" << _info->getSkinName() << "'");
-
-		// подписываем клиент для драгэндропа
-		if (mWidgetClient != nullptr)
-			mWidgetClient->_requestGetContainer = newDelegate(this, &ItemBox::_requestGetContainer);
-
-		requestItemSize();
-
-		updateScrollSize();
-		updateScrollPosition();
-	}
-
-	void ItemBox::shutdownWidgetSkin()
-	{
-		mVScroll = nullptr;
-		mHScroll = nullptr;
-		mClient = nullptr;
-		mWidgetClient = nullptr;
-	}
-
-	void ItemBox::setPosition(const IntPoint& _point)
-	{
-		Base::setPosition(_point);
-	}
-
-	void ItemBox::setSize(const IntSize& _size)
-	{
-		Base::setSize(_size);
-		updateFromResize();
-	}
-
-	void ItemBox::setCoord(const IntCoord& _coord)
-	{
-		Base::setCoord(_coord);
-		updateFromResize();
-	}
-
-	void ItemBox::requestItemSize()
-	{
-		IntCoord coord(0, 0, 1, 1);
-
-		// спрашиваем размер иконок
-		requestCoordItem(this, coord, false);
-
-		mSizeItem = coord.size();
-		MYGUI_ASSERT((mSizeItem.width > 0 && mSizeItem.height > 0), "(mSizeItem.width > 0 && mSizeItem.height > 0)  at requestCoordWidgetItem");
-	}
-
-	void ItemBox::updateFromResize()
-	{
-		requestItemSize();
-
-		updateScrollSize();
-		updateScrollPosition();
-
-		_updateAllVisible(true);
-		_resetContainer(true);
-	}
-
-	void ItemBox::_updateAllVisible(bool _redraw)
-	{
-		int count_visible = 0;
-		if (mAlignVert)
-		{
-			count_visible = (_getClientWidget()->getHeight() / mSizeItem.height) + 2;
-		}
-		else
-		{
-			count_visible = (_getClientWidget()->getWidth() / mSizeItem.width) + 2;
-		}
-
-		size_t start = (mFirstVisibleIndex * mCountItemInLine);
-		size_t count = (count_visible * mCountItemInLine) + start;
-
-		size_t index = 0;
-		for (size_t pos = start; pos<count; ++pos, ++index)
-		{
-			// дальше нет айтемов
-			if (pos >= mItemsInfo.size()) break;
-
-			Widget* item = getItemWidget(index);
-			if (mAlignVert)
-			{
-				item->setPosition(((int)index % mCountItemInLine) * mSizeItem.width - mContentPosition.left,
-					(((int)index / mCountItemInLine) * mSizeItem.height)  - mFirstOffsetIndex);
-			}
-			else
-			{
-				item->setPosition((((int)index / mCountItemInLine) * mSizeItem.width)  - mFirstOffsetIndex,
-					((int)index % mCountItemInLine) * mSizeItem.height - mContentPosition.top);
-			}
-
-			item->setSize(mSizeItem);
-			item->setVisible(true);
-
-			if (_redraw)
-			{
-				IBDrawItemInfo data(pos, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, true, false);
-				requestDrawItem(this, item, data);
-			}
-
-		}
-
-		// все виджеты еще есть, то их надо бы скрыть
-		while (index < mVectorItems.size())
-		{
-			mVectorItems[index]->setVisible(false);
-			index ++;
-		}
-
-	}
-
-	Widget* ItemBox::getItemWidget(size_t _index)
-	{
-		// еще нет такого виджета, нуно создать
-		if (_index == mVectorItems.size())
-		{
-
-			requestItemSize();
-
-			Widget* item = _getClientWidget()->createWidget<Widget>("Default", IntCoord(0, 0, mSizeItem.width, mSizeItem.height), Align::Default);
-
-			// вызываем запрос на создание виджета
-			requestCreateWidgetItem(this, item);
-
-			item->eventMouseWheel = newDelegate(this, &ItemBox::notifyMouseWheel);
-			item->eventRootMouseChangeFocus = newDelegate(this, &ItemBox::notifyRootMouseChangeFocus);
-			item->eventMouseButtonPressed = newDelegate(this, &ItemBox::notifyMouseButtonPressed);
-			item->eventMouseButtonReleased = newDelegate(this, &ItemBox::notifyMouseButtonReleased);
-			item->eventMouseButtonDoubleClick = newDelegate(this, &ItemBox::notifyMouseButtonDoubleClick);
-			item->eventMouseDrag = newDelegate(this, &ItemBox::notifyMouseDrag);
-			item->_requestGetContainer = newDelegate(this, &ItemBox::_requestGetContainer);
-			item->eventKeyButtonPressed = newDelegate(this, &ItemBox::notifyKeyButtonPressed);
-			item->eventKeyButtonReleased = newDelegate(this, &ItemBox::notifyKeyButtonReleased);
-
-			item->_setInternalData((size_t)mVectorItems.size());
-
-			mVectorItems.push_back(item);
-		}
-
-		// запрашивать только последовательно
-		MYGUI_ASSERT_RANGE(_index, mVectorItems.size(), "ItemBox::getItemWidget");
-
-		return mVectorItems[_index];
-	}
-
-	void ItemBox::onMouseWheel(int _rel)
-	{
-		notifyMouseWheel(nullptr, _rel);
-
-		Base::onMouseWheel(_rel);
-	}
-
-	void ItemBox::onKeySetFocus(Widget* _old)
-	{
-		mIsFocus = true;
-		setState("pushed");
-
-		Base::onKeySetFocus(_old);
-	}
-
-	void ItemBox::onKeyLostFocus(Widget* _new)
-	{
-		mIsFocus = false;
-		setState("normal");
-
-		Base::onKeyLostFocus(_new);
-	}
-
-	void ItemBox::resetCurrentActiveItem()
-	{
-		// сбрасываем старую подсветку
-		if (mIndexActive != ITEM_NONE)
-		{
-			size_t start = (size_t)(mFirstVisibleIndex * mCountItemInLine);
-			size_t index = mIndexActive;
-			mIndexActive = ITEM_NONE;
-
-			// если видим, то обновляем
-			if ((mIndexActive >= start) && (mIndexActive < (start + mVectorItems.size())))
-			{
-				IBDrawItemInfo data(index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-
-				requestDrawItem(this, mVectorItems[mIndexActive - start], data);
-			}
-		}
-	}
-
-	void ItemBox::findCurrentActiveItem()
-	{
-		MYGUI_DEBUG_ASSERT(mIndexActive == ITEM_NONE, "use : resetCurrentActiveItem() before findCurrentActiveItem()");
-
-		const IntPoint& point = InputManager::getInstance().getMousePositionByLayer();
-
-		// сначала проверяем клиентскую зону
-		const IntRect& rect = _getClientAbsoluteRect();
-		if ((point.left < rect.left) || (point.left > rect.right) || (point.top < rect.top) || (point.top > rect.bottom))
-		{
-			return;
-		}
-
-		for (size_t pos=0; pos<mVectorItems.size(); ++pos)
-		{
-			Widget* item = mVectorItems[pos];
-			const IntRect& abs_rect = item->getAbsoluteRect();
-			if ((point.left>= abs_rect.left) && (point.left <= abs_rect.right) && (point.top>= abs_rect.top) && (point.top <= abs_rect.bottom))
-			{
-
-				size_t index = calcIndexByWidget(item);
-				// при переборе индекс может быть больше, так как может создасться сколько угодно
-				if (index < mItemsInfo.size())
-				{
-
-					mIndexActive = index;
-					IBDrawItemInfo data(index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-
-					requestDrawItem(this, item, data);
-				}
-
-				break;
-			}
-		}
-	}
-
-	void ItemBox::_requestGetContainer(Widget* _sender, Widget*& _container, size_t& _index)
-	{
-		if (_sender == _getClientWidget())
-		{
-			_container = this;
-			_index = ITEM_NONE;
-		}
-		else
-		{
-			size_t index = calcIndexByWidget(_sender);
-			if (index < mItemsInfo.size())
-			{
-				_container = this;
-				_index = index;
-			}
-		}
-	}
-
-	void ItemBox::_setContainerItemInfo(size_t _index, bool _set, bool _accept)
-	{
-		if (_index == ITEM_NONE) return;
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ItemBox::_setContainerItemInfo");
-
-		mIndexAccept = (_set && _accept ) ? _index : ITEM_NONE;
-		mIndexRefuse = (_set && !_accept) ? _index : ITEM_NONE;
-
-		size_t start = (size_t)(mFirstVisibleIndex * mCountItemInLine);
-		if ((_index >= start) && (_index < (start + mVectorItems.size())))
-		{
-			IBDrawItemInfo data(_index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-			requestDrawItem(this, mVectorItems[_index - start], data);
-		}
-	}
-
-	void ItemBox::setItemDataAt(size_t _index, Any _data)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ItemBox::setItemData");
-		mItemsInfo[_index].data = _data;
-
-		size_t start = (size_t)(mFirstVisibleIndex * mCountItemInLine);
-		if ((_index >= start) && (_index < (start + mVectorItems.size())))
-		{
-			IBDrawItemInfo data(_index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, true, false);
-			requestDrawItem(this, mVectorItems[_index - start], data);
-		}
-
-		_resetContainer(true);
-	}
-
-	void ItemBox::insertItemAt(size_t _index, Any _data)
-	{
-		MYGUI_ASSERT_RANGE_INSERT(_index, mItemsInfo.size(), "ItemBox::insertItemAt");
-		if (_index == ITEM_NONE) _index = mItemsInfo.size();
-
-		_resetContainer(false);
-
-		resetCurrentActiveItem();
-
-		mItemsInfo.insert(mItemsInfo.begin() + _index, ItemDataInfo(_data));
-
-		// расчитываем новый индекс выделения
-		if (mIndexSelect != ITEM_NONE)
-		{
-			if (mIndexSelect >= _index)
-			{
-				mIndexSelect ++;
-			}
-		}
-
-		updateScrollSize();
-		updateScrollPosition();
-
-		findCurrentActiveItem();
-
-		_updateAllVisible(true);
-	}
-
-	void ItemBox::removeItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ItemBox::removeItemAt");
-
-		_resetContainer(false);
-		resetCurrentActiveItem();
-
-		mItemsInfo.erase(mItemsInfo.begin() + _index);
-
-		// расчитываем новый индекс выделения
-		if (mIndexSelect != ITEM_NONE)
-		{
-			if (mItemsInfo.empty())
-			{
-				mIndexSelect = ITEM_NONE;
-			}
-			else if ((mIndexSelect > _index) || (mIndexSelect == mItemsInfo.size()))
-			{
-				mIndexSelect --;
-			}
-		}
-
-		updateScrollSize();
-		updateScrollPosition();
-
-		findCurrentActiveItem();
-
-		_updateAllVisible(true);
-	}
-
-	void ItemBox::removeAllItems()
-	{
-		if (0 == mItemsInfo.size()) return;
-		_resetContainer(false);
-
-		mItemsInfo.clear();
-
-		mIndexSelect = ITEM_NONE;
-		mIndexActive = ITEM_NONE;
-
-		updateScrollSize();
-		updateScrollPosition();
-
-		_updateAllVisible(true);
-	}
-
-	void ItemBox::redrawItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ItemBox::redrawItemAt");
-
-		size_t start = (size_t)(mFirstVisibleIndex * mCountItemInLine);
-		if ((_index >= start) && (_index < (start + mVectorItems.size())))
-		{
-			IBDrawItemInfo data(_index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, true, false);
-			requestDrawItem(this, mVectorItems[_index - start], data);
-		}
-	}
-
-	void ItemBox::setIndexSelected(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE_AND_NONE(_index, mItemsInfo.size(), "ItemBox::setIndexSelected");
-		if (_index == mIndexSelect) return;
-
-		size_t start = (size_t)(mFirstVisibleIndex * mCountItemInLine);
-
-		// сбрасываем старое выделение
-		if (mIndexSelect != ITEM_NONE)
-		{
-			size_t index = mIndexSelect;
-			mIndexSelect = ITEM_NONE;
-
-			if ((index >= start) && (index < (start + mVectorItems.size())))
-			{
-				IBDrawItemInfo data(index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-				requestDrawItem(this, mVectorItems[index - start], data);
-			}
-		}
-
-		mIndexSelect = _index;
-		if (mIndexSelect != ITEM_NONE)
-		{
-			if ((_index >= start) && (_index < (start + mVectorItems.size())))
-			{
-				IBDrawItemInfo data(_index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-				requestDrawItem(this, mVectorItems[_index - start], data);
-			}
-		}
-
-	}
-
-	void ItemBox::notifyMouseButtonDoubleClick(Widget* _sender)
-	{
-		size_t index = getIndexByWidget(_sender);
-
-		eventSelectItemAccept(this, index);
-	}
-
-	void ItemBox::setItemBoxAlignVert(bool _vert)
-	{
-		if (mAlignVert == _vert) return;
-		mAlignVert = _vert;
-
-		mCountItemInLine = -1;
-		updateFromResize();
-	}
-
-	void ItemBox::notifyKeyButtonPressed(Widget* _sender, KeyCode _key, Char _char)
-	{
-		eventNotifyItem(this, IBNotifyItemData(getIndexByWidget(_sender), IBNotifyItemData::KeyPressed, _key, _char));
-	}
-
-	void ItemBox::notifyKeyButtonReleased(Widget* _sender, KeyCode _key)
-	{
-		eventNotifyItem(this, IBNotifyItemData(getIndexByWidget(_sender), IBNotifyItemData::KeyReleased, _key));
-	}
-
-	size_t ItemBox::getIndexByWidget(Widget* _widget)
-	{
-		MYGUI_ASSERT(_widget, "ItemBox::getIndexByWidget : Widget == nullptr");
-		if (_widget == _getClientWidget()) return ITEM_NONE;
-		MYGUI_ASSERT(_widget->getParent() == _getClientWidget(), "ItemBox::getIndexByWidget : Widget is not child");
-
-		size_t index = calcIndexByWidget(_widget);
-		MYGUI_ASSERT_RANGE(index, mItemsInfo.size(), "ItemBox::getIndexByWidget");
-
-		return index;
-	}
-
-	size_t ItemBox::_getContainerIndex(const IntPoint& _point)
-	{
-		for (VectorWidgetPtr::iterator iter=mVectorItems.begin(); iter!=mVectorItems.end(); ++iter)
-		{
-			if ((*iter)->isVisible())
-			{
-				if ((*iter)->getAbsoluteRect().inside(_point))
-				{
-					return getIndexByWidget(*iter);
-				}
-			}
-		}
-		return ITEM_NONE;
-	}
-
-	void ItemBox::_resetContainer(bool _update)
-	{
-		// обязательно у базового
-		Base::_resetContainer(_update);
-
-		if ( ! _update)
-		{
-			WidgetManager& instance = WidgetManager::getInstance();
-			for (VectorWidgetPtr::iterator iter=mVectorItems.begin(); iter!=mVectorItems.end(); ++iter)
-			{
-				instance.unlinkFromUnlinkers(*iter);
-			}
-		}
-	}
-
-	Widget* ItemBox::getWidgetByIndex(size_t _index)
-	{
-		for (VectorWidgetPtr::iterator iter=mVectorItems.begin(); iter!=mVectorItems.end(); ++iter)
-		{
-			if ((*iter)->isVisible())
-			{
-				size_t index = getIndexByWidget(*iter);
-
-				if (index == _index) return (*iter);
-			}
-		}
-		return nullptr;
-	}
-
-	void ItemBox::onMouseButtonPressed(int _left, int _top, MouseButton _id)
-	{
-		Base::onMouseButtonPressed(_left, _top, _id);
-	}
-
-	void ItemBox::onMouseButtonReleased(int _left, int _top, MouseButton _id)
-	{
-		Base::onMouseButtonReleased(_left, _top, _id);
-	}
-
-	void ItemBox::onMouseDrag(int _left, int _top)
-	{
-		Base::onMouseDrag(_left, _top);
-	}
-
-	void ItemBox::removeDropItems()
-	{
-		if (mItemDrag) mItemDrag->setVisible(false);
-	}
-
-	void ItemBox::updateDropItems()
-	{
-		if (nullptr == mItemDrag)
-		{
-			// спрашиваем размер иконок
-			IntCoord coord;
-
-			requestCoordItem(this, coord, true);
-
-			mPointDragOffset = coord.point();
-
-			// создаем и запрашиваем детей
-			mItemDrag = Gui::getInstance().createWidget<Widget>("Default", IntCoord(0, 0, coord.width, coord.height), Align::Default, mDragLayer);
-			requestCreateWidgetItem(this, mItemDrag);
-		}
-
-		const IntPoint& point = InputManager::getInstance().getMousePosition();
-
-		mItemDrag->setPosition(point.left - mClickInWidget.left + mPointDragOffset.left, point.top - mClickInWidget.top + mPointDragOffset.top);
-		mItemDrag->setVisible(true);
-	}
-
-	void ItemBox::updateDropItemsState(const DDWidgetState& _state)
-	{
-		IBDrawItemInfo data;
-		data.drop_accept = _state.accept;
-		data.drop_refuse = _state.refuse;
-
-		data.select = false;
-		data.active = false;
-
-		data.index = mDropSenderIndex;
-		data.update = _state.update;
-		data.drag = true;
-
-		requestDrawItem(this, mItemDrag, data);
-	}
-
-	void ItemBox::notifyMouseDrag(Widget* _sender, int _left, int _top)
-	{
-		mouseDrag();
-	}
-
-	void ItemBox::notifyMouseButtonPressed(Widget* _sender, int _left, int _top, MouseButton _id)
-	{
-		mouseButtonPressed(_id);
-
-		if ( MouseButton::Left == _id)
-		{
-			size_t old = mIndexSelect;
-
-			if (_sender == _getClientWidget())
-			{
-				// сбрасываем выделение
-				setIndexSelected(ITEM_NONE);
-			}
-			else
-			{
-				// индекс отправителя
-				mDropSenderIndex = getIndexByWidget(_sender);
-
-				// выделенный елемент
-				setIndexSelected(mDropSenderIndex);
-			}
-
-			// смещение внутри виджета, куда кликнули мышкой
-			mClickInWidget = InputManager::getInstance().getLastLeftPressed() - _sender->getAbsolutePosition();
-
-			// отсылаем событие
-			eventMouseItemActivate(this, mIndexSelect);
-			// смену позиции отсылаем только при реальном изменении
-			if (old != mIndexSelect) eventChangeItemPosition(this, mIndexSelect);
-		}
-
-		eventNotifyItem(this, IBNotifyItemData(getIndexByWidget(_sender), IBNotifyItemData::MousePressed, _left, _top, _id));
-	}
-
-	void ItemBox::notifyMouseButtonReleased(Widget* _sender, int _left, int _top, MouseButton _id)
-	{
-		mouseButtonReleased(_id);
-		size_t index = calcIndexByWidget(_sender);
-		// солличество айтемов может измениться
-		if (index >= getItemCount()) return;
-		eventNotifyItem(this, IBNotifyItemData(index, IBNotifyItemData::MouseReleased, _left, _top, _id));
-	}
-
-	void ItemBox::notifyRootMouseChangeFocus(Widget* _sender, bool _focus)
-	{
-		size_t index = calcIndexByWidget(_sender);
-		if (_focus)
-		{
-			MYGUI_ASSERT_RANGE(index, mItemsInfo.size(), "ItemBox::notifyRootMouseChangeFocus");
-
-			// сбрасываем старый
-			if (mIndexActive != ITEM_NONE)
-			{
-				size_t old_index = mIndexActive;
-				mIndexActive = ITEM_NONE;
-				IBDrawItemInfo data(old_index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-				requestDrawItem(this, mVectorItems[old_index - (mFirstVisibleIndex * mCountItemInLine)], data);
-			}
-
-			mIndexActive = index;
-			IBDrawItemInfo data(index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-			requestDrawItem(this, mVectorItems[*_sender->_getInternalData<size_t>()], data);
-		}
-		else
-		{
-			// при сбросе виджет может быть уже скрыт, и соответсвенно отсутсвовать индекс
-			// сбрасываем индекс, только если мы и есть актив
-			if (index < mItemsInfo.size() && mIndexActive == index)
-			{
-				mIndexActive = ITEM_NONE;
-				IBDrawItemInfo data(index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-				requestDrawItem(this, mVectorItems[*_sender->_getInternalData<size_t>()], data);
-			}
-		}
-	}
-
-	void ItemBox::updateMetrics()
-	{
-		if (mAlignVert)
-		{
-			// колличество айтемов на одной строке
-			mCountItemInLine = _getClientWidget()->getWidth() / mSizeItem.width;
-		}
-		else
-		{
-			// колличество айтемов на одной строке
-			mCountItemInLine = _getClientWidget()->getHeight() / mSizeItem.height;
-		}
-
-		if (1 > mCountItemInLine) mCountItemInLine = 1;
-
-		// колличество строк
-		mCountLines = mItemsInfo.size() / mCountItemInLine;
-		if (0 != (mItemsInfo.size() % mCountItemInLine)) mCountLines ++;
-
-		if (mAlignVert)
-		{
-			mContentSize.width = (mSizeItem.width * mCountItemInLine);
-			mContentSize.height = (mSizeItem.height * mCountLines);
-		}
-		else
-		{
-			mContentSize.width = (mSizeItem.width * mCountLines);
-			mContentSize.height = (mSizeItem.height * mCountItemInLine);
-		}
-	}
-
-	void ItemBox::notifyScrollChangePosition(VScroll* _sender, size_t _index)
-	{
-		if (_sender == mVScroll)
-		{
-			mContentPosition.top = (int)_index;
-		}
-		else if (_sender == mHScroll)
-		{
-			mContentPosition.left = (int)_index;
-		}
-
-		setContentPosition(mContentPosition);
-	}
-
-	void ItemBox::notifyMouseWheel(Widget* _sender, int _rel)
-	{
-		if (mAlignVert)
-		{
-			if (mContentSize.height <= 0) return;
-
-			int offset = mContentPosition.top;
-			if (_rel < 0) offset += mSizeItem.height;
-			else offset -= mSizeItem.height;
-
-			if (offset >= mContentSize.height - _getClientWidget()->getHeight()) offset = mContentSize.height - _getClientWidget()->getHeight();
-			else if (offset < 0) offset = 0;
-
-			if (mContentPosition.top == offset) return;
-
-			// сбрасываем старую подсветку
-			// так как при прокрутке, мышь может находиться над окном
-			resetCurrentActiveItem();
-
-			mContentPosition.top = offset;
-		}
-		else
-		{
-			if (mContentSize.width <= 0) return;
-
-			int offset = mContentPosition.left;
-			if (_rel < 0) offset += mSizeItem.width;
-			else  offset -= mSizeItem.width;
-
-			if (offset >= mContentSize.width - _getClientWidget()->getWidth()) offset = mContentSize.width - _getClientWidget()->getWidth();
-			else if (offset < 0) offset = 0;
-
-			if (mContentPosition.left == offset) return;
-
-			// сбрасываем старую подсветку
-			// так как при прокрутке, мышь может находиться над окном
-			resetCurrentActiveItem();
-
-			mContentPosition.left = offset;
-		}
-
-		setContentPosition(mContentPosition);
-
-		// заново ищем и подсвечиваем айтем
-		if (!mNeedDrop)
-			findCurrentActiveItem();
-
-		if (nullptr != mVScroll) mVScroll->setScrollPosition(mContentPosition.top);
-		if (nullptr != mHScroll) mHScroll->setScrollPosition(mContentPosition.left);
-	}
-
-	void ItemBox::setContentPosition(const IntPoint& _point)
-	{
-		mContentPosition = _point;
-
-		int old = mFirstVisibleIndex;
-
-		if (mAlignVert)
-		{
-			mFirstVisibleIndex = mContentPosition.top / mSizeItem.height;
-			mFirstOffsetIndex = mContentPosition.top % mSizeItem.height;
-		}
-		else
-		{
-			mFirstVisibleIndex = mContentPosition.left / mSizeItem.width;
-			mFirstOffsetIndex = mContentPosition.left % mSizeItem.width;
-		}
-
-		_updateAllVisible(old != mFirstVisibleIndex);
-		_resetContainer(true);
-	}
-
-	void ItemBox::redrawAllItems()
-	{
-		_updateAllVisible(true);
-	}
-
-	void ItemBox::resetDrag()
-	{
-		endDrop(true);
-	}
-
-	size_t ItemBox::calcIndexByWidget(Widget* _widget)
-	{
-		return *_widget->_getInternalData<size_t>() + (mFirstVisibleIndex * mCountItemInLine);
-	}
-
-	IntSize ItemBox::getContentSize()
-	{
-		return mContentSize;
-	}
-
-	IntPoint ItemBox::getContentPosition()
-	{
-		return mContentPosition;
-	}
-
-	IntSize ItemBox::getViewSize() const
-	{
-		return _getClientWidget()->getSize();
-	}
-
-	void ItemBox::eraseContent()
-	{
-		updateMetrics();
-	}
-
-	size_t ItemBox::getHScrollPage()
-	{
-		return mSizeItem.width;
-	}
-
-	size_t ItemBox::getVScrollPage()
-	{
-		return mSizeItem.height;
-	}
-
-	Align ItemBox::getContentAlign()
-	{
-		return Align::Default;
-	}
-
-	IntRect ItemBox::_getClientAbsoluteRect()
-	{
-		return _getClientWidget()->getAbsoluteRect();
-	}
-
-	Widget* ItemBox::_getClientWidget()
-	{
-		return mWidgetClient == nullptr ? this : mWidgetClient;
-	}
-
-	const Widget* ItemBox::_getClientWidget() const
-	{
-		return mWidgetClient == nullptr ? this : mWidgetClient;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LanguageManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LanguageManager.cpp
deleted file mode 100644
index 56cf100978..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LanguageManager.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_LanguageManager.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_DataManager.h"
-#include "MyGUI_FactoryManager.h"
-
-namespace MyGUI
-{
-
-	const std::string XML_TYPE("Language");
-
-	MYGUI_INSTANCE_IMPLEMENT( LanguageManager )
-
-	void LanguageManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		ResourceManager::getInstance().registerLoadXmlDelegate(XML_TYPE) = newDelegate(this, &LanguageManager::_load);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void LanguageManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		ResourceManager::getInstance().unregisterLoadXmlDelegate(XML_TYPE);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	bool LanguageManager::load(const std::string& _file)
-	{
-		return ResourceManager::getInstance()._loadImplement(_file, true, XML_TYPE, INSTANCE_TYPE_NAME);
-	}
-
-	void LanguageManager::_load(xml::ElementPtr _node, const std::string& _file, Version _version)
-	{
-		std::string default_lang;
-		bool event_change = false;
-
-		// берем детей и крутимся, основной цикл
-		xml::ElementEnumerator root = _node->getElementEnumerator();
-		while (root.next(XML_TYPE))
-		{
-			// парсим атрибуты
-			root->findAttribute("default", default_lang);
-
-			// берем детей и крутимся
-			xml::ElementEnumerator info = root->getElementEnumerator();
-			while (info.next("Info"))
-			{
-				// парсим атрибуты
-				std::string name(info->findAttribute("name"));
-
-				// доюавляем в карту пользователя
-				if (name.empty())
-				{
-					xml::ElementEnumerator source_info = info->getElementEnumerator();
-					while (source_info.next("Source"))
-					{
-						loadLanguage(source_info->getContent(), true);
-					}
-				}
-				// добавляем в карту языков
-				else
-				{
-					xml::ElementEnumerator source_info = info->getElementEnumerator();
-					while (source_info.next("Source"))
-					{
-						std::string file_source = source_info->getContent();
-						// добавляем в карту
-						mMapFile[name].push_back(file_source);
-
-						// если добавляемый файл для текущего языка, то подгружаем и оповещаем
-						if (name == mCurrentLanguageName)
-						{
-							loadLanguage(file_source, false);
-							event_change = true;
-						}
-					}
-				}
-
-			}
-		}
-
-		if (!default_lang.empty())
-			setCurrentLanguage(default_lang);
-		else if (event_change)
-			eventChangeLanguage(mCurrentLanguageName);
-	}
-
-	void LanguageManager::setCurrentLanguage(const std::string& _name)
-	{
-		mMapLanguage.clear();
-
-		mCurrentLanguageName = _name;
-
-		MapListString::iterator item = mMapFile.find(_name);
-		if (item == mMapFile.end())
-		{
-			MYGUI_LOG(Error, "Language '" << _name << "' is not found");
-			return;
-		}
-
-		for (VectorString::const_iterator iter=item->second.begin(); iter!=item->second.end(); ++iter)
-		{
-			loadLanguage(*iter, false);
-		}
-
-		eventChangeLanguage(mCurrentLanguageName);
-	}
-
-	bool LanguageManager::loadLanguage(const std::string& _file, bool _user)
-	{
-		IDataStream* data = DataManager::getInstance().getData(_file);
-		if (data == nullptr)
-		{
-			MYGUI_LOG(Error, "file '" << _file << "' not found");
-			return false;
-		}
-
-		if (_file.find(".xml") != std::string::npos)
-			_loadLanguageXML(data, _user);
-		else
-			_loadLanguage(data, _user);
-
-		delete data;
-		return true;
-	}
-
-	void LanguageManager::_loadLanguageXML(IDataStream* _stream, bool _user)
-	{
-		xml::Document doc;
-		// формат xml
-		if (doc.open(_stream))
-		{
-			xml::ElementPtr root = doc.getRoot();
-			if (root)
-			{
-				xml::ElementEnumerator tag = root->getElementEnumerator();
-				while (tag.next("Tag"))
-				{
-					if (_user)
-						mUserMapLanguage[tag->findAttribute("name")] = tag->getContent();
-					else
-						mMapLanguage[tag->findAttribute("name")] = tag->getContent();
-				}
-			}
-		}
-	}
-
-	void LanguageManager::_loadLanguage(IDataStream* _stream, bool _user)
-	{
-		// формат txt
-		std::string read;
-		while (!_stream->eof())
-		{
-			_stream->readline(read, '\n');
-			if (read.empty()) continue;
-
-			// заголовок утф
-			if ((uint8)read[0] == 0xEF && read.size() > 2)
-			{
-				read.erase(0, 3);
-			}
-
-			if (read[read.size()-1] == '\r') read.erase(read.size()-1, 1);
-			if (read.empty()) continue;
-
-			size_t pos = read.find_first_of(" \t");
-			if (_user)
-			{
-				if (pos == std::string::npos) mUserMapLanguage[read] = "";
-				else mUserMapLanguage[read.substr(0, pos)] = read.substr(pos+1, std::string::npos);
-			}
-			else
-			{
-				if (pos == std::string::npos) mMapLanguage[read] = "";
-				else mMapLanguage[read.substr(0, pos)] = read.substr(pos+1, std::string::npos);
-			}
-		}
-	}
-
-	UString LanguageManager::replaceTags(const UString& _line)
-	{
-		// вот хз, что быстрее, итераторы или математика указателей,
-		// для непонятно какого размера одного символа UTF8
-		UString line(_line);
-
-		if (mMapLanguage.empty() && mUserMapLanguage.empty())
-			return _line;
-
-		UString::iterator end = line.end();
-		for (UString::iterator iter=line.begin(); iter!=end; )
-		{
-			if (*iter == '#')
-			{
-				++iter;
-				if (iter == end)
-				{
-					return line;
-				}
-				else
-				{
-					if (*iter != '{')
-					{
-						++iter;
-						continue;
-					}
-					UString::iterator iter2 = iter;
-					++iter2;
-					while (true)
-					{
-						if (iter2 == end) return line;
-						if (*iter2 == '}')
-						{
-							size_t start = iter - line.begin();
-							size_t len = (iter2 - line.begin()) - start - 1;
-							const UString& tag = line.substr(start + 1, len);
-
-							bool find = true;
-							MapLanguageString::iterator replace = mMapLanguage.find(tag);
-							if (replace == mMapLanguage.end())
-							{
-								replace = mUserMapLanguage.find(tag);
-								find = replace != mUserMapLanguage.end();
-							}
-
-							if (!find)
-							{
-								iter = line.insert(iter, '#') + size_t(len + 2);
-								end = line.end();
-								break;
-							}
-
-							iter = line.erase(iter - size_t(1), iter2 + size_t(1));
-							size_t pos = iter - line.begin();
-							line.insert(pos, replace->second);
-							iter = line.begin() + pos + replace->second.length();
-							end = line.end();
-							if (iter == end) return line;
-							break;
-
-						}
-						++iter2;
-					}
-				}
-			}
-			else
-			{
-				++iter;
-			}
-		}
-
-		return line;
-	}
-
-	UString LanguageManager::getTag(const UString& _tag)
-	{
-		MapLanguageString::iterator iter = mMapLanguage.find(_tag);
-		if (iter == mMapLanguage.end())
-		{
-			iter = mUserMapLanguage.find(_tag);
-			if (iter != mUserMapLanguage.end()) return iter->second;
-			return _tag;
-		}
-
-		return iter->second;
-	}
-
-	const std::string& LanguageManager::getCurrentLanguage()
-	{
-		return mCurrentLanguageName;
-	}
-
-	void LanguageManager::addUserTag(const UString& _tag, const UString& _replace)
-	{
-		mUserMapLanguage[_tag] = _replace;
-	}
-
-	void LanguageManager::clearUserTags()
-	{
-		mUserMapLanguage.clear();
-	}
-
-	bool LanguageManager::loadUserTags(const std::string& _file)
-	{
-		return loadLanguage(_file, true);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LayerItem.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LayerItem.cpp
deleted file mode 100644
index 72d0209df8..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LayerItem.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_LayerItem.h"
-#include <algorithm>
-
-namespace MyGUI
-{
-
-	LayerItem::LayerItem() :
-		mLayer(nullptr),
-		mLayerNode(nullptr),
-		mSaveLayerNode(nullptr),
-		mTexture(nullptr)
-	{
-	}
-
-	void LayerItem::addChildItem(LayerItem* _item)
-	{
-		mLayerItems.push_back(_item);
-		if (mLayerNode != nullptr)
-		{
-			_item->attachToLayerItemNode(mLayerNode, false);
-		}
-	}
-
-	void LayerItem::removeChildItem(LayerItem* _item)
-	{
-		VectorLayerItem::iterator item = std::remove(mLayerItems.begin(), mLayerItems.end(), _item);
-		MYGUI_ASSERT(item != mLayerItems.end(), "item not found");
-		mLayerItems.erase(item);
-	}
-
-	void LayerItem::addChildNode(LayerItem* _item)
-	{
-		mLayerNodes.push_back(_item);
-		if (mLayerNode != nullptr)
-		{
-			// ������� ����������� ����� �����
-			ILayerNode* child_node = mLayerNode->createChildItemNode();
-			_item->attachToLayerItemNode(child_node, true);
-		}
-	}
-
-	void LayerItem::removeChildNode(LayerItem* _item)
-	{
-		VectorLayerItem::iterator item = std::remove(mLayerNodes.begin(), mLayerNodes.end(), _item);
-		MYGUI_ASSERT(item != mLayerNodes.end(), "item not found");
-		mLayerNodes.erase(item);
-	}
-
-	void LayerItem::addRenderItem(ISubWidget* _item)
-	{
-		mDrawItems.push_back(_item);
-	}
-
-	void LayerItem::removeAllRenderItems()
-	{
-		detachFromLayerItemNode(false);
-		mDrawItems.clear();
-	}
-
-	void LayerItem::setRenderItemTexture(ITexture* _texture)
-	{
-		mTexture = _texture;
-		if (mLayerNode)
-		{
-			ILayerNode* node = mLayerNode;
-			// ����� ������� ����� ��� ������
-			detachFromLayerItemNode(false);
-			attachToLayerItemNode(node, false);
-		}
-	}
-
-	void LayerItem::saveLayerItem()
-	{
-		mSaveLayerNode = mLayerNode;
-	}
-
-	void LayerItem::restoreLayerItem()
-	{
-		mLayerNode = mSaveLayerNode;
-		if (mLayerNode)
-		{
-			attachToLayerItemNode(mLayerNode, false);
-		}
-	}
-
-	void LayerItem::attachItemToNode(ILayer* _layer, ILayerNode* _node)
-	{
-		mLayer = _layer;
-		mLayerNode = _node;
-
-		attachToLayerItemNode(_node, true);
-	}
-
-	void LayerItem::detachFromLayer()
-	{
-		// �� ��� ���������� � �����
-		if (nullptr == mLayer) return;
-
-		// ������ ���� �� ������
-		MYGUI_ASSERT(mLayerNode, "_item->mLayerNode == nullptr");
-
-		// ������������ �� ��������
-		mLayerNode->detachLayerItem(this);
-
-		// ��� ������ ����������
-		ILayerNode * save = mLayerNode;
-
-		// ��������� �����������
-		detachFromLayerItemNode(true);
-
-		// ����������� ���� � �������� � �������� �������
-		mLayer->destroyChildItemNode(save);
-		mLayerNode = nullptr;
-		mLayer = nullptr;
-	}
-
-	void LayerItem::upLayerItem()
-	{
-		if (mLayerNode) mLayerNode->getLayer()->upChildItemNode(mLayerNode);
-	}
-
-	void LayerItem::attachToLayerItemNode(ILayerNode* _item, bool _deep)
-	{
-		MYGUI_DEBUG_ASSERT(nullptr != _item, "attached item must be valid");
-
-		// ���������, ����� ����������� ���� ����� �������������
-		mLayerNode = _item;
-
-		for (VectorSubWidget::iterator skin = mDrawItems.begin(); skin != mDrawItems.end(); ++skin)
-		{
-			(*skin)->createDrawItem(mTexture, _item);
-		}
-
-		for (VectorLayerItem::iterator item = mLayerItems.begin(); item != mLayerItems.end(); ++item)
-		{
-			(*item)->attachToLayerItemNode(_item, _deep);
-		}
-
-		for (VectorLayerItem::iterator item = mLayerNodes.begin(); item != mLayerNodes.end(); ++item)
-		{
-			// ������� ����������� ����� �����
-			if (_deep)
-			{
-				ILayerNode* child_node = _item->createChildItemNode();
-				(*item)->attachToLayerItemNode(child_node, _deep);
-			}
-		}
-	}
-
-	void LayerItem::detachFromLayerItemNode(bool _deep)
-	{
-		for (VectorLayerItem::iterator item = mLayerItems.begin(); item != mLayerItems.end(); ++item)
-		{
-			(*item)->detachFromLayerItemNode(_deep);
-		}
-
-		for (VectorLayerItem::iterator item = mLayerNodes.begin(); item != mLayerNodes.end(); ++item)
-		{
-			if (_deep)
-			{
-				ILayerNode* node = (*item)->mLayerNode;
-				(*item)->detachFromLayerItemNode(_deep);
-				if (node)
-				{
-					node->getLayer()->destroyChildItemNode(node);
-				}
-			}
-		}
-
-		// �� ��� ����������
-		ILayerNode* node = mLayerNode;
-		if (node)
-		{
-			//for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_detachFromLayerItemKeeperByStyle(_deep);
-			for (VectorSubWidget::iterator skin = mDrawItems.begin(); skin != mDrawItems.end(); ++skin)
-			{
-				(*skin)->destroyDrawItem();
-			}
-
-			// ��� �������� �������, ���� �� ����������, �� ��� ��� ��������� �����
-			/*if (_deep && !this->isRootWidget() && mWidgetStyle == WidgetStyle::Overlapped)
-			{
-				node->destroyItemNode();
-			}*/
-			// �������
-			mLayerNode = nullptr;
-		}
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LayerManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LayerManager.cpp
deleted file mode 100644
index b040164cb5..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LayerManager.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_LayerItem.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_FactoryManager.h"
-
-#include "MyGUI_SharedLayer.h"
-#include "MyGUI_OverlappedLayer.h"
-
-namespace MyGUI
-{
-
-	const std::string XML_TYPE("Layer");
-
-	MYGUI_INSTANCE_IMPLEMENT( LayerManager )
-
-	void LayerManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		WidgetManager::getInstance().registerUnlinker(this);
-		ResourceManager::getInstance().registerLoadXmlDelegate(XML_TYPE) = newDelegate(this, &LayerManager::_load);
-
-		FactoryManager::getInstance().registerFactory<SharedLayer>(XML_TYPE);
-		FactoryManager::getInstance().registerFactory<OverlappedLayer>(XML_TYPE);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void LayerManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		FactoryManager::getInstance().unregisterFactory<SharedLayer>(XML_TYPE);
-		FactoryManager::getInstance().unregisterFactory<OverlappedLayer>(XML_TYPE);
-
-		// удаляем все хранители слоев
-		clear();
-
-		WidgetManager::getInstance().unregisterUnlinker(this);
-		ResourceManager::getInstance().unregisterLoadXmlDelegate(XML_TYPE);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	void LayerManager::clear()
-	{
-		for (VectorLayer::iterator iter=mLayerNodes.begin(); iter!=mLayerNodes.end(); ++iter)
-		{
-			destroy(*iter);
-		}
-		mLayerNodes.clear();
-	}
-
-	bool LayerManager::load(const std::string& _file)
-	{
-		return ResourceManager::getInstance()._loadImplement(_file, true, XML_TYPE, INSTANCE_TYPE_NAME);
-	}
-
-	void LayerManager::_load(xml::ElementPtr _node, const std::string& _file, Version _version)
-	{
-		VectorLayer layers;
-		// берем детей и крутимся, основной цикл
-		xml::ElementEnumerator layer = _node->getElementEnumerator();
-		while (layer.next(XML_TYPE))
-		{
-
-			std::string name;
-
-			if ( !layer->findAttribute("name", name))
-			{
-				MYGUI_LOG(Warning, "Attribute 'name' not found (file : " << _file << ")");
-				continue;
-			}
-
-			for (VectorLayer::iterator iter=layers.begin(); iter!=layers.end(); ++iter)
-			{
-				MYGUI_ASSERT((*iter)->getName() != name, "Layer '" << name << "' already exist (file : " << _file << ")");
-			}
-
-			std::string type = layer->findAttribute("type");
-			if (type.empty() && _version <= Version(1, 0))
-			{
-				bool overlapped = utility::parseBool(layer->findAttribute("overlapped"));
-				type = overlapped ? "OverlappedLayer" : "SharedLayer";
-			}
-
-			IObject* object = FactoryManager::getInstance().createObject(XML_TYPE, type);
-			MYGUI_ASSERT(object != nullptr, "factory is '" << type << "' not found");
-
-			ILayer* item = object->castType<ILayer>();
-			item->deserialization(layer.current(), _version);
-
-			layers.push_back(item);
-		}
-
-		// теперь мержим новые и старые слои
-		merge(layers);
-	}
-
-	void LayerManager::_unlinkWidget(Widget* _widget)
-	{
-		detachFromLayer(_widget);
-	}
-
-	// поправить на виджет и проверять на рутовость
-	void LayerManager::attachToLayerNode(const std::string& _name, Widget* _item)
-	{
-		MYGUI_ASSERT(nullptr != _item, "pointer must be valid");
-		MYGUI_ASSERT(_item->isRootWidget(), "attached widget must be root");
-
-		// сначала отсоединяем
-		_item->detachFromLayer();
-
-		// а теперь аттачим
-		for (VectorLayer::iterator iter=mLayerNodes.begin(); iter!=mLayerNodes.end(); ++iter)
-		{
-			if (_name == (*iter)->getName())
-			{
-				ILayerNode* node = (*iter)->createChildItemNode();
-				node->attachLayerItem(_item);
-
-				return;
-			}
-		}
-		MYGUI_LOG(Error, "Layer '" << _name << "' is not found");
-		//MYGUI_EXCEPT("Layer '" << _name << "' is not found");
-	}
-
-	void LayerManager::detachFromLayer(Widget* _item)
-	{
-		MYGUI_ASSERT(nullptr != _item, "pointer must be valid");
-		_item->detachFromLayer();
-	}
-
-	void LayerManager::upLayerItem(Widget* _item)
-	{
-		MYGUI_ASSERT(nullptr != _item, "pointer must be valid");
-		_item->upLayerItem();
-	}
-
-	bool LayerManager::isExist(const std::string& _name) const
-	{
-		return getByName(_name, false) != nullptr;
-	}
-
-	void LayerManager::merge(VectorLayer& _layers)
-	{
-		for (VectorLayer::iterator iter=mLayerNodes.begin(); iter!=mLayerNodes.end(); ++iter)
-		{
-			if ((*iter) == nullptr) continue;
-			bool find = false;
-			std::string name = (*iter)->getName();
-			for (VectorLayer::iterator iter2=_layers.begin(); iter2!=_layers.end(); ++iter2)
-			{
-				if (name == (*iter2)->getName())
-				{
-					// заменяем новый слой, на уже существующий
-					delete (*iter2);
-					(*iter2) = (*iter);
-					(*iter) = nullptr;
-					find = true;
-					break;
-				}
-			}
-			if (!find)
-			{
-				destroy(*iter);
-				(*iter) = nullptr;
-			}
-		}
-
-		// теперь в основной
-		mLayerNodes = _layers;
-	}
-
-	void LayerManager::destroy(ILayer* _layer)
-	{
-		MYGUI_LOG(Info, "destroy layer '" << _layer->getName() << "'");
-		delete _layer;
-	}
-	Widget* LayerManager::getWidgetFromPoint(int _left, int _top)
-	{
-		VectorLayer::reverse_iterator iter = mLayerNodes.rbegin();
-		while (iter != mLayerNodes.rend())
-		{
-			ILayerItem * item = (*iter)->getLayerItemByPoint(_left, _top);
-			if (item != nullptr) return static_cast<Widget*>(item);
-			++iter;
-		}
-		return nullptr;
-	}
-
-	void LayerManager::renderToTarget(IRenderTarget* _target, bool _update)
-	{
-		for (VectorLayer::iterator iter=mLayerNodes.begin(); iter!=mLayerNodes.end(); ++iter)
-		{
-			(*iter)->renderToTarget(_target, _update);
-		}
-	}
-
-	ILayer* LayerManager::getByName(const std::string& _name, bool _throw) const
-	{
-		for (VectorLayer::const_iterator iter=mLayerNodes.begin(); iter!=mLayerNodes.end(); ++iter)
-		{
-			if (_name == (*iter)->getName())
-				return (*iter);
-		}
-		MYGUI_ASSERT(!_throw, "Layer '" << _name << "' not found");
-		return nullptr;
-	}
-
-	void LayerManager::dumpStatisticToLog()
-	{
-		static const char* spacer = "                                                                                                                        ";
-		MYGUI_LOG(Info, spacer);
-		MYGUI_LOG(Info, "---------- Statistic for layers start ----------" << spacer);
-		for (VectorLayer::iterator iter=mLayerNodes.begin(); iter!=mLayerNodes.end(); ++iter)
-		{
-			(*iter)->dumpStatisticToLog();
-		}
-		MYGUI_LOG(Info, spacer);
-		MYGUI_LOG(Info, "---------- Statistic for layers end ----------" << spacer);
-		MYGUI_LOG(Info, spacer);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LayerNode.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LayerNode.cpp
deleted file mode 100644
index 47f223448e..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LayerNode.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_LayerNode.h"
-#include "MyGUI_ILayerItem.h"
-#include "MyGUI_ITexture.h"
-#include "MyGUI_ISubWidget.h"
-#include "MyGUI_ISubWidgetText.h"
-
-namespace MyGUI
-{
-
-	LayerNode::LayerNode(ILayer* _layer, ILayerNode* _parent) :
-		mParent(_parent),
-		mLayer(_layer),
-		mOutOfDate(false)
-	{
-	}
-
-	LayerNode::~LayerNode()
-	{
-		for (VectorRenderItem::iterator iter=mFirstRenderItems.begin(); iter!=mFirstRenderItems.end(); ++iter)
-		{
-			delete (*iter);
-		}
-		mFirstRenderItems.clear();
-
-		for (VectorRenderItem::iterator iter=mSecondRenderItems.begin(); iter!=mSecondRenderItems.end(); ++iter)
-		{
-			delete (*iter);
-		}
-		mSecondRenderItems.clear();
-
-		// удаляем дочерние узлы
-		for (VectorILayerNode::iterator iter = mChildItems.begin(); iter!=mChildItems.end(); ++iter)
-		{
-			delete (*iter);
-		}
-		mChildItems.clear();
-	}
-
-	ILayerNode* LayerNode::createChildItemNode()
-	{
-		LayerNode* layer = new LayerNode(mLayer, this);
-		mChildItems.push_back(layer);
-		return layer;
-	}
-
-	void LayerNode::destroyChildItemNode(ILayerNode* _node)
-	{
-		for (VectorILayerNode::iterator iter=mChildItems.begin(); iter!=mChildItems.end(); ++iter)
-		{
-			if ((*iter) == _node)
-			{
-				delete _node;
-				mChildItems.erase(iter);
-				return;
-			}
-		}
-		MYGUI_EXCEPT("item node not found");
-	}
-
-	void LayerNode::upChildItemNode(ILayerNode* _item)
-	{
-		for (VectorILayerNode::iterator iter=mChildItems.begin(); iter!=mChildItems.end(); ++iter)
-		{
-			if ((*iter) == _item)
-			{
-				mChildItems.erase(iter);
-				mChildItems.push_back(_item);
-				return;
-			}
-		}
-		MYGUI_EXCEPT("item node not found");
-	}
-
-	void LayerNode::renderToTarget(IRenderTarget* _target, bool _update)
-	{
-		// проверяем на сжатие пустот
-		bool need_compression = false;
-		for (VectorRenderItem::iterator iter=mFirstRenderItems.begin(); iter!=mFirstRenderItems.end(); ++iter)
-		{
-			if ((*iter)->getCompression())
-			{
-				need_compression = true;
-				break;
-			}
-		}
-
-		if (need_compression)
-			updateCompression();
-
-		// сначала отрисовываем свое
-		for (VectorRenderItem::iterator iter=mFirstRenderItems.begin(); iter!=mFirstRenderItems.end(); ++iter)
-		{
-			(*iter)->renderToTarget(_target, _update);
-		}
-		for (VectorRenderItem::iterator iter=mSecondRenderItems.begin(); iter!=mSecondRenderItems.end(); ++iter)
-		{
-			(*iter)->renderToTarget(_target, _update);
-		}
-
-		// теперь отрисовываем дочерние узлы
-		for (VectorILayerNode::iterator iter = mChildItems.begin(); iter!=mChildItems.end(); ++iter)
-		{
-			(*iter)->renderToTarget(_target, _update);
-		}
-
-		mOutOfDate = false;
-	}
-
-	ILayerItem* LayerNode::getLayerItemByPoint(int _left, int _top)
-	{
-		// сначала пикаем детей
-		for (VectorILayerNode::iterator iter = mChildItems.begin(); iter!=mChildItems.end(); ++iter)
-		{
-			ILayerItem * item = (*iter)->getLayerItemByPoint(_left, _top);
-			if (nullptr != item) return item;
-		}
-
-		for (VectorLayerItem::iterator iter=mLayerItems.begin(); iter!=mLayerItems.end(); ++iter)
-		{
-			ILayerItem * item = (*iter)->getLayerItemByPoint(_left, _top);
-			if (nullptr != item) return item;
-		}
-
-		return nullptr;
-	}
-
-	RenderItem* LayerNode::addToRenderItem(ITexture* _texture, ISubWidget* _item)
-	{
-		bool first = _item->castType<ISubWidgetText>(false) == nullptr;
-		// для первичной очереди нужен порядок
-		if (first)
-		{
-			if (mFirstRenderItems.empty())
-			{
-				// создаем новый буфер
-				RenderItem * item = new RenderItem();
-				item->setTexture(_texture);
-				mFirstRenderItems.push_back(item);
-
-				return item;
-			}
-
-			// если последний буфер пустой, то мона не создавать
-			if (mFirstRenderItems.back()->getNeedVertexCount() == 0)
-			{
-				// пустых может быть сколько угодно, нужен самый первый из пустых
-				for (VectorRenderItem::iterator iter=mFirstRenderItems.begin(); iter!=mFirstRenderItems.end(); ++iter)
-				{
-					if ((*iter)->getNeedVertexCount() == 0)
-					{
-						// а теперь внимание, если перед пустым наш, то его и юзаем
-						if (iter != mFirstRenderItems.begin())
-						{
-							VectorRenderItem::iterator prev = iter - 1;
-							if ((*prev)->getTexture() == _texture)
-							{
-								return (*prev);
-							}
-						}
-						(*iter)->setTexture(_texture);
-						return (*iter);
-					}
-				}
-			}
-
-			// та же текстура
-			if (mFirstRenderItems.back()->getTexture() == _texture)
-			{
-				return mFirstRenderItems.back();
-			}
-
-			// создаем новый буфер
-			RenderItem * item = new RenderItem();
-			item->setTexture(_texture);
-			mFirstRenderItems.push_back(item);
-
-			return item;
-		}
-
-		// для второй очереди порядок неважен
-		for (VectorRenderItem::iterator iter=mSecondRenderItems.begin(); iter!=mSecondRenderItems.end(); ++iter)
-		{
-			// либо такая же текстура, либо пустой буфер
-			if ((*iter)->getTexture() == _texture)
-			{
-				return (*iter);
-			}
-			else if ((*iter)->getNeedVertexCount() == 0)
-			{
-				(*iter)->setTexture(_texture);
-				return (*iter);
-			}
-
-		}
-		// не найденно создадим новый
-		RenderItem * item = new RenderItem();
-		item->setTexture(_texture);
-
-		mSecondRenderItems.push_back(item);
-		return mSecondRenderItems.back();
-	}
-
-	void LayerNode::attachLayerItem(ILayerItem* _item)
-	{
-		mLayerItems.push_back(_item);
-		_item->attachItemToNode(mLayer, this);
-	}
-
-	void LayerNode::detachLayerItem(ILayerItem* _item)
-	{
-		for (VectorLayerItem::iterator iter=mLayerItems.begin(); iter!=mLayerItems.end(); ++iter)
-		{
-			if ((*iter) == _item)
-			{
-				(*iter) = mLayerItems.back();
-				mLayerItems.pop_back();
-				return;
-			}
-		}
-		MYGUI_EXCEPT("layer item not found");
-	}
-
-	void LayerNode::outOfDate(RenderItem* _item)
-	{
-		mOutOfDate = true;
-		if (_item)
-			_item->outOfDate();
-	}
-
-	EnumeratorILayerNode LayerNode::getEnumerator()
-	{
-		return EnumeratorILayerNode(mChildItems);
-	}
-
-	void LayerNode::updateCompression()
-	{
-		// буферы освобождаются по одному всегда
-		if (mFirstRenderItems.size() > 1)
-		{
-			// пытаемся поднять пустой буфер выше полных
-			VectorRenderItem::iterator iter1 = mFirstRenderItems.begin();
-			VectorRenderItem::iterator iter2 = iter1 + 1;
-			while (iter2 != mFirstRenderItems.end())
-			{
-				if ((*iter1)->getNeedVertexCount() == 0)
-				{
-					RenderItem * tmp = (*iter1);
-					(*iter1) = (*iter2);
-					(*iter2) = tmp;
-				}
-				iter1 = iter2;
-				++iter2;
-			}
-		}
-	}
-
-	void LayerNode::dumpStatisticToLog(size_t _level)
-	{
-		static const char* spacer = "                                                                                                                        ";
-		std::string offset(" ", _level);
-		MYGUI_LOG(Info, offset << " - Node batch_count='" << mFirstRenderItems.size() + mSecondRenderItems.size() << spacer);
-
-		for (VectorRenderItem::iterator iter=mFirstRenderItems.begin(); iter!=mFirstRenderItems.end(); ++iter)
-		{
-			MYGUI_LOG(Info, offset << "  * Batch texture='" << ((*iter)->getTexture() == nullptr ? "nullptr" : (*iter)->getTexture()->getName()) << "' vertex_count='" << (*iter)->getVertexCount() << "'" << spacer);
-		}
-		for (VectorRenderItem::iterator iter=mSecondRenderItems.begin(); iter!=mSecondRenderItems.end(); ++iter)
-		{
-			MYGUI_LOG(Info, offset << "  * Batch texture='" << ((*iter)->getTexture() == nullptr ? "nullptr" : (*iter)->getTexture()->getName()) << "' vertex_count='" << (*iter)->getVertexCount() << "'" << spacer);
-		}
-
-		for (VectorILayerNode::iterator iter = mChildItems.begin(); iter!=mChildItems.end(); ++iter)
-		{
-			(*iter)->dumpStatisticToLog(_level + 1);
-		}
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LayoutManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LayoutManager.cpp
deleted file mode 100644
index 8ad61a332f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LayoutManager.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_LayoutManager.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_CoordConverter.h"
-#include "MyGUI_ControllerManager.h"
-
-namespace MyGUI
-{
-
-	const std::string XML_TYPE("Layout");
-
-	MYGUI_INSTANCE_IMPLEMENT( LayoutManager )
-
-	void LayoutManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		ResourceManager::getInstance().registerLoadXmlDelegate(XML_TYPE) = newDelegate(this, &LayoutManager::_load);
-		layoutPrefix = "";
-		layoutParent = nullptr;
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void LayoutManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		ResourceManager::getInstance().unregisterLoadXmlDelegate(XML_TYPE);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	VectorWidgetPtr& LayoutManager::load(const std::string& _file)
-	{
-		mVectorWidgetPtr.clear();
-		ResourceManager::getInstance()._loadImplement(_file, true, XML_TYPE, INSTANCE_TYPE_NAME);
-		return mVectorWidgetPtr;
-	}
-
-	void LayoutManager::_load(xml::ElementPtr _node, const std::string& _file, Version _version)
-	{
-#if MYGUI_DEBUG_MODE == 1
-		MYGUI_LOG(Info, "load layout '" << _file << "'");
-#endif
-		parseLayout(mVectorWidgetPtr, _node);
-	}
-
-	VectorWidgetPtr& LayoutManager::loadLayout(const std::string& _file, const std::string& _prefix, Widget* _parent)
-	{
-		static VectorWidgetPtr widgets;
-		widgets.clear();
-
-		layoutPrefix = _prefix;
-		layoutParent = _parent;
-		widgets = load(_file);
-		layoutPrefix = "";
-		layoutParent = nullptr;
-		return widgets;
-	}
-
-	void LayoutManager::unloadLayout(VectorWidgetPtr& _widgets)
-	{
-		WidgetManager::getInstance().destroyWidgets(_widgets);
-	}
-
-	void LayoutManager::parseLayout(VectorWidgetPtr& _widgets, xml::ElementPtr _root)
-	{
-		// берем детей и крутимся
-		xml::ElementEnumerator widget = _root->getElementEnumerator();
-		while (widget.next("Widget")) parseWidget(_widgets, widget, layoutParent);
-	}
-
-	void LayoutManager::parseWidget(VectorWidgetPtr& _widgets, xml::ElementEnumerator& _widget, Widget* _parent)
-	{
-		// парсим атрибуты виджета
-		std::string widgetType, widgetSkin, widgetName, widgetLayer, tmp;
-
-		_widget->findAttribute("type", widgetType);
-		_widget->findAttribute("skin", widgetSkin);
-		_widget->findAttribute("layer", widgetLayer);
-
-		Align align = Align::Default;
-		if (_widget->findAttribute("align", tmp)) align = Align::parse(tmp);
-
-		_widget->findAttribute("name", widgetName);
-		if (!widgetName.empty()) widgetName = layoutPrefix + widgetName;
-
-		WidgetStyle style = WidgetStyle::Child;
-		if (_widget->findAttribute("style", tmp)) style = WidgetStyle::parse(tmp);
-		if (_parent != nullptr && style != WidgetStyle::Popup) widgetLayer.clear();
-
-		IntCoord coord;
-		if (_widget->findAttribute("position", tmp)) coord = IntCoord::parse(tmp);
-		else if (_widget->findAttribute("position_real", tmp))
-		{
-			if (_parent == nullptr || style == WidgetStyle::Popup)
-				coord = CoordConverter::convertFromRelative(FloatCoord::parse(tmp), Gui::getInstance().getViewSize());
-			else
-				coord = CoordConverter::convertFromRelative(FloatCoord::parse(tmp), _parent->getSize());
-		}
-
-		Widget* wid;
-		if (nullptr == _parent)
-			wid = Gui::getInstance().createWidgetT(widgetType, widgetSkin, coord, align, widgetLayer, widgetName);
-		else
-			wid = _parent->createWidgetT(style, widgetType, widgetSkin, coord, align, widgetLayer, widgetName);
-
-		if (layoutParent == _parent) _widgets.push_back(wid);
-
-		// берем детей и крутимся
-		xml::ElementEnumerator node = _widget->getElementEnumerator();
-		while (node.next())
-		{
-			if (node->getName() == "Widget")
-			{
-				parseWidget(_widgets, node, wid);
-			}
-			else if (node->getName() == "Property")
-			{
-				wid->setProperty(node->findAttribute("key"), node->findAttribute("value"));
-			}
-			else if (node->getName() == "UserString")
-			{
-				wid->setUserString(node->findAttribute("key"), node->findAttribute("value"));
-			}
-			else if (node->getName() == "Controller")
-			{
-				const std::string& type = node->findAttribute("type");
-				MyGUI::ControllerItem* item = MyGUI::ControllerManager::getInstance().createItem(type);
-				if (item)
-				{
-					xml::ElementEnumerator prop = node->getElementEnumerator();
-					while (prop.next("Property"))
-					{
-						item->setProperty(prop->findAttribute("key"), prop->findAttribute("value"));
-					}
-					MyGUI::ControllerManager::getInstance().addItem(wid, item);
-				}
-				else
-				{
-					//LOG
-				}
-			}
-
-		}
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_List.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_List.cpp
deleted file mode 100644
index 55f92e5918..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_List.cpp
+++ /dev/null
@@ -1,971 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_List.h"
-#include "MyGUI_Button.h"
-#include "MyGUI_VScroll.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_InputManager.h"
-
-namespace MyGUI
-{
-
-	List::List() :
-		mWidgetScroll(nullptr),
-		mHeightLine(1),
-		mTopIndex(0),
-		mOffsetTop(0),
-		mRangeIndex(-1),
-		mLastRedrawLine(0),
-		mIndexSelect(ITEM_NONE),
-		mLineActive(ITEM_NONE),
-		mIsFocus(false),
-		mNeedVisibleScroll(true)
-	{
-	}
-
-	void List::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	List::~List()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void List::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void List::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// нам нужен фокус клавы
-		mNeedKeyFocus = true;
-
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "VScroll")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetScroll, "widget already assigned");
-				mWidgetScroll = (*iter)->castType<VScroll>();
-				mWidgetScroll->eventScrollChangePosition = newDelegate(this, &List::notifyScrollChangePosition);
-				mWidgetScroll->eventMouseButtonPressed = newDelegate(this, &List::notifyMousePressed);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "Client")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetClient, "widget already assigned");
-				mWidgetClient = (*iter);
-				mWidgetClient->eventMouseButtonPressed = newDelegate(this, &List::notifyMousePressed);
-			}
-		}
-		//MYGUI_ASSERT(nullptr != mWidgetScroll, "Child VScroll not found in skin (List must have VScroll)");
-		//MYGUI_ASSERT(nullptr != mWidgetClient, "Child Widget Client not found in skin (List must have Client)");
-
-		// парсим свойства
-		const MapString& properties = _info->getProperties();
-		MapString::const_iterator iterS = properties.find("SkinLine");
-		if (iterS != properties.end()) mSkinLine = iterS->second;
-		//MYGUI_ASSERT(!mSkinLine.empty(), "SkinLine property not found (List must have SkinLine property)");
-
-		iterS = properties.find("HeightLine");
-		if (iterS != properties.end()) mHeightLine = utility::parseInt(iterS->second);
-		if (mHeightLine < 1) mHeightLine = 1;
-
-
-		if (mWidgetScroll != nullptr)
-		{
-			mWidgetScroll->setScrollPage((size_t)mHeightLine);
-			mWidgetScroll->setScrollViewPage((size_t)mHeightLine);
-		}
-
-		updateScroll();
-		updateLine();
-	}
-
-	void List::shutdownWidgetSkin()
-	{
-		mWidgetScroll = nullptr;
-		mWidgetClient = nullptr;
-	}
-
-	void List::onMouseWheel(int _rel)
-	{
-		notifyMouseWheel(nullptr, _rel);
-
-		Base::onMouseWheel(_rel);
-	}
-
-	void List::onKeySetFocus(Widget* _old)
-	{
-		mIsFocus = true;
-		_updateState();
-
-		Base::onKeySetFocus(_old);
-	}
-
-	void List::onKeyLostFocus(Widget* _new)
-	{
-		mIsFocus = false;
-		_updateState();
-
-		Base::onKeyLostFocus(_new);
-	}
-
-	void List::onKeyButtonPressed(KeyCode _key, Char _char)
-	{
-		if (getItemCount() == 0)
-		{
-			Base::onKeyButtonPressed(_key, _char);
-			return;
-		}
-
-		// очень секретный метод, запатентованный механизм движения курсора
-		size_t sel = mIndexSelect;
-
-		if (_key == KeyCode::ArrowUp)
-		{
-			if (sel != 0)
-			{
-				if (sel == ITEM_NONE) sel = 0;
-				else sel --;
-			}
-
-		}
-		else if (_key == KeyCode::ArrowDown)
-		{
-			if (sel == ITEM_NONE) sel = 0;
-			else sel ++;
-
-			if (sel >= getItemCount())
-			{
-				// старое значение
-				sel = mIndexSelect;
-			}
-
-		}
-		else if (_key == KeyCode::Home)
-		{
-			if (sel != 0) sel = 0;
-
-		}
-		else if (_key == KeyCode::End)
-		{
-			if (sel != (getItemCount() - 1))
-			{
-				sel = getItemCount() - 1;
-			}
-
-		}
-		else if (_key == KeyCode::PageUp)
-		{
-			if (sel != 0)
-			{
-				if (sel == ITEM_NONE) sel = 0;
-				else
-				{
-					size_t page = _getClientWidget()->getHeight() / mHeightLine;
-					if (sel <= page) sel = 0;
-					else sel -= page;
-				}
-			}
-
-		}
-		else if (_key == KeyCode::PageDown)
-		{
-			if (sel != (getItemCount() - 1))
-			{
-				if (sel == ITEM_NONE) sel = 0;
-				else
-				{
-					sel += _getClientWidget()->getHeight() / mHeightLine;
-					if (sel >= getItemCount()) sel = getItemCount() - 1;
-				}
-			}
-
-		}
-		else if ((_key == KeyCode::Return) || (_key == KeyCode::NumpadEnter))
-		{
-			if (sel != ITEM_NONE)
-			{
-				//FIXME нас могут удалить
-				eventListSelectAccept(this, sel);
-
-				Base::onKeyButtonPressed(_key, _char);
-				// выходим, так как изменили колличество строк
-				return;
-			}
-
-		}
-
-		if (sel != mIndexSelect)
-		{
-			if ( !isItemVisibleAt(sel))
-			{
-				beginToItemAt(sel);
-				if (mWidgetScroll != nullptr)
-					_sendEventChangeScroll(mWidgetScroll->getScrollPosition());
-			}
-			setIndexSelected(sel);
-
-			// изменилась позиция
-			// FIXME нас могут удалить
-			eventListChangePosition(this, mIndexSelect);
-		}
-
-		Base::onKeyButtonPressed(_key, _char);
-	}
-
-	void List::notifyMouseWheel(Widget* _sender, int _rel)
-	{
-		if (mRangeIndex <= 0)
-			return;
-
-		if (mWidgetScroll == nullptr)
-			return;
-
-		int offset = (int)mWidgetScroll->getScrollPosition();
-		if (_rel < 0) offset += mHeightLine;
-		else  offset -= mHeightLine;
-
-		if (offset >= mRangeIndex) offset = mRangeIndex;
-		else if (offset < 0) offset = 0;
-
-		if ((int)mWidgetScroll->getScrollPosition() == offset) return;
-
-		mWidgetScroll->setScrollPosition(offset);
-		_setScrollView(offset);
-		_sendEventChangeScroll(offset);
-	}
-
-	void List::notifyScrollChangePosition(VScroll* _sender, size_t _position)
-	{
-		_setScrollView(_position);
-		_sendEventChangeScroll(_position);
-	}
-
-	void List::notifyMousePressed(Widget* _sender, int _left, int _top, MouseButton _id)
-	{
-		if (MouseButton::Left != _id)
-			return;
-
-		if (_sender == mWidgetScroll)
-			return;
-
-		// если выделен клиент, то сбрасываем
-		if (_sender == _getClientWidget())
-		{
-			if (mIndexSelect != ITEM_NONE)
-			{
-				_selectIndex(mIndexSelect, false);
-				mIndexSelect = ITEM_NONE;
-				eventListChangePosition(this, mIndexSelect);
-			}
-			eventListMouseItemActivate(this, mIndexSelect);
-
-		// если не клиент, то просчитывам
-		}
-		// ячейка может быть скрыта
-		else if (_sender->isVisible())
-		{
-
-#if MYGUI_DEBUG_MODE == 1
-			_checkMapping("List::notifyMousePressed");
-			MYGUI_ASSERT_RANGE(*_sender->_getInternalData<size_t>(), mWidgetLines.size(), "List::notifyMousePressed");
-			MYGUI_ASSERT_RANGE(*_sender->_getInternalData<size_t>() + mTopIndex, mItemsInfo.size(), "List::notifyMousePressed");
-#endif
-
-			size_t index = *_sender->_getInternalData<size_t>() + mTopIndex;
-
-			if (mIndexSelect != index)
-			{
-				_selectIndex(mIndexSelect, false);
-				_selectIndex(index, true);
-				mIndexSelect = index;
-				eventListChangePosition(this, mIndexSelect);
-			}
-			eventListMouseItemActivate(this, mIndexSelect);
-
-		}
-	}
-
-	void List::notifyMouseDoubleClick(Widget* _sender)
-	{
-		if (mIndexSelect != ITEM_NONE)
-			eventListSelectAccept(this, mIndexSelect);
-	}
-
-	void List::setPosition(const IntPoint& _point)
-	{
-		Base::setPosition(_point);
-	}
-
-	void List::setSize(const IntSize& _size)
-	{
-		Base::setSize(_size);
-
-		updateScroll();
-		updateLine();
-	}
-
-	void List::setCoord(const IntCoord& _coord)
-	{
-		Base::setCoord(_coord);
-
-		updateScroll();
-		updateLine();
-	}
-
-	void List::updateScroll()
-	{
-		mRangeIndex = (mHeightLine * (int)mItemsInfo.size()) - _getClientWidget()->getHeight();
-
-		if (mWidgetScroll == nullptr)
-			return;
-
-		if ( (!mNeedVisibleScroll) || (mRangeIndex < 1) || (mWidgetScroll->getLeft() <= _getClientWidget()->getLeft()) )
-		{
-			if (mWidgetScroll->isVisible())
-			{
-				mWidgetScroll->setVisible(false);
-				// увеличиваем клиентскую зону на ширину скрола
-				if (mWidgetClient != nullptr)
-					mWidgetClient->setSize(mWidgetClient->getWidth() + mWidgetScroll->getWidth(), mWidgetClient->getHeight());
-			}
-		}
-		else if (!mWidgetScroll->isVisible())
-		{
-			if (mWidgetClient != nullptr)
-				mWidgetClient->setSize(mWidgetClient->getWidth() - mWidgetScroll->getWidth(), mWidgetClient->getHeight());
-			mWidgetScroll->setVisible(true);
-		}
-
-		mWidgetScroll->setScrollRange(mRangeIndex + 1);
-		if ((int)mItemsInfo.size()) mWidgetScroll->setTrackSize( mWidgetScroll->getLineSize() * _getClientWidget()->getHeight() / mHeightLine / (int)mItemsInfo.size() );
-	}
-
-	void List::updateLine(bool _reset)
-	{
-		// сбрасываем
-		if (_reset)
-		{
-			mOldSize.clear();
-			mLastRedrawLine = 0;
-		}
-
-		// позиция скролла
-		int position = mTopIndex * mHeightLine + mOffsetTop;
-
-		// если высота увеличивалась то добавляем виджеты
-		if (mOldSize.height < mCoord.height)
-		{
-			int height = (int)mWidgetLines.size() * mHeightLine - mOffsetTop;
-
-			// до тех пор, пока не достигнем максимального колличества, и всегда на одну больше
-			while ( (height <= (_getClientWidget()->getHeight() + mHeightLine)) && (mWidgetLines.size() < mItemsInfo.size()) )
-			{
-				// создаем линию
-				Widget* line = _getClientWidget()->createWidgetT("Button", mSkinLine, 0, height, _getClientWidget()->getWidth(), mHeightLine, Align::Top | Align::HStretch);
-				// подписываемся на всякие там события
-				line->eventMouseButtonPressed = newDelegate(this, &List::notifyMousePressed);
-				line->eventMouseButtonDoubleClick = newDelegate(this, &List::notifyMouseDoubleClick);
-				line->eventMouseWheel = newDelegate(this, &List::notifyMouseWheel);
-				line->eventMouseSetFocus = newDelegate(this, &List::notifyMouseSetFocus);
-				line->eventMouseLostFocus = newDelegate(this, &List::notifyMouseLostFocus);
-				// присваиваем порядковый номер, для простоты просчета
-				line->_setInternalData((size_t)mWidgetLines.size());
-				// и сохраняем
-				mWidgetLines.push_back(line);
-				height += mHeightLine;
-			}
-
-			// проверяем на возможность не менять положение списка
-			if (position >= mRangeIndex)
-			{
-				// размер всех помещается в клиент
-				if (mRangeIndex <= 0)
-				{
-					// обнуляем, если надо
-					if (position || mOffsetTop || mTopIndex)
-					{
-						position = 0;
-						mTopIndex = 0;
-						mOffsetTop = 0;
-						mLastRedrawLine = 0; // чтобы все перерисовалось
-
-						// выравниваем
-						int offset = 0;
-						for (size_t pos=0; pos<mWidgetLines.size(); pos++)
-						{
-							mWidgetLines[pos]->setPosition(0, offset);
-							offset += mHeightLine;
-						}
-					}
-
-				}
-				else
-				{
-					// прижимаем список к нижней границе
-					int count = _getClientWidget()->getHeight() / mHeightLine;
-					mOffsetTop = mHeightLine - (_getClientWidget()->getHeight() % mHeightLine);
-
-					if (mOffsetTop == mHeightLine)
-					{
-						mOffsetTop = 0;
-						count --;
-					}
-
-					int top = (int)mItemsInfo.size() - count - 1;
-
-					// выравниваем
-					int offset = 0 - mOffsetTop;
-					for (size_t pos=0; pos<mWidgetLines.size(); pos++)
-					{
-						mWidgetLines[pos]->setPosition(0, offset);
-						offset += mHeightLine;
-					}
-
-					// высчитываем положение, должно быть максимальным
-					position = top * mHeightLine + mOffsetTop;
-
-					// если индех изменился, то перерисовываем линии
-					if (top != mTopIndex)
-					{
-						mTopIndex = top;
-						_redrawItemRange();
-					}
-
-				}
-			}
-
-			// увеличился размер, но прокрутки вниз небыло, обновляем линии снизу
-			_redrawItemRange(mLastRedrawLine);
-
-		} // if (old_cy < mCoord.height)
-
-		// просчитываем положение скролла
-		if (mWidgetScroll != nullptr)
-			mWidgetScroll->setScrollPosition(position);
-
-		mOldSize.width = mCoord.width;
-		mOldSize.height = mCoord.height;
-
-#if MYGUI_DEBUG_MODE == 1
-		_checkMapping("List::updateLine");
-#endif
-
-	}
-
-	void List::_redrawItemRange(size_t _start)
-	{
-		// перерисовываем линии, только те, что видны
-		size_t pos = _start;
-		for (; pos<mWidgetLines.size(); pos++)
-		{
-			// индекс в нашем массиве
-			size_t index = pos + (size_t)mTopIndex;
-
-			// не будем заходить слишком далеко
-			if (index >= mItemsInfo.size())
-			{
-				// запоминаем последнюю перерисованную линию
-				mLastRedrawLine = pos;
-				break;
-			}
-			if (mWidgetLines[pos]->getTop() > _getClientWidget()->getHeight())
-			{
-				// запоминаем последнюю перерисованную линию
-				mLastRedrawLine = pos;
-				break;
-			}
-
-			// если был скрыт, то покажем
-			mWidgetLines[pos]->setVisible(true);
-			// обновляем текст
-			mWidgetLines[pos]->setCaption(mItemsInfo[index].first);
-
-			// если нужно выделить ,то выделим
-			static_cast<Button*>(mWidgetLines[pos])->setButtonPressed(index == mIndexSelect);
-		}
-
-		// если цикл весь прошли, то ставим максимальную линию
-		if (pos >= mWidgetLines.size()) mLastRedrawLine = pos;
-		else
-		{
-			//Widget* focus = InputManager::getInstance().getMouseFocusWidget();
-			for (; pos<mWidgetLines.size(); pos++)
-			{
-				static_cast<Button*>(mWidgetLines[pos])->setButtonPressed(false);
-				static_cast<Button*>(mWidgetLines[pos])->setVisible(false);
-				//if (focus == mWidgetLines[pos]) InputManager::getInstance()._unlinkWidget(focus);
-			}
-		}
-
-#if MYGUI_DEBUG_MODE == 1
-		_checkMapping("List::_redrawItemRange");
-#endif
-
-	}
-
-	// перерисовывает индекс
-	void List::_redrawItem(size_t _index)
-	{
-		// невидно
-		if (_index < (size_t)mTopIndex) return;
-		_index -= (size_t)mTopIndex;
-		// тоже невидно
-		if (_index >= mLastRedrawLine) return;
-
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "List::_redrawItem");
-		// перерисовываем
-		mWidgetLines[_index]->setCaption(mItemsInfo[_index + mTopIndex].first);
-
-#if MYGUI_DEBUG_MODE == 1
-		_checkMapping("List::_redrawItem");
-#endif
-
-	}
-
-	void List::insertItemAt(size_t _index, const UString& _name, Any _data)
-	{
-		MYGUI_ASSERT_RANGE_INSERT(_index, mItemsInfo.size(), "List::insertItemAt");
-		if (_index == ITEM_NONE) _index = mItemsInfo.size();
-
-		// вставляем физически
-		mItemsInfo.insert(mItemsInfo.begin() + _index, PairItem(_name, _data));
-
-		// если надо, то меняем выделенный элемент
-		if ( (mIndexSelect != ITEM_NONE) && (_index <= mIndexSelect) ) mIndexSelect++;
-
-		// строка, до первого видимого элемента
-		if ((_index <= (size_t)mTopIndex) && (mRangeIndex > 0))
-		{
-			mTopIndex ++;
-			// просчитываем положение скролла
-			if (mWidgetScroll != nullptr)
-			{
-				mWidgetScroll->setScrollRange(mWidgetScroll->getScrollRange() + mHeightLine);
-				if ((int)mItemsInfo.size()) mWidgetScroll->setTrackSize( mWidgetScroll->getLineSize() * _getClientWidget()->getHeight() / mHeightLine / (int)mItemsInfo.size() );
-				mWidgetScroll->setScrollPosition(mTopIndex * mHeightLine + mOffsetTop);
-			}
-			mRangeIndex += mHeightLine;
-		}
-		else
-		{
-			// высчитывам положение строки
-			int offset = ((int)_index - mTopIndex) * mHeightLine - mOffsetTop;
-
-			// строка, после последнего видимого элемента, плюс одна строка (потому что для прокрутки нужно на одну строчку больше)
-			if (_getClientWidget()->getHeight() < (offset - mHeightLine))
-			{
-				// просчитываем положение скролла
-				if (mWidgetScroll != nullptr)
-				{
-					mWidgetScroll->setScrollRange(mWidgetScroll->getScrollRange() + mHeightLine);
-					if ((int)mItemsInfo.size()) mWidgetScroll->setTrackSize( mWidgetScroll->getLineSize() * _getClientWidget()->getHeight() / mHeightLine / (int)mItemsInfo.size() );
-					mWidgetScroll->setScrollPosition(mTopIndex * mHeightLine + mOffsetTop);
-				}
-				mRangeIndex += mHeightLine;
-
-			// строка в видимой области
-			}
-			else
-			{
-				// обновляем все
-				updateScroll();
-				updateLine(true);
-
-				// позже сюда еще оптимизацию по колличеству перерисовок
-			}
-		}
-
-#if MYGUI_DEBUG_MODE == 1
-		_checkMapping("List::insertItemAt");
-#endif
-
-	}
-
-	void List::removeItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "List::removeItemAt");
-
-		// удяляем физически строку
-		mItemsInfo.erase(mItemsInfo.begin() + _index);
-
-		// если надо, то меняем выделенный элемент
-		if (mItemsInfo.empty()) mIndexSelect = ITEM_NONE;
-		else if (mIndexSelect != ITEM_NONE)
-		{
-			if (_index < mIndexSelect) mIndexSelect--;
-			else if ( (_index == mIndexSelect) && (mIndexSelect == (mItemsInfo.size())) ) mIndexSelect--;
-		}
-
-		// если виджетов стало больше , то скрываем крайний
-		if (mWidgetLines.size() > mItemsInfo.size())
-		{
-			mWidgetLines[mItemsInfo.size()]->setVisible(false);
-		}
-
-		// строка, до первого видимого элемента
-		if (_index < (size_t)mTopIndex)
-		{
-			mTopIndex --;
-			// просчитываем положение скролла
-			if (mWidgetScroll != nullptr)
-			{
-				mWidgetScroll->setScrollRange(mWidgetScroll->getScrollRange() - mHeightLine);
-				if ((int)mItemsInfo.size()) mWidgetScroll->setTrackSize( mWidgetScroll->getLineSize() * _getClientWidget()->getHeight() / mHeightLine / (int)mItemsInfo.size() );
-				mWidgetScroll->setScrollPosition(mTopIndex * mHeightLine + mOffsetTop);
-			}
-			mRangeIndex -= mHeightLine;
-		}
-		else
-		{
-			// высчитывам положение удаляемой строки
-			int offset = ((int)_index - mTopIndex) * mHeightLine - mOffsetTop;
-
-			// строка, после последнего видимого элемента
-			if (_getClientWidget()->getHeight() < offset)
-			{
-				// просчитываем положение скролла
-				if (mWidgetScroll != nullptr)
-				{
-					mWidgetScroll->setScrollRange(mWidgetScroll->getScrollRange() - mHeightLine);
-					if ((int)mItemsInfo.size()) mWidgetScroll->setTrackSize( mWidgetScroll->getLineSize() * _getClientWidget()->getHeight() / mHeightLine / (int)mItemsInfo.size() );
-					mWidgetScroll->setScrollPosition(mTopIndex * mHeightLine + mOffsetTop);
-				}
-				mRangeIndex -= mHeightLine;
-
-			// строка в видимой области
-			}
-			else
-			{
-				// обновляем все
-				updateScroll();
-				updateLine(true);
-
-				// позже сюда еще оптимизацию по колличеству перерисовок
-			}
-		}
-
-#if MYGUI_DEBUG_MODE == 1
-		_checkMapping("List::removeItemAt");
-#endif
-
-	}
-
-	void List::setIndexSelected(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE_AND_NONE(_index, mItemsInfo.size(), "List::setIndexSelected");
-		if (mIndexSelect != _index)
-		{
-			_selectIndex(mIndexSelect, false);
-			_selectIndex(_index, true);
-			mIndexSelect = _index;
-		}
-	}
-
-	void List::_selectIndex(size_t _index, bool _select)
-	{
-		if (_index == ITEM_NONE) return;
-		// не видно строки
-		if (_index < (size_t)mTopIndex) return;
-		// высчитывам положение строки
-		int offset = ((int)_index - mTopIndex) * mHeightLine - mOffsetTop;
-		// строка, после последнего видимого элемента
-		if (_getClientWidget()->getHeight() < offset) return;
-
-		size_t index = _index - mTopIndex;
-		if (index < mWidgetLines.size())
-			static_cast<Button*>(mWidgetLines[index])->setButtonPressed(_select);
-
-#if MYGUI_DEBUG_MODE == 1
-		_checkMapping("List::_selectIndex");
-#endif
-
-	}
-
-	void List::beginToItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "List::beginToItemAt");
-		if (mRangeIndex <= 0) return;
-
-		int offset = (int)_index * mHeightLine;
-		if (offset >= mRangeIndex) offset = mRangeIndex;
-
-		if (mWidgetScroll != nullptr)
-		{
-			if ((int)mWidgetScroll->getScrollPosition() == offset) return;
-			mWidgetScroll->setScrollPosition(offset);
-		}
-		notifyScrollChangePosition(nullptr, offset);
-
-#if MYGUI_DEBUG_MODE == 1
-		_checkMapping("List::beginToItemAt");
-#endif
-
-	}
-
-	// видим ли мы элемент, полностью или нет
-	bool List::isItemVisibleAt(size_t _index, bool _fill)
-	{
-		// если элемента нет, то мы его не видим (в том числе когда их вообще нет)
-		if (_index >= mItemsInfo.size()) return false;
-		// если скрола нет, то мы палюбак видим
-		if (mRangeIndex <= 0) return true;
-
-		// строка, до первого видимого элемента
-		if (_index < (size_t)mTopIndex) return false;
-
-		// строка это верхний выделенный
-		if (_index == (size_t)mTopIndex)
-		{
-			if ( (mOffsetTop != 0) && (_fill) ) return false; // нам нужна полностью видимость
-			return true;
-		}
-
-		// высчитывам положение строки
-		int offset = ((int)_index - mTopIndex) * mHeightLine - mOffsetTop;
-
-		// строка, после последнего видимого элемента
-		if (_getClientWidget()->getHeight() < offset) return false;
-
-		// если мы внизу и нам нужен целый
-		if ((_getClientWidget()->getHeight() < (offset + mHeightLine)) && (_fill) ) return false;
-
-		return true;
-	}
-
-	void List::removeAllItems()
-	{
-		mTopIndex = 0;
-		mIndexSelect = ITEM_NONE;
-		mOffsetTop = 0;
-
-		mItemsInfo.clear();
-
-		int offset = 0;
-		for (size_t pos=0; pos<mWidgetLines.size(); pos++)
-		{
-			mWidgetLines[pos]->setVisible(false);
-			mWidgetLines[pos]->setPosition(0, offset);
-			offset += mHeightLine;
-		}
-
-		// обновляем все
-		updateScroll();
-		updateLine(true);
-
-#if MYGUI_DEBUG_MODE == 1
-		_checkMapping("List::removeAllItems");
-#endif
-
-	}
-
-	void List::setItemNameAt(size_t _index, const UString& _name)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "List::setItemNameAt");
-		mItemsInfo[_index].first =_name;
-		_redrawItem(_index);
-	}
-
-	void List::setItemDataAt(size_t _index, Any _data)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "List::setItemDataAt");
-		mItemsInfo[_index].second = _data;
-		_redrawItem(_index);
-	}
-
-	const UString& List::getItemNameAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "List::getItemNameAt");
-		return mItemsInfo[_index].first;
-	}
-
-	void List::notifyMouseSetFocus(Widget* _sender, Widget* _old)
-	{
-
-#if MYGUI_DEBUG_MODE == 1
-		MYGUI_ASSERT_RANGE(*_sender->_getInternalData<size_t>(), mWidgetLines.size(), "List::notifyMouseSetFocus");
-#endif
-
-		mLineActive = *_sender->_getInternalData<size_t>();
-		eventListMouseItemFocus(this, mLineActive);
-	}
-
-	void List::notifyMouseLostFocus(Widget* _sender, Widget* _new)
-	{
-		if ((nullptr == _new) || (_new->getParent() != _getClientWidget()))
-		{
-			mLineActive = ITEM_NONE;
-			eventListMouseItemFocus(this, ITEM_NONE);
-		}
-	}
-
-	void List::_setItemFocus(size_t _index, bool _focus)
-	{
-		MYGUI_ASSERT_RANGE(_index, mWidgetLines.size(), "List::_setItemFocus");
-		static_cast<Button*>(mWidgetLines[_index])->_setMouseFocus(_focus);
-	}
-
-	void List::setScrollVisible(bool _visible)
-	{
-		if (mNeedVisibleScroll == _visible) return;
-		mNeedVisibleScroll = _visible;
-		updateScroll();
-	}
-
-	void List::setScrollPosition(size_t _position)
-	{
-		if (mWidgetScroll != nullptr)
-		{
-			if (mWidgetScroll->getScrollRange() > _position)
-			{
-				mWidgetScroll->setScrollPosition(_position);
-				_setScrollView(_position);
-			}
-		}
-	}
-
-	void List::_setScrollView(size_t _position)
-	{
-		mOffsetTop = ((int)_position % mHeightLine);
-
-		// смещение с отрицательной стороны
-		int offset = 0 - mOffsetTop;
-
-		for (size_t pos=0; pos<mWidgetLines.size(); pos++)
-		{
-			mWidgetLines[pos]->setPosition(IntPoint(0, offset));
-			offset += mHeightLine;
-		}
-
-		// если индех изменился, то перерисовываем линии
-		int top = ((int)_position / mHeightLine);
-		if (top != mTopIndex)
-		{
-			mTopIndex = top;
-			_redrawItemRange();
-		}
-
-		// прорисовываем все нижние строки, если они появились
-		_redrawItemRange(mLastRedrawLine);
-	}
-
-	void List::_sendEventChangeScroll(size_t _position)
-	{
-		eventListChangeScroll(this, _position);
-		if (ITEM_NONE != mLineActive) eventListMouseItemFocus(this, mLineActive);
-	}
-
-	void List::swapItemsAt(size_t _index1, size_t _index2)
-	{
-		MYGUI_ASSERT_RANGE(_index1, mItemsInfo.size(), "List::swapItemsAt");
-		MYGUI_ASSERT_RANGE(_index2, mItemsInfo.size(), "List::swapItemsAt");
-
-		if (_index1 == _index2) return;
-
-		std::swap(mItemsInfo[_index1], mItemsInfo[_index2]);
-
-		_redrawItem(_index1);
-		_redrawItem(_index2);
-	}
-
-	void List::_checkMapping(const std::string& _owner)
-	{
-		size_t count_pressed = 0;
-		size_t count_show = 0;
-
-		for (size_t pos=0; pos<mWidgetLines.size(); pos++)
-		{
-			MYGUI_ASSERT(pos == *mWidgetLines[pos]->_getInternalData<size_t>(), _owner);
-			static_cast<Button*>(mWidgetLines[pos])->getButtonPressed() ? count_pressed ++ : 0;
-			static_cast<Button*>(mWidgetLines[pos])->isVisible() ? count_show ++ : 0;
-		}
-		MYGUI_ASSERT(count_pressed < 2, _owner);
-		//MYGUI_ASSERT((count_show + mOffsetTop) <= mItemsInfo.size(), _owner);
-	}
-
-	void List::_checkAlign()
-	{
-		// максимальная высота всех строк
-		int max_height = mItemsInfo.size() * mHeightLine;
-		// видимая высота
-		int visible_height = _getClientWidget()->getHeight();
-
-		// все строки помещаются
-		if (visible_height >= max_height)
-		{
-			MYGUI_ASSERT(mTopIndex == 0, "mTopIndex == 0");
-			MYGUI_ASSERT(mOffsetTop == 0, "mOffsetTop == 0");
-			int height = 0;
-			for (size_t pos=0; pos<mWidgetLines.size(); pos++)
-			{
-				if (pos >= mItemsInfo.size()) break;
-				MYGUI_ASSERT(mWidgetLines[pos]->getTop() == height, "mWidgetLines[pos]->getTop() == height");
-				height += mWidgetLines[pos]->getHeight();
-			}
-		}
-	}
-
-	size_t List::findItemIndexWith(const UString& _name)
-	{
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			if (mItemsInfo[pos].first == _name) return pos;
-		}
-		return ITEM_NONE;
-	}
-
-	int List::getOptimalHeight()
-	{
-		return (mCoord.height - _getClientWidget()->getHeight()) + (mItemsInfo.size() * mHeightLine);
-	}
-
-	void List::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "List_AddItem") addItem(_value);
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-	Widget* List::_getClientWidget()
-	{
-		return mWidgetClient == nullptr ? this : mWidgetClient;
-	}
-
-	const Widget* List::_getClientWidget() const
-	{
-		return mWidgetClient == nullptr ? this : mWidgetClient;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ListBox.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ListBox.cpp
deleted file mode 100644
index 41faabd381..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ListBox.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ListBox.h"
-#include "MyGUI_Button.h"
-
-namespace MyGUI
-{
-
-	ListBox::ListBox() :
-		mHeightLine(0)
-	{
-		requestCreateWidgetItem = MyGUI::newDelegate(this, &ListBox::notifyCreateWidgetItem);
-		requestDrawItem = MyGUI::newDelegate(this, &ListBox::notifyDrawItem);
-	}
-
-	void ListBox::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	ListBox::~ListBox()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void ListBox::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void ListBox::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		mHeightLine = 20;
-		mChangeContentByResize = false;
-
-		const MapString& properties = _info->getProperties();
-		if (!properties.empty())
-		{
-			MapString::const_iterator iter = properties.end();
-			iter = properties.find("SkinLine");
-			if (iter != properties.end()) mSkinLine = iter->second;
-			iter = properties.find("HeightLine");
-			if (iter != properties.end()) mHeightLine = utility::parseInt(iter->second);
-		}
-
-		_setScrollViewPage(mHeightLine);
-	}
-
-	void ListBox::shutdownWidgetSkin()
-	{
-	}
-
-	void ListBox::notifyCreateWidgetItem(MyGUI::ListCtrl* _sender, MyGUI::Widget* _item)
-	{
-		const MyGUI::IntSize& size = _item->getSize();
-
-		MyGUI::Button* text = _item->createWidget<MyGUI::Button>(mSkinLine, MyGUI::IntCoord(0, 0, size.width, size.height), MyGUI::Align::Stretch);
-
-		text->setNeedMouseFocus(false);
-
-		_item->setUserData(text);
-	}
-
-	void ListBox::notifyDrawItem(MyGUI::ListCtrl* _sender, MyGUI::Widget* _item, const MyGUI::IBDrawItemInfo& _info, MyGUI::IntCoord& _coord)
-	{
-		MyGUI::Button* text = *_item->getUserData<MyGUI::Button*>();
-
-		if (_info.update)
-		{
-			text->setCaption(mItemsInfo[_info.index]);
-
-			MyGUI::IntSize size = text->getTextSize() + (text->getSize() - text->getTextRegion().size());
-			size.height = mHeightLine;
-			_coord.set(0, 0, size.width, size.height);
-		}
-
-		text->setButtonPressed(_info.select);
-		text->_setMouseFocus(_info.active);
-	}
-
-	void ListBox::insertItemAt(size_t _index, const UString& _name, Any _data)
-	{
-		MYGUI_ASSERT_RANGE_INSERT(_index, mItemsInfo.size(), "ListBox::insertItemAt");
-		if (_index == ITEM_NONE) _index = mItemsInfo.size();
-
-		mItemsInfo.insert(mItemsInfo.begin() + _index, _name);
-
-		Base::insertItemAt(_index, _data);
-	}
-
-	void ListBox::removeItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ListBox::removeItemAt");
-		mItemsInfo.erase(mItemsInfo.begin() + _index);
-
-		Base::removeItemAt(_index);
-	}
-
-	void ListBox::removeAllItems()
-	{
-		mItemsInfo.clear();
-
-		Base::removeAllItems();
-	}
-
-	void ListBox::swapItemsAt(size_t _index1, size_t _index2)
-	{
-		MYGUI_ASSERT_RANGE(_index1, mItemsInfo.size(), "ListBox::swapItemsAt");
-		MYGUI_ASSERT_RANGE(_index2, mItemsInfo.size(), "ListBox::swapItemsAt");
-
-		if (_index1 == _index2) return;
-
-		std::swap(mItemsInfo[_index1], mItemsInfo[_index2]);
-
-		Base::redrawItemAt(_index1);
-		Base::redrawItemAt(_index2);
-	}
-
-	size_t ListBox::findItemIndexWith(const UString& _name)
-	{
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			if (mItemsInfo[pos] == _name) return pos;
-		}
-		return ITEM_NONE;
-	}
-
-	void ListBox::setItemNameAt(size_t _index, const UString& _name)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ListBox::setItemNameAt");
-
-		Base::redrawItemAt(_index);
-	}
-
-	const UString& ListBox::getItemNameAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ListBox::getItemNameAt");
-
-		return mItemsInfo[_index];
-	}
-
-	void ListBox::beginToItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ListBox::beginToItemAt");
-
-		//FIXME
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ListCtrl.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ListCtrl.cpp
deleted file mode 100644
index b29fc88360..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ListCtrl.cpp
+++ /dev/null
@@ -1,890 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ListCtrl.h"
-#include "MyGUI_Button.h"
-#include "MyGUI_VScroll.h"
-#include "MyGUI_HScroll.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_WidgetTranslate.h"
-#include "MyGUI_WidgetManager.h"
-
-namespace MyGUI
-{
-
-	ListCtrl::ListCtrl() :
-		mIndexSelect(ITEM_NONE),
-		mIndexActive(ITEM_NONE),
-		mIndexAccept(ITEM_NONE),
-		mIndexRefuse(ITEM_NONE),
-		mIsFocus(false),
-		mItemDrag(nullptr),
-		mScrollViewPage(1)
-	{
-		mChangeContentByResize = true;
-	}
-
-	void ListCtrl::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	ListCtrl::~ListCtrl()
-	{
-		shutdownWidgetSkin();
-	}
-
-	size_t ListCtrl::getHScrollPage()
-	{
-		return mScrollViewPage;
-	}
-
-	size_t ListCtrl::getVScrollPage()
-	{
-		return mScrollViewPage;
-	}
-
-	void ListCtrl::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void ListCtrl::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// нам нужен фокус клавы
-		mNeedKeyFocus = true;
-		mDragLayer = "DragAndDrop";
-
-		const MapString& properties = _info->getProperties();
-		if (!properties.empty())
-		{
-			MapString::const_iterator iter = properties.end();
-			iter = properties.find("DragLayer");
-			if (iter != properties.end()) mDragLayer = iter->second;
-		}
-
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "VScroll")
-			{
-				MYGUI_DEBUG_ASSERT( ! mVScroll, "widget already assigned");
-				mVScroll = (*iter)->castType<VScroll>();
-				mVScroll->eventScrollChangePosition = newDelegate(this, &ListCtrl::notifyScrollChangePosition);
-			}
-			if (*(*iter)->_getInternalData<std::string>() == "HScroll")
-			{
-				MYGUI_DEBUG_ASSERT( ! mHScroll, "widget already assigned");
-				mHScroll = (*iter)->castType<HScroll>();
-				mHScroll->eventScrollChangePosition = newDelegate(this, &ListCtrl::notifyScrollChangePosition);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "Client")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetClient, "widget already assigned");
-				mWidgetClient = (*iter);
-				mWidgetClient->eventMouseWheel = newDelegate(this, &ListCtrl::notifyMouseWheel);
-				mWidgetClient->eventMouseButtonPressed = newDelegate(this, &ListCtrl::notifyMouseButtonPressed);
-				mClient = mWidgetClient;
-			}
-		}
-		// сли нет скрола, то клиенская зона не обязательно
-		//MYGUI_ASSERT(nullptr != mWidgetClient, "Child Widget Client not found in skin (ListCtrl must have Client) skin ='" << _info->getSkinName() << "'");
-
-		// подписываем клиент для драгэндропа
-		_getClientWidget()->_requestGetContainer = newDelegate(this, &ListCtrl::_requestGetContainer);
-
-		updateFromResize();
-	}
-
-	void ListCtrl::shutdownWidgetSkin()
-	{
-		mVScroll = nullptr;
-		mHScroll = nullptr;
-		mClient = nullptr;
-		mWidgetClient = nullptr;
-	}
-
-	void ListCtrl::setPosition(const IntPoint& _point)
-	{
-		Base::setPosition(_point);
-	}
-
-	void ListCtrl::setSize(const IntSize& _size)
-	{
-		Base::setSize(_size);
-		updateFromResize();
-	}
-
-	void ListCtrl::setCoord(const IntCoord& _coord)
-	{
-		Base::setCoord(_coord);
-		updateFromResize();
-	}
-
-	void ListCtrl::updateFromResize()
-	{
-		updateMetrics();
-
-		updateScrollSize();
-		updateScrollPosition();
-
-		_updateAllVisible(ITEM_NONE, true, true);
-		_resetContainer(true);
-	}
-
-	void ListCtrl::_updateAllVisible(size_t _index, bool _needUpdateContetntSize, bool _update)
-	{
-
-		bool change = false;
-
-		int top = 0;
-		size_t widget_index = 0;
-
-		for (size_t index=0; index<mItemsInfo.size(); ++index)
-		{
-			ItemDataInfo& info = mItemsInfo[index];
-
-			// айтем сверху не виден
-			if ((top + info.size.height) < (mContentPosition.top))
-			{
-			}
-			// айтем снизу и не виден
-			else if (top > ((mContentPosition.top) + _getClientWidget()->getHeight()))
-			{
-			}
-			// айтем встрял в видимость
-			else
-			{
-				Widget* item = getItemWidget(widget_index);
-				widget_index++;
-
-				if (index == _index || ITEM_NONE == _index)
-				{
-					item->_setInternalData((size_t)index);
-
-					item->setPosition(-mContentPosition.left, top - (mContentPosition.top));
-					item->setVisible(true);
-
-					IBDrawItemInfo data(index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, _update, false);
-
-					IntCoord coord(IntPoint(), info.size);
-					requestDrawItem(this, item, data, coord);
-
-					if (info.size != coord.size())
-						change = true;
-
-					info.size = coord.size();
-					item->setSize(mClient->getWidth()/*mContentSize.width*/, info.size.height);
-				}
-
-			}
-
-			top += info.size.height;
-		}
-
-		// если виджеты еще есть, то их надо скрыть
-		while (widget_index < mVectorItems.size())
-		{
-			Widget* item = mVectorItems[widget_index];
-			widget_index ++;
-
-			item->setVisible(false);
-			item->_setInternalData((size_t)ITEM_NONE);
-		}
-
-		if (change && _needUpdateContetntSize)
-		{
-			updateMetrics();
-
-			updateScrollSize();
-			updateScrollPosition();
-		}
-	}
-
-	Widget* ListCtrl::getItemWidget(size_t _index)
-	{
-		// еще нет такого виджета, нуно создать
-		if (_index == mVectorItems.size())
-		{
-
-			Widget* item = _getClientWidget()->createWidget<Widget>("Default", IntCoord(), Align::Default);
-
-			// вызываем запрос на создание виджета
-			requestCreateWidgetItem(this, item);
-
-			item->eventMouseWheel = newDelegate(this, &ListCtrl::notifyMouseWheel);
-			item->eventRootMouseChangeFocus = newDelegate(this, &ListCtrl::notifyRootMouseChangeFocus);
-			item->eventMouseButtonPressed = newDelegate(this, &ListCtrl::notifyMouseButtonPressed);
-			item->eventMouseButtonReleased = newDelegate(this, &ListCtrl::notifyMouseButtonReleased);
-			item->eventMouseButtonDoubleClick = newDelegate(this, &ListCtrl::notifyMouseButtonDoubleClick);
-			item->eventMouseDrag = newDelegate(this, &ListCtrl::notifyMouseDrag);
-			item->_requestGetContainer = newDelegate(this, &ListCtrl::_requestGetContainer);
-			item->eventKeyButtonPressed = newDelegate(this, &ListCtrl::notifyKeyButtonPressed);
-			item->eventKeyButtonReleased = newDelegate(this, &ListCtrl::notifyKeyButtonReleased);
-
-			mVectorItems.push_back(item);
-		}
-
-		// запрашивать только последовательно
-		MYGUI_ASSERT_RANGE(_index, mVectorItems.size(), "ListCtrl::getItemWidget");
-
-		return mVectorItems[_index];
-	}
-
-	void ListCtrl::onMouseWheel(int _rel)
-	{
-		notifyMouseWheel(nullptr, _rel);
-
-		Base::onMouseWheel(_rel);
-	}
-
-	void ListCtrl::onKeySetFocus(Widget* _old)
-	{
-		mIsFocus = true;
-		setState("pushed");
-
-		Base::onKeySetFocus(_old);
-	}
-
-	void ListCtrl::onKeyLostFocus(Widget* _new)
-	{
-		mIsFocus = false;
-		setState("normal");
-
-		Base::onKeyLostFocus(_new);
-	}
-
-	void ListCtrl::resetCurrentActiveItem()
-	{
-		// сбрасываем старую подсветку
-		if (mIndexActive != ITEM_NONE)
-		{
-			//size_t start = (size_t)mFirstVisibleIndex;
-			size_t index = mIndexActive;
-			mIndexActive = ITEM_NONE;
-
-			//FIXME потом только один попробовать обновить
-			_updateAllVisible(index, true, false);
-
-			// если видим, то обновляем
-			/*if ((mIndexActive >= start) && (mIndexActive < (start + mVectorItems.size())))
-			{
-				IBDrawItemInfo data(index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-
-				IntCoord coord(IntPoint(), mItemsInfo[index].size);
-
-				requestDrawItem(this, mVectorItems[mIndexActive - start], data, coord);
-
-				mItemsInfo[index].size = coord.size();
-
-			}*/
-		}
-	}
-
-	void ListCtrl::findCurrentActiveItem()
-	{
-		MYGUI_DEBUG_ASSERT(mIndexActive == ITEM_NONE, "use : resetCurrentActiveItem() before findCurrentActiveItem()");
-
-		const IntPoint& point = InputManager::getInstance().getMousePositionByLayer();
-
-		// сначала проверяем клиентскую зону
-		const IntRect& rect = _getClientWidget()->getAbsoluteRect();
-		if ((point.left < rect.left) || (point.left > rect.right) || (point.top < rect.top) || (point.top > rect.bottom))
-		{
-			return;
-		}
-
-		for (size_t pos=0; pos<mVectorItems.size(); ++pos)
-		{
-			Widget* item = mVectorItems[pos];
-			const IntRect& abs_rect = item->getAbsoluteRect();
-			if ((point.left>= abs_rect.left) && (point.left <= abs_rect.right) && (point.top>= abs_rect.top) && (point.top <= abs_rect.bottom))
-			{
-
-				size_t index = calcIndexByWidget(item);
-				// при переборе индекс может быть больше, так как может создасться сколько угодно
-				if (index < mItemsInfo.size())
-				{
-
-					mIndexActive = index;
-					//FIXME потом только один попробовать обновить
-					_updateAllVisible(index, true, false);
-
-					/*IBDrawItemInfo data(index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-					IntCoord coord(IntPoint(), mItemsInfo[index].size);
-					requestDrawItem(this, item, data, coord);
-					mItemsInfo[index].size = coord.size();*/
-
-				}
-
-				break;
-			}
-		}
-	}
-
-	void ListCtrl::_requestGetContainer(Widget* _sender, Widget*& _container, size_t& _index)
-	{
-		if (_sender == _getClientWidget())
-		{
-			_container = this;
-			_index = ITEM_NONE;
-		}
-		else
-		{
-			size_t index = calcIndexByWidget(_sender);
-			if (index < mItemsInfo.size())
-			{
-				_container = this;
-				_index = index;
-			}
-		}
-	}
-
-	void ListCtrl::_setContainerItemInfo(size_t _index, bool _set, bool _accept)
-	{
-		if (_index == ITEM_NONE) return;
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ListCtrl::_setContainerItemInfo");
-
-		mIndexAccept = (_set && _accept ) ? _index : ITEM_NONE;
-		mIndexRefuse = (_set && !_accept) ? _index : ITEM_NONE;
-
-		//FIXME потом только один попробовать обновить
-		_updateAllVisible(_index, true, false);
-
-		/*size_t start = (size_t)mFirstVisibleIndex;
-		if ((_index >= start) && (_index < (start + mVectorItems.size())))
-		{
-
-			IBDrawItemInfo data(_index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-
-			IntCoord coord(IntPoint(), mItemsInfo[_index].size);
-
-			requestDrawItem(this, mVectorItems[_index - start], data, coord);
-
-			mItemsInfo[_index].size = coord.size();
-
-		}*/
-	}
-
-	void ListCtrl::setItemDataAt(size_t _index, Any _data)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ListCtrl::setItemData");
-		mItemsInfo[_index].data = _data;
-
-		//FIXME потом только один попробовать обновить
-		_updateAllVisible(_index, true, true);
-
-		/*size_t start = (size_t)mFirstVisibleIndex;
-		if ((_index >= start) && (_index < (start + mVectorItems.size())))
-		{
-			IBDrawItemInfo data(_index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, true, false);
-			IntCoord coord(IntPoint(), mItemsInfo[_index].size);
-			requestDrawItem(this, mVectorItems[_index - start], data, coord);
-			mItemsInfo[_index].size = coord.size();
-		}*/
-
-		_resetContainer(true);
-	}
-
-	void ListCtrl::insertItemAt(size_t _index, Any _data)
-	{
-		MYGUI_ASSERT_RANGE_INSERT(_index, mItemsInfo.size(), "ListCtrl::insertItemAt");
-		if (_index == ITEM_NONE) _index = mItemsInfo.size();
-
-		_resetContainer(false);
-
-		resetCurrentActiveItem();
-
-		mItemsInfo.insert(mItemsInfo.begin() + _index, ItemDataInfo(_data));
-
-		// расчитываем новый индекс выделения
-		if (mIndexSelect != ITEM_NONE)
-		{
-			if (mIndexSelect >= _index)
-			{
-				mIndexSelect ++;
-			}
-		}
-
-		updateScrollSize();
-		updateScrollPosition();
-
-		findCurrentActiveItem();
-
-		_updateAllVisible(ITEM_NONE, true, true);
-	}
-
-	void ListCtrl::removeItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ListCtrl::removeItemAt");
-
-		_resetContainer(false);
-		resetCurrentActiveItem();
-
-		mItemsInfo.erase(mItemsInfo.begin() + _index);
-
-		// расчитываем новый индекс выделения
-		if (mIndexSelect != ITEM_NONE)
-		{
-			if (mItemsInfo.empty())
-			{
-				mIndexSelect = ITEM_NONE;
-			}
-			else if ((mIndexSelect > _index) || (mIndexSelect == mItemsInfo.size()))
-			{
-				mIndexSelect --;
-			}
-		}
-
-		updateScrollSize();
-		updateScrollPosition();
-
-		findCurrentActiveItem();
-
-		_updateAllVisible(ITEM_NONE, true, true);
-	}
-
-	void ListCtrl::removeAllItems()
-	{
-		if (0 == mItemsInfo.size()) return;
-		_resetContainer(false);
-
-		mItemsInfo.clear();
-
-		mIndexSelect = ITEM_NONE;
-		mIndexActive = ITEM_NONE;
-
-		updateScrollSize();
-		updateScrollPosition();
-
-		_updateAllVisible(ITEM_NONE, true, true);
-	}
-
-	void ListCtrl::redrawItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "ListCtrl::redrawItemAt");
-
-		//FIXME потом только один попробовать обновить
-		_updateAllVisible(_index, true, true);
-
-		/*size_t start = (size_t)mFirstVisibleIndex;
-		if ((_index >= start) && (_index < (start + mVectorItems.size())))
-		{
-			IBDrawItemInfo data(_index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, true, false);
-			IntCoord coord(IntPoint(), mItemsInfo[_index].size);
-			requestDrawItem(this, mVectorItems[_index - start], data, coord);
-			mItemsInfo[_index].size = coord.size();
-		}*/
-	}
-
-	void ListCtrl::setIndexSelected(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE_AND_NONE(_index, mItemsInfo.size(), "ListCtrl::setIndexSelected");
-		if (_index == mIndexSelect) return;
-
-		//size_t start = (size_t)mFirstVisibleIndex;
-
-		// сбрасываем старое выделение
-		if (mIndexSelect != ITEM_NONE)
-		{
-
-			size_t index = mIndexSelect;
-			mIndexSelect = ITEM_NONE;
-
-			//FIXME потом только один попробовать обновить
-			_updateAllVisible(index, true, false);
-
-			/*if ((index >= start) && (index < (start + mVectorItems.size())))
-			{
-				IBDrawItemInfo data(index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-				IntCoord coord(IntPoint(), mItemsInfo[index].size);
-				requestDrawItem(this, mVectorItems[index - start], data, coord);
-				mItemsInfo[index].size = coord.size();
-			}*/
-		}
-
-		mIndexSelect = _index;
-		if (mIndexSelect != ITEM_NONE)
-		{
-
-			//FIXME потом только один попробовать обновить
-			_updateAllVisible(_index, true, false);
-
-			/*if ((_index >= start) && (_index < (start + mVectorItems.size())))
-			{
-				IBDrawItemInfo data(_index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-				IntCoord coord(IntPoint(), mItemsInfo[_index].size);
-				requestDrawItem(this, mVectorItems[_index - start], data, coord);
-				mItemsInfo[_index].size = coord.size();
-			}*/
-		}
-
-	}
-
-	void ListCtrl::notifyMouseButtonDoubleClick(Widget* _sender)
-	{
-		size_t index = getIndexByWidget(_sender);
-
-		eventSelectItemAccept(this, index);
-	}
-
-	void ListCtrl::notifyKeyButtonPressed(Widget* _sender, KeyCode _key, Char _char)
-	{
-		eventNotifyItem(this, IBNotifyItemData(getIndexByWidget(_sender), IBNotifyItemData::KeyPressed, _key, _char));
-	}
-
-	void ListCtrl::notifyKeyButtonReleased(Widget* _sender, KeyCode _key)
-	{
-		eventNotifyItem(this, IBNotifyItemData(getIndexByWidget(_sender), IBNotifyItemData::KeyReleased, _key));
-	}
-
-	size_t ListCtrl::getIndexByWidget(Widget* _widget)
-	{
-		MYGUI_ASSERT(_widget, "ListCtrl::getIndexByWidget : Widget == nullptr");
-		if (_widget == _getClientWidget()) return ITEM_NONE;
-		MYGUI_ASSERT(_widget->getParent() == _getClientWidget(), "ListCtrl::getIndexByWidget : Widget is not child");
-
-		size_t index = calcIndexByWidget(_widget);
-		MYGUI_ASSERT_RANGE(index, mItemsInfo.size(), "ListCtrl::getIndexByWidget");
-
-		return index;
-	}
-
-	size_t ListCtrl::_getContainerIndex(const IntPoint& _point)
-	{
-		for (VectorWidgetPtr::iterator iter=mVectorItems.begin(); iter!=mVectorItems.end(); ++iter)
-		{
-			if ((*iter)->isVisible())
-			{
-				if ((*iter)->getAbsoluteRect().inside(_point))
-				{
-					return getIndexByWidget(*iter);
-				}
-			}
-		}
-		return ITEM_NONE;
-	}
-
-	void ListCtrl::_resetContainer(bool _update)
-	{
-		// обязательно у базового
-		Base::_resetContainer(_update);
-
-		if ( ! _update)
-		{
-			WidgetManager& instance = WidgetManager::getInstance();
-			for (VectorWidgetPtr::iterator iter=mVectorItems.begin(); iter!=mVectorItems.end(); ++iter)
-			{
-				instance.unlinkFromUnlinkers(*iter);
-			}
-		}
-	}
-
-	Widget* ListCtrl::getWidgetByIndex(size_t _index)
-	{
-		for (VectorWidgetPtr::iterator iter=mVectorItems.begin(); iter!=mVectorItems.end(); ++iter)
-		{
-			if ((*iter)->isVisible())
-			{
-				size_t index = getIndexByWidget(*iter);
-
-				if (index == _index) return (*iter);
-			}
-		}
-		return nullptr;
-	}
-
-	void ListCtrl::onMouseButtonPressed(int _left, int _top, MouseButton _id)
-	{
-		Base::onMouseButtonPressed(_left, _top, _id);
-	}
-
-	void ListCtrl::onMouseButtonReleased(int _left, int _top, MouseButton _id)
-	{
-		Base::onMouseButtonReleased(_left, _top, _id);
-	}
-
-	void ListCtrl::onMouseDrag(int _left, int _top)
-	{
-		Base::onMouseDrag(_left, _top);
-	}
-
-	void ListCtrl::removeDropItems()
-	{
-		if (mItemDrag) mItemDrag->setVisible(false);
-	}
-
-	void ListCtrl::updateDropItems()
-	{
-		if (nullptr == mItemDrag)
-		{
-			// спрашиваем размер иконок
-			IntCoord coord(0, 0, 50, 50);
-
-			//requestCoordItem(this, coord, true);
-
-			mPointDragOffset = coord.point();
-
-			// создаем и запрашиваем детей
-			mItemDrag = Gui::getInstance().createWidget<Widget>("Default", IntCoord(0, 0, coord.width, coord.height), Align::Default, mDragLayer);
-			requestCreateWidgetItem(this, mItemDrag);
-		}
-
-		const IntPoint& point = InputManager::getInstance().getMousePositionByLayer();
-
-		mItemDrag->setPosition(point.left - mClickInWidget.left + mPointDragOffset.left, point.top - mClickInWidget.top + mPointDragOffset.top);
-		mItemDrag->setVisible(true);
-	}
-
-	void ListCtrl::updateDropItemsState(const DDWidgetState& _state)
-	{
-		IBDrawItemInfo data;
-		data.drop_accept = _state.accept;
-		data.drop_refuse = _state.refuse;
-
-		data.select = false;
-		data.active = false;
-
-		data.index = mDropSenderIndex;
-		data.update = _state.update;
-		data.drag = true;
-
-		IntCoord coord;
-
-		requestDrawItem(this, mItemDrag, data, coord);
-
-	}
-
-	void ListCtrl::notifyMouseDrag(Widget* _sender, int _left, int _top)
-	{
-		mouseDrag();
-	}
-
-	void ListCtrl::notifyMouseButtonPressed(Widget* _sender, int _left, int _top, MouseButton _id)
-	{
-		mouseButtonPressed(_id);
-
-		if ( MouseButton::Left == _id)
-		{
-			size_t old = mIndexSelect;
-
-			if (_sender == _getClientWidget())
-			{
-				// сбрасываем выделение
-				setIndexSelected(ITEM_NONE);
-			}
-			else
-			{
-				// индекс отправителя
-				mDropSenderIndex = getIndexByWidget(_sender);
-
-				// выделенный елемент
-				setIndexSelected(mDropSenderIndex);
-			}
-
-			// смещение внутри виджета, куда кликнули мышкой
-			mClickInWidget = InputManager::getInstance().getLastLeftPressed() - _sender->getAbsolutePosition();
-
-			// отсылаем событие
-			eventMouseItemActivate(this, mIndexSelect);
-			// смену позиции отсылаем только при реальном изменении
-			if (old != mIndexSelect) eventChangeItemPosition(this, mIndexSelect);
-		}
-
-		eventNotifyItem(this, IBNotifyItemData(getIndexByWidget(_sender), IBNotifyItemData::MousePressed, _left, _top, _id));
-	}
-
-	void ListCtrl::notifyMouseButtonReleased(Widget* _sender, int _left, int _top, MouseButton _id)
-	{
-		mouseButtonReleased(_id);
-		eventNotifyItem(this, IBNotifyItemData(getIndexByWidget(_sender), IBNotifyItemData::MouseReleased, _left, _top, _id));
-	}
-
-	void ListCtrl::notifyRootMouseChangeFocus(Widget* _sender, bool _focus)
-	{
-		size_t index = calcIndexByWidget(_sender);
-		if (_focus)
-		{
-			MYGUI_ASSERT_RANGE(index, mItemsInfo.size(), "ListCtrl::notifyRootMouseChangeFocus");
-
-			// сбрасываем старый
-			if (mIndexActive != ITEM_NONE)
-			{
-				size_t old_index = mIndexActive;
-				mIndexActive = ITEM_NONE;
-
-				//FIXME потом только один попробовать обновить
-				_updateAllVisible(old_index, true, false);
-
-				/*IBDrawItemInfo data(old_index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-				IntCoord coord(IntPoint(), mItemsInfo[old_index].size);
-				requestDrawItem(this, mVectorItems[old_index - mFirstVisibleIndex], data, coord);
-				mItemsInfo[old_index].size = coord.size();*/
-
-			}
-
-			mIndexActive = index;
-
-			//FIXME потом только один попробовать обновить
-			_updateAllVisible(index, true, false);
-
-			/*IBDrawItemInfo data(index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-			IntCoord coord(IntPoint(), mItemsInfo[index].size);
-			requestDrawItem(this, mVectorItems[*_sender->_getInternalData<size_t>()], data, coord);
-			mItemsInfo[index].size = coord.size();*/
-
-		}
-		else
-		{
-			// при сбросе виджет может быть уже скрыт, и соответсвенно отсутсвовать индекс
-			// сбрасываем индекс, только если мы и есть актив
-			if (index < mItemsInfo.size() && mIndexActive == index)
-			{
-				mIndexActive = ITEM_NONE;
-
-				//FIXME потом только один попробовать обновить
-				_updateAllVisible(index, true, false);
-
-				/*IBDrawItemInfo data(index, mIndexSelect, mIndexActive, mIndexAccept, mIndexRefuse, false, false);
-				IntCoord coord(IntPoint(), mItemsInfo[index].size);
-				requestDrawItem(this, mVectorItems[*_sender->_getInternalData<size_t>()], data, coord);
-				mItemsInfo[index].size = coord.size();*/
-
-			}
-		}
-	}
-
-	void ListCtrl::updateMetrics()
-	{
-		IntSize size;
-
-		for (VectorItemInfo::const_iterator item=mItemsInfo.begin(); item!=mItemsInfo.end(); ++item)
-		{
-			if (size.width < item->size.width)
-				size.width = item->size.width;
-			size.height += item->size.height;
-		}
-
-		mContentSize = size;
-	}
-
-	void ListCtrl::notifyScrollChangePosition(VScroll* _sender, size_t _index)
-	{
-		if (_sender == mVScroll)
-		{
-			mContentPosition.top = (int)_index;
-		}
-		else if (_sender == mHScroll)
-		{
-			mContentPosition.left = (int)_index;
-		}
-
-		setContentPosition(mContentPosition);
-	}
-
-	void ListCtrl::setContentPosition(const IntPoint& _point)
-	{
-		mContentPosition = _point;
-
-		_updateAllVisible(ITEM_NONE, true, true);
-		_resetContainer(true);
-	}
-
-	void ListCtrl::notifyMouseWheel(Widget* _sender, int _rel)
-	{
-		if (mContentSize.height <= 0) return;
-
-		int offset = mContentPosition.top;
-		if (_rel < 0) offset += mScrollViewPage;
-		else offset -= mScrollViewPage;
-
-		if (mContentSize.height <= _getClientWidget()->getHeight()) return;
-
-		if (offset >= mContentSize.height - _getClientWidget()->getHeight()) offset = mContentSize.height - _getClientWidget()->getHeight();
-		else if (offset < 0) offset = 0;
-
-		if (mContentPosition.top == offset) return;
-
-		// сбрасываем старую подсветку
-		// так как при прокрутке, мышь может находиться над окном
-		resetCurrentActiveItem();
-
-		mContentPosition.top = offset;
-
-		setContentPosition(mContentPosition);
-
-		// заново ищем и подсвечиваем айтем
-		if (!mNeedDrop)
-			findCurrentActiveItem();
-
-		if (nullptr != mVScroll) mVScroll->setScrollPosition(mContentPosition.top);
-		if (nullptr != mHScroll) mHScroll->setScrollPosition(mContentPosition.left);
-	}
-
-	void ListCtrl::resetDrag()
-	{
-		endDrop(true);
-	}
-
-	IntSize ListCtrl::getContentSize()
-	{
-		return mContentSize;
-	}
-
-	IntPoint ListCtrl::getContentPosition()
-	{
-		return mContentPosition;
-	}
-
-	IntSize ListCtrl::getViewSize() const
-	{
-		return _getClientWidget()->getSize();
-	}
-
-	void ListCtrl::eraseContent()
-	{
-		_updateAllVisible(ITEM_NONE, false, true);
-		updateMetrics();
-	}
-
-	Align ListCtrl::getContentAlign()
-	{
-		return Align::Default;
-	}
-
-	Widget* ListCtrl::_getClientWidget()
-	{
-		return mWidgetClient == nullptr ? this : mWidgetClient;
-	}
-
-	const Widget* ListCtrl::_getClientWidget() const
-	{
-		return mWidgetClient == nullptr ? this : mWidgetClient;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LogManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LogManager.cpp
deleted file mode 100644
index a85f0c5932..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LogManager.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_LogManager.h"
-#include <sstream>
-#include <assert.h> // REMOVEME
-
-namespace MyGUI
-{
-
-	const std::string LogManager::LevelsName[EndLogLevel] =
-	{
-		"Info",
-		"Warning",
-		"Error",
-		"Critical"
-	};
-
-	const std::string LogManager::General = "General";
-	const std::string LogManager::separator = "  |  ";
-
-	LogStream::LogStreamEnd LogManager::endl;
-	LogManager* LogManager::msInstance = 0;
-
-	LogManager::LogManager()
-	{
-		msInstance = this;
-		mSTDOut = true;
-	}
-
-	LogManager::~LogManager()
-	{
-		MapLogStream& mapStream = msInstance->mMapSectionFileName;
-		for (MapLogStream::iterator iter=mapStream.begin(); iter!=mapStream.end(); ++iter)
-		{
-			LogStream * stream = iter->second;
-			if (stream == 0) continue;
-
-			// ищем все такие потоки и обнуляем
-			for (MapLogStream::iterator iter2=iter; iter2!=mapStream.end(); ++iter2)
-			{
-				if (iter2->second == stream) iter2->second = 0;
-			}
-			delete stream;
-		}
-		mapStream.clear();
-		msInstance = nullptr;
-	}
-
-	void LogManager::shutdown()
-	{
-		if (msInstance != nullptr)
-		{
-			delete msInstance;
-			msInstance = nullptr;
-		}
-	}
-
-	void LogManager::initialise()
-	{
-		if (msInstance == nullptr)
-		{
-			msInstance = new LogManager();
-		}
-	}
-
-	LogStream& LogManager::out(const std::string& _section, LogLevel _level)
-	{
-		static LogStream empty;
-
-		if (msInstance == nullptr)
-			return empty;
-
-		MapLogStream& mapStream = msInstance->mMapSectionFileName;
-		MapLogStream::iterator iter = mapStream.find(_section);
-		if (iter == mapStream.end())
-			return empty;
-
-		if (_level >= EndLogLevel)
-			_level = Info;
-
-		iter->second->start(_section, LevelsName[_level]);
-
-		return *(iter->second);
-	}
-
-	void LogManager::registerSection(const std::string& _section, const std::string& _file)
-	{
-		if (0 == msInstance) new LogManager();
-
-		// ищем такую же секцию и удаляем ее
-		MapLogStream& mapStream = msInstance->mMapSectionFileName;
-		/*MapLogStream::iterator iter = mapStream.find(_section);
-		if (iter != mapStream.end())
-		{
-			delete iter->second;
-			mapStream.erase(iter);
-		}*/
-
-		// ищем поток с таким же именем, если нет, то создаем
-		LogStream * stream = 0;
-		for (MapLogStream::iterator iter=mapStream.begin(); iter!=mapStream.end(); ++iter)
-		{
-			if (iter->second->getFileName() == _file)
-			{
-				stream = iter->second;
-				break;
-			}
-		}
-		if (0 == stream)
-			stream = new LogStream(_file);
-
-		mapStream[_section] = stream;
-	}
-
-	void LogManager::unregisterSection(const std::string& _section)
-	{
-		MapLogStream& mapStream = msInstance->mMapSectionFileName;
-		MapLogStream::iterator iter = mapStream.find(_section);
-		if (iter == mapStream.end()) return;
-
-		LogStream * stream = iter->second;
-		mapStream.erase(iter);
-
-		// если файл еще используеться то удалять не надо
-		for (iter=mapStream.begin(); iter!=mapStream.end(); ++iter)
-		{
-			if (iter->second == stream)
-				return;
-		}
-
-		delete stream;
-
-		if (mapStream.size() == 0) shutdown();
-	}
-
-	const std::string& LogManager::info(const char * _file /* = __FILE__*/, int _line /* = __LINE__*/)
-	{
-		std::ostringstream stream;
-		stream << separator << _file << separator << _line;
-
-		static std::string ret;
-		ret = stream.str();
-		return ret;
-	}
-
-	const LogStream::LogStreamEnd& LogManager::end()
-	{
-		return endl;
-	}
-
-	void LogManager::setSTDOutputEnabled(bool _enable)
-	{
-		assert(msInstance);
-		msInstance->mSTDOut = _enable;
-	}
-
-	bool LogManager::getSTDOutputEnabled()
-	{
-		assert(msInstance);
-		return msInstance->mSTDOut;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LogStream.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LogStream.cpp
deleted file mode 100644
index 5c3ceed3cd..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_LogStream.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_LogStream.h"
-#include "MyGUI_LogManager.h"
-#include <iomanip>
-#include <time.h>
-
-namespace MyGUI
-{
-
-	LogStream::LogStream() { }
-	LogStream::~LogStream()
-	{
-		if (mStream.is_open())
-		{
-			mStream.close();
-			release();
-		}
-	}
-
-	LogStream::LogStream(const std::string& _file) : mFileName(_file)
-	{
-		lock();
-
-		struct tm *current_time;
-		time_t ctTime; time(&ctTime);
-		current_time = localtime( &ctTime );
-
-		mStream.open(mFileName.c_str(), std::ios_base::out);
-		if (mStream.is_open())
-		{
-			mStream << " ---------------------------------------------------------------------------------------------------------------------------------- " << std::endl;
-			mStream << "                                          loging report for : "
-				<< std::setw(2) << std::setfill('0') << current_time->tm_mon + 1 << "/"
-				<< std::setw(2) << std::setfill('0') << current_time->tm_mday << "/"
-				<< std::setw(4) << std::setfill('0') << current_time->tm_year + 1900 << "   "
-				<< std::setw(2) << std::setfill('0') << current_time->tm_hour << ":"
-				<< std::setw(2) << std::setfill('0') << current_time->tm_min << ":"
-				<< std::setw(2) << std::setfill('0') << current_time->tm_sec << std::endl;
-			mStream << " ---------------------------------------------------------------------------------------------------------------------------------- " << std::endl << std::endl;
-			mStream.close();
-		}
-
-		release();
-	}
-
-	void LogStream::start(const std::string& _section, const std::string& _level)
-	{
-		if (mStream.is_open())
-		{
-			mStream.close();
-			release();
-		}
-
-		lock();
-
-		struct tm *current_time;
-		time_t ctTime; time(&ctTime);
-		current_time = localtime( &ctTime );
-
-		if (!mFileName.empty())
-		{
-			mStream.open(mFileName.c_str(), std::ios_base::app);
-			if (mStream.is_open())
-			{
-				mStream << std::setw(2) << std::setfill('0') << current_time->tm_hour << ":"
-					<< std::setw(2) << std::setfill('0') << current_time->tm_min << ":"
-					<< std::setw(2) << std::setfill('0') << current_time->tm_sec << LogManager::separator
-					<< _section << LogManager::separator << _level << LogManager::separator;
-			}
-		}
-	}
-
-	bool LogStream::getSTDOutputEnabled()
-	{
-		return LogManager::getSTDOutputEnabled();
-	}
-
-	LogStream& LogStream::operator<<(const LogStreamEnd& _endl)
-	{
-		if (getSTDOutputEnabled()) std::cout << std::endl;
-		if (mStream.is_open())
-		{
-			mStream << std::endl;
-			mStream.close();
-		}
-		release();
-
-		return *this;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MainSkin.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MainSkin.cpp
deleted file mode 100644
index df2df42257..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MainSkin.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_MainSkin.h"
-#include "MyGUI_RenderItem.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_CommonStateInfo.h"
-
-namespace MyGUI
-{
-
-	MainSkin::MainSkin() :
-		SubSkin()
-	{
-	}
-
-	MainSkin::~MainSkin()
-	{
-	}
-
-	void MainSkin::_setAlign(const IntSize& _oldsize, bool _update)
-	{
-		mCurrentCoord.set(0, 0, mCroppedParent->getWidth(), mCroppedParent->getHeight());
-		mAlign = Align::Stretch;
-
-		Base::_setAlign(_oldsize, _update);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MaskPickInfo.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MaskPickInfo.cpp
deleted file mode 100644
index 80203bb9e0..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MaskPickInfo.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_MaskPickInfo.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_DataManager.h"
-
-namespace MyGUI
-{
-
-	bool MaskPickInfo::load(const std::string& _file)
-	{
-		if (!DataManager::getInstance().isDataExist(_file))
-			return false;
-
-		RenderManager& render = RenderManager::getInstance();
-		ITexture* texture = render.createTexture(_file);
-		texture->loadFromFile(_file);
-
-		uint8 * buffer = (uint8*)texture->lock(TextureUsage::Read);
-		if (buffer == 0)
-		{
-			render.destroyTexture(texture);
-			return false;
-		}
-
-		size_t pixel_size = texture->getNumElemBytes();
-
-		width = texture->getWidth();
-		height = texture->getHeight();
-		size_t size = width * height;
-		data.resize(size);
-
-		size_t pos = 0;
-		for (size_t pos_pix=0; pos_pix<size; pos_pix++)
-		{
-			uint8 white = 0;
-			for (size_t in_pix=0; in_pix<pixel_size; in_pix++)
-			{
-				if (0xFF != buffer[pos])
-				{
-					white = 1;
-				}
-				pos++;
-			}
-
-			data[pos_pix] = white;
-		}
-
-		texture->unlock();
-		render.destroyTexture(texture);
-
-		return true;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MenuBar.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MenuBar.cpp
deleted file mode 100644
index 4347834529..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MenuBar.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_MenuBar.h"
-
-namespace MyGUI
-{
-
-	MenuBar::MenuBar()
-	{
-		mHideByAccept = false;
-		mMenuDropMode = true;
-		mIsMenuDrop = false;
-	}
-
-	void MenuBar::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-		initialiseWidgetSkin(_info);
-	}
-
-	MenuBar::~MenuBar()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void MenuBar::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void MenuBar::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-	}
-
-	void MenuBar::shutdownWidgetSkin()
-	{
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MenuCtrl.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MenuCtrl.cpp
deleted file mode 100644
index c2836581f6..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MenuCtrl.cpp
+++ /dev/null
@@ -1,694 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_MenuCtrl.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_MenuItem.h"
-#include "MyGUI_StaticImage.h"
-#include "MyGUI_MenuBar.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_ControllerManager.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_Gui.h"
-
-namespace MyGUI
-{
-
-	const float POPUP_MENU_SPEED_COEF = 3.0f;
-
-	MenuCtrl::MenuCtrl() :
-		mHideByAccept(true),
-		mMenuDropMode(false),
-		mIsMenuDrop(true),
-		mHideByLostKey(false),
-		mHeightLine(1),
-		mSubmenuImageSize(0),
-		mShutdown(false),
-		mSeparatorHeight(0),
-		mAlignVert(true),
-		mDistanceButton(0),
-		mPopupAccept(false),
-		mOwner(nullptr),
-		mAnimateSmooth(false)
-	{
-	}
-
-	void MenuCtrl::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		// инициализируем овнера
-		Widget* parent = getParent();
-		if (parent)
-		{
-			mOwner = parent->castType<MenuItem>(false);
-			if ( ! mOwner )
-			{
-				Widget* client = parent;
-				parent = client->getParent();
-				if (parent && parent->getClientWidget())
-				{
-					mOwner = parent->castType<MenuItem>(false);
-				}
-			}
-		}
-
-		initialiseWidgetSkin(_info);
-	}
-
-	MenuCtrl::~MenuCtrl()
-	{
-		mShutdown = true;
-		shutdownWidgetSkin();
-	}
-
-	void MenuCtrl::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void MenuCtrl::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// нам нужен фокус клавы
-		mNeedKeyFocus = true;
-
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "Client")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetClient, "widget already assigned");
-				mWidgetClient = (*iter);
-			}
-		}
-		//MYGUI_ASSERT(nullptr != mWidgetClient, "Child Widget Client not found in skin (MenuCtrl must have Client)");
-
-		// парсим свойства
-		const MapString& properties = _info->getProperties();
-		MapString::const_iterator iterS = properties.find("SkinLine");
-		if (iterS != properties.end()) mSkinLine = iterS->second;
-		//MYGUI_ASSERT(!mSkinLine.empty(), "SkinLine property not found (MenuCtrl must have SkinLine property)");
-
-		iterS = properties.find("HeightLine");
-		if (iterS != properties.end()) mHeightLine = utility::parseInt(iterS->second);
-		if (mHeightLine < 1)
-		{
-			MYGUI_LOG(Warning, "MenuCtrl HeightLine can't be less thah 1. Set to 1.");
-			mHeightLine = 1;
-		}
-
-		iterS = properties.find("SeparatorHeight");
-		if (iterS != properties.end()) mSeparatorHeight = utility::parseInt(iterS->second);
-		iterS = properties.find("SeparatorSkin");
-		if (iterS != properties.end()) mSeparatorSkin = iterS->second;
-
-		iterS = properties.find("SubmenuImageSize");
-		if (iterS != properties.end()) mSubmenuImageSize = utility::parseInt(iterS->second);
-
-		iterS = properties.find("SubMenuSkin");
-		if (iterS != properties.end()) mSubMenuSkin = iterS->second;
-		//MYGUI_ASSERT(!mSubMenuSkin.empty(), "SubMenuSkin property not found (MenuCtrl must have SubMenuSkin property)");
-
-		iterS = properties.find("SubMenuLayer");
-		if (iterS != properties.end()) mSubMenuLayer = iterS->second;
-		//MYGUI_ASSERT(!mSubMenuLayer.empty(), "SubMenuLayer property not found (MenuCtrl must have SubMenuLayer property)");
-
-		iterS = properties.find("AlignVert");
-		if (iterS != properties.end()) mAlignVert = utility::parseBool(iterS->second);
-		iterS = properties.find("DistanceButton");
-		if (iterS != properties.end()) mDistanceButton = utility::parseInt(iterS->second);
-
-		if (mSeparatorHeight < 1) mSeparatorHeight = mHeightLine;
-	}
-
-	void MenuCtrl::shutdownWidgetSkin()
-	{
-		mWidgetClient = nullptr;
-	}
-
-	Widget* MenuCtrl::baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name)
-	{
-		Widget* widget = nullptr;
-		if (mWidgetClient != nullptr)
-			widget = mWidgetClient->createWidgetT(_style, _type, _skin, _coord, _align, _layer, _name);
-		else
-			widget = Base::baseCreateWidget(_style, _type, _skin, _coord, _align, _layer, _name);
-
-		MenuItem* child = widget->castType<MenuItem>(false);
-		if (child)
-		{
-			_wrapItem(child, mItemsInfo.size(), "", MenuItemType::Normal, "", Any::Null);
-		}
-		return widget;
-	}
-
-	MenuItem* MenuCtrl::insertItemAt(size_t _index, const UString& _name, MenuItemType _type, const std::string& _id, Any _data)
-	{
-		MYGUI_ASSERT_RANGE_INSERT(_index, mItemsInfo.size(), "MenuCtrl::insertItemAt");
-		if (_index == ITEM_NONE) _index = mItemsInfo.size();
-
-		MenuItem* item = _getClientWidget()->createWidget<MenuItem>(getSkinByType(_type), IntCoord(), Align::Default);
-		_wrapItem(item, _index, _name, _type, _id, _data);
-
-		return item;
-	}
-
-	void MenuCtrl::removeItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::removeItemAt");
-
-		if ( mItemsInfo[_index].submenu )
-		{
-			WidgetManager::getInstance().destroyWidget(mItemsInfo[_index].submenu);
-		}
-		WidgetManager::getInstance().destroyWidget(mItemsInfo[_index].item);
-	}
-
-	void MenuCtrl::removeAllItems()
-	{
-		while (mItemsInfo.size() > 0)
-		{
-			if ( mItemsInfo.back().submenu )
-			{
-				WidgetManager::getInstance().destroyWidget(mItemsInfo.back().submenu);
-			}
-			WidgetManager::getInstance().destroyWidget(mItemsInfo.back().item);
-		}
-	}
-
-	const UString& MenuCtrl::getItemNameAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::getItemNameAt");
-		return mItemsInfo[_index].name;
-	}
-
-	void MenuCtrl::setButtonImageIndex(Button* _button, size_t _index)
-	{
-		StaticImage* image = _button->getStaticImage();
-		if ( nullptr == image ) return;
-		if (image->getItemResource())
-		{
-			static const size_t CountIcons = 2;
-			static const char * IconNames[CountIcons + 1] = { "None", "Popup", "" };
-			if (_index >= CountIcons) _index = CountIcons;
-			image->setItemName(IconNames[_index]);
-		}
-		else
-		{
-			image->setItemSelect(_index);
-		}
-	}
-
-	void MenuCtrl::update()
-	{
-		IntSize size;
-
-		if (mAlignVert)
-		{
-			for (VectorMenuItemInfo::iterator iter=mItemsInfo.begin(); iter!=mItemsInfo.end(); ++iter)
-			{
-				int height = iter->type == MenuItemType::Separator ? mSeparatorHeight : mHeightLine;
-				iter->item->setCoord(0, size.height, _getClientWidget()->getWidth(), height);
-				size.height += height + mDistanceButton;
-
-				int width = iter->width;
-				if (width > size.width) size.width = width;
-			}
-
-		}
-		else
-		{
-			for (VectorMenuItemInfo::iterator iter=mItemsInfo.begin(); iter!=mItemsInfo.end(); ++iter)
-			{
-				int width = iter->type == MenuItemType::Separator ? mSeparatorHeight : iter->width;
-				iter->item->setCoord(size.width, 0, width, mHeightLine);
-				size.width += width + mDistanceButton;
-			}
-			size.height = mHeightLine;
-			size.width = mCoord.width;
-		}
-
-		setSize(size + mCoord.size() - _getClientWidget()->getSize());
-	}
-
-	void MenuCtrl::setItemDataAt(size_t _index, Any _data)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::setItemDataAt");
-		mItemsInfo[_index].data = _data;
-	}
-
-	MenuCtrl* MenuCtrl::getItemChildAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::getItemChildAt");
-		return mItemsInfo[_index].submenu;
-	}
-
-	void MenuCtrl::removeItemChildAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::removeItemChildAt");
-
-		if (mItemsInfo[_index].submenu != nullptr)
-		{
-			WidgetManager::getInstance().destroyWidget(mItemsInfo[_index].submenu);
-			mItemsInfo[_index].submenu = nullptr;
-		}
-
-		update();
-	}
-
-	void MenuCtrl::setItemNameAt(size_t _index, const UString& _name)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::setItemNameAt");
-
-		mItemsInfo[_index].name = _name;
-		MenuItem* item = mItemsInfo[_index].item;
-		item->setCaption(_name);
-
-		update();
-	}
-
-	void MenuCtrl::setItemIdAt(size_t _index, const std::string& _id)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::setItemIdAt");
-		mItemsInfo[_index].id = _id;
-	}
-
-	const std::string& MenuCtrl::getItemIdAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::getItemIdAt");
-		return mItemsInfo[_index].id;
-	}
-
-	void MenuCtrl::_notifyDeleteItem(MenuItem* _item)
-	{
-		// общий шутдаун виджета
-		if (mShutdown) return;
-
-		size_t index = getItemIndex(_item);
-		mItemsInfo.erase(mItemsInfo.begin() + index);
-		update();
-	}
-
-	void MenuCtrl::_notifyUpdateName(MenuItem* _item)
-	{
-		size_t index = getItemIndex(_item);
-		mItemsInfo[index].name = _item->getCaption();
-
-		ISubWidgetText* text = _item->getSubWidgetText();
-		mItemsInfo[index].width = text ? (text->getTextSize().width + _item->getSize().width - text->getWidth()) : 0;
-		update();
-	}
-
-	MenuItemType MenuCtrl::getItemTypeAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::getItemTypeAt");
-		return mItemsInfo[_index].type;
-	}
-
-	void MenuCtrl::setItemTypeAt(size_t _index, MenuItemType _type)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::setItemTypeAt");
-		ItemInfo& info = mItemsInfo[_index];
-		if (info.type == _type) return;
-
-		// сохраняем данные
-		info.type = _type;
-		info.item->changeWidgetSkin(getSkinByType(_type));
-		setButtonImageIndex(info.item, getIconIndexByType(_type ));
-		info.item->setCaption(info.name);
-
-		update();
-	}
-
-	void MenuCtrl::notifyMenuCtrlAccept(MenuItem* _item)
-	{
-		Widget* sender = this;
-
-		WidgetManager::getInstance().addWidgetToUnlink(sender);
-		eventMenuCtrlAccept(this, _item);
-		WidgetManager::getInstance().removeWidgetFromUnlink(sender);
-
-		// нас удалили
-		if (sender == nullptr) return;
-
-		WidgetManager::getInstance().addWidgetToUnlink(sender);
-
-		MenuItem* parent_item = getMenuItemParent();
-		if (parent_item)
-		{
-			MenuCtrl* parent_ctrl = parent_item->getMenuCtrlParent();
-			if (parent_ctrl)
-			{
-				parent_ctrl->notifyMenuCtrlAccept(_item);
-			}
-		}
-
-		WidgetManager::getInstance().removeWidgetFromUnlink(sender);
-
-		// нас удалили
-		if (sender == nullptr) return;
-
-
-		if (mHideByAccept)
-		{
-			setVisibleSmooth(false);
-		}
-		else
-		{
-			InputManager::getInstance().setKeyFocusWidget(nullptr);
-		}
-	}
-
-	void MenuCtrl::setItemChildVisibleAt(size_t _index, bool _visible)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::setItemChildVisibleAt");
-
-		if (_visible)
-		{
-			if (mItemsInfo[_index].submenu && mItemsInfo[_index].submenu->getItemCount())
-			{
-
-				int offset = mItemsInfo[0].item->getAbsoluteTop() - this->getAbsoluteTop();
-
-				const IntCoord& coord = mItemsInfo[_index].item->getAbsoluteCoord();
-				IntPoint point(this->getAbsoluteRect().right, coord.top - offset);
-
-				MenuCtrl* menu = mItemsInfo[_index].submenu;
-
-				if (this->mAlignVert)
-				{
-					if (point.left + menu->getWidth() > MyGUI::Gui::getInstance().getViewSize().width)
-						point.left -= menu->getWidth();
-					if (point.top + menu->getHeight() > MyGUI::Gui::getInstance().getViewSize().height)
-						point.top -= menu->getHeight();
-				}
-				else
-				{
-					point.set(coord.left, this->getAbsoluteRect().bottom);
-				}
-
-				menu->setPosition(point);
-				menu->setVisibleSmooth(true);
-			}
-		}
-		else
-		{
-			if (mItemsInfo[_index].submenu)
-			{
-				mItemsInfo[_index].submenu->setVisibleSmooth(false);
-			}
-		}
-	}
-
-	void MenuCtrl::notifyRootKeyChangeFocus(Widget* _sender, bool _focus)
-	{
-		MenuItem* item = _sender->castType<MenuItem>();
-		if (item->getItemType() == MenuItemType::Popup)
-		{
-			if (_focus)
-			{
-				if (!mMenuDropMode || mIsMenuDrop)
-				{
-					item->setItemChildVisible(true);
-					item->setButtonPressed(true);
-				}
-			}
-			else
-			{
-				item->setItemChildVisible(false);
-				item->setButtonPressed(false);
-			}
-		}
-	}
-
-	Widget* MenuCtrl::createItemChildByType(size_t _index, const std::string& _type)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::createItemChildByType");
-		removeItemChildAt(_index);
-		Widget* child = mItemsInfo[_index].item->createWidgetT(WidgetStyle::Popup, _type, mSubMenuSkin, IntCoord(), Align::Default, mSubMenuLayer);
-		MYGUI_ASSERT(child->isType<MenuCtrl>(), "child must have MenuCtrl base type");
-		return child;
-	}
-
-	void MenuCtrl::notifyMouseButtonClick(Widget* _sender)
-	{
-		MenuItem* item = _sender->castType<MenuItem>();
-		if (mMenuDropMode)
-		{
-			if (mIsMenuDrop)
-			{
-				if (item->getItemType() == MenuItemType::Popup)
-				{
-					item->setButtonPressed(false);
-					item->setItemChildVisible(false);
-					mIsMenuDrop = false;
-				}
-			}
-			else
-			{
-				if (item->getItemType() == MenuItemType::Popup)
-				{
-					mIsMenuDrop = true;
-					item->setButtonPressed(true);
-					item->setItemChildVisible(true);
-					InputManager::getInstance().setKeyFocusWidget(item);
-				}
-			}
-		}
-		else
-		{
-			if ((item->getItemType() == MenuItemType::Popup && mPopupAccept) ||
-				item->getItemType() == MenuItemType::Normal)
-			{
-				notifyMenuCtrlAccept(item);
-			}
-		}
-
-	}
-
-	void MenuCtrl::onKeyChangeRootFocus(bool _focus)
-	{
-		if (mMenuDropMode)
-		{
-			mIsMenuDrop = false;
-		}
-		if ( ! _focus && mHideByLostKey)
-		{
-			setVisibleSmooth(false);
-			eventMenuCtrlClose(this);
-		}
-		Base::onKeyChangeRootFocus(_focus);
-	}
-
-	void MenuCtrl::notifyMouseSetFocus(Widget* _sender, Widget* _new)
-	{
-		InputManager::getInstance().setKeyFocusWidget(_sender);
-	}
-
-	void MenuCtrl::_wrapItemChild(MenuItem* _item, MenuCtrl* _widget)
-	{
-		// заменяем
-		size_t index = getItemIndex(_item);
-		if (mItemsInfo[index].submenu != nullptr)
-		{
-			WidgetManager::getInstance().destroyWidget(mItemsInfo[index].submenu);
-		}
-		mItemsInfo[index].submenu = _widget;
-		// скрываем менюшку
-		mItemsInfo[index].submenu->setVisible(false);
-
-		update();
-	}
-
-	void MenuCtrl::_wrapItem(MenuItem* _item, size_t _index, const UString& _name, MenuItemType _type, const std::string& _id, Any _data)
-	{
-		_item->setAlign(mAlignVert ? Align::Top | Align::HStretch : Align::Default);
-		_item->setCoord(0, 0, _getClientWidget()->getWidth(), mHeightLine);
-		_item->eventRootKeyChangeFocus = newDelegate(this, &MenuCtrl::notifyRootKeyChangeFocus);
-		_item->eventMouseButtonClick = newDelegate(this, &MenuCtrl::notifyMouseButtonClick);
-		_item->eventMouseSetFocus = newDelegate(this, &MenuCtrl::notifyMouseSetFocus);
-
-		setButtonImageIndex(_item, getIconIndexByType(_type ));
-
-		MenuCtrl* submenu = nullptr;
-
-		ItemInfo info = ItemInfo(_item, _name, _type, submenu, _id, _data);
-
-		mItemsInfo.insert(mItemsInfo.begin() + _index, info);
-
-		// его сет капшен, обновит размер
-		_item->setCaption(_name);
-
-		update();
-	}
-
-	void MenuCtrl::setVisible(bool _visible)
-	{
-
-		if (mAnimateSmooth)
-		{
-			ControllerManager::getInstance().removeItem(this);
-			setAlpha(ALPHA_MAX);
-			setEnabledSilent(true);
-			mAnimateSmooth = false;
-		}
-
-		if (_visible)
-		{
-			if (mOwner == nullptr && mHideByLostKey)
-			{
-				MyGUI::InputManager::getInstance().setKeyFocusWidget(this);
-			}
-		}
-
-		Base::setVisible(_visible);
-	}
-
-	void MenuCtrl::setVisibleSmooth(bool _visible)
-	{
-		mAnimateSmooth = true;
-		ControllerManager::getInstance().removeItem(this);
-
-		if (_visible)
-		{
-			setEnabledSilent(true);
-			if ( ! isVisible() )
-			{
-				setAlpha(ALPHA_MIN);
-				Base::setVisible(true);
-			}
-
-			ControllerFadeAlpha* controller = createControllerFadeAlpha(ALPHA_MAX, POPUP_MENU_SPEED_COEF, true);
-			controller->eventPostAction = newDelegate(action::actionWidgetShow);
-			ControllerManager::getInstance().addItem(this, controller);
-		}
-		else
-		{
-			setEnabledSilent(false);
-
-			ControllerFadeAlpha* controller = createControllerFadeAlpha(ALPHA_MIN, POPUP_MENU_SPEED_COEF, false);
-			controller->eventPostAction = newDelegate(action::actionWidgetHide);
-			ControllerManager::getInstance().addItem(this, controller);
-		}
-	}
-
-	ControllerFadeAlpha* MenuCtrl::createControllerFadeAlpha(float _alpha, float _coef, bool _enable)
-	{
-		ControllerItem* item = ControllerManager::getInstance().createItem(ControllerFadeAlpha::getClassTypeName());
-		ControllerFadeAlpha* controller = item->castType<ControllerFadeAlpha>();
-
-		controller->setAlpha(_alpha);
-		controller->setCoef(_coef);
-		controller->setEnabled(_enable);
-
-		return controller;
-	}
-
-	MenuItem* MenuCtrl::insertItem(MenuItem* _to, const UString& _name, MenuItemType _type, const std::string& _id, Any _data)
-	{
-		return insertItemAt(getItemIndex(_to), _name, _type, _id, _data);
-	}
-
-	MenuItem* MenuCtrl::addItem(const UString& _name, MenuItemType _type, const std::string& _id, Any _data)
-	{
-		return insertItemAt(ITEM_NONE, _name, _type, _id, _data);
-	}
-
-	void MenuCtrl::removeItem(MenuItem* _item)
-	{
-		removeItemAt(getItemIndex(_item));
-	}
-
-	MenuItem* MenuCtrl::getItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "MenuCtrl::getItemAt");
-		return mItemsInfo[_index].item;
-	}
-
-	size_t MenuCtrl::getItemIndex(MenuItem* _item)
-	{
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			if (mItemsInfo[pos].item == _item) return pos;
-		}
-		MYGUI_EXCEPT("item (" << _item << ") not found, source 'MenuCtrl::getItemIndex'");
-	}
-
-	MenuItem* MenuCtrl::findItemWith(const UString& _name)
-	{
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			if (mItemsInfo[pos].name == _name) return mItemsInfo[pos].item;
-		}
-		return nullptr;
-	}
-
-	MenuItem* MenuCtrl::getItemById(const std::string& _id)
-	{
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			if (mItemsInfo[pos].id == _id) return mItemsInfo[pos].item;
-		}
-		MYGUI_EXCEPT("item id (" << _id << ") not found, source 'MenuCtrl::getItemById'");
-	}
-
-	size_t MenuCtrl::getItemIndexById(const std::string& _id)
-	{
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			if (mItemsInfo[pos].id == _id) return pos;
-		}
-		MYGUI_EXCEPT("item id (" << _id << ") not found, source 'MenuCtrl::getItemById'");
-	}
-
-	size_t MenuCtrl::findItemIndexWith(const UString& _name)
-	{
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			if (mItemsInfo[pos].name == _name) return pos;
-		}
-		return ITEM_NONE;
-	}
-
-	size_t MenuCtrl::findItemIndex(MenuItem* _item)
-	{
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			if (mItemsInfo[pos].item == _item) return pos;
-		}
-		return ITEM_NONE;
-	}
-
-	Widget* MenuCtrl::_getClientWidget()
-	{
-		return mWidgetClient == nullptr ? this : mWidgetClient;
-	}
-
-	const Widget* MenuCtrl::_getClientWidget() const
-	{
-		return mWidgetClient == nullptr ? this : mWidgetClient;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MenuItem.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MenuItem.cpp
deleted file mode 100644
index 03bd759971..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MenuItem.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
- /*!
-	@file
-	@author		Albert Semenov
-	@date		11/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_MenuItem.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_SubWidgetManager.h"
-
-namespace MyGUI
-{
-
-	MenuItem::MenuItem() :
-		mOwner(nullptr)
-	{
-	}
-
-	void MenuItem::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		Widget* parent = getParent();
-		MYGUI_ASSERT(parent, "MenuItem must have parent MenuCtrl");
-		if (!parent->isType<MenuCtrl>())
-		{
-			Widget* client = parent;
-			parent = client->getParent();
-			MYGUI_ASSERT(parent, "MenuItem must have parent MenuCtrl");
-			MYGUI_ASSERT(parent->getClientWidget() == client, "MenuItem must have parent MenuCtrl");
-			MYGUI_ASSERT(parent->isType<MenuCtrl>(), "MenuItem must have parent MenuCtrl");
-		}
-		mOwner = parent->castType<MenuCtrl>();
-
-		initialiseWidgetSkin(_info);
-
-		// ��� ���������� �����
-		this->mNeedKeyFocus = true;
-	}
-
-	MenuItem::~MenuItem()
-	{
-		shutdownWidgetSkin();
-		mOwner->_notifyDeleteItem(this);
-	}
-
-	Widget* MenuItem::baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name)
-	{
-		Widget* widget = Base::baseCreateWidget(_style, _type, _skin, _coord, _align, _layer, _name);
-		MenuCtrl* child = widget->castType<MenuCtrl>(false);
-		if (child) mOwner->_wrapItemChild(this, child);
-		return widget;
-	}
-
-	void MenuItem::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Button::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void MenuItem::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-	}
-
-	void MenuItem::shutdownWidgetSkin()
-	{
-	}
-
-	void MenuItem::onMouseButtonPressed(int _left, int _top, MouseButton _id)
-	{
-		Base::onMouseButtonPressed(_left, _top, _id);
-	}
-
-	void MenuItem::onMouseButtonReleased(int _left, int _top, MouseButton _id)
-	{
-		Base::onMouseButtonReleased(_left, _top, _id);
-	}
-
-	void MenuItem::setCaption(const UString& _value)
-	{
-		Button::setCaption(_value);
-		mOwner->_notifyUpdateName(this);
-	}
-
-	const UString& MenuItem::getItemName()
-	{
-		return mOwner->getItemName(this);
-	}
-
-	void MenuItem::setItemName(const UString& _value)
-	{
-		mOwner->setItemName(this, _value);
-	}
-
-	void MenuItem::setItemData(Any _data)
-	{
-		mOwner->setItemData(this, _data);
-	}
-
-	void MenuItem::removeItem()
-	{
-		mOwner->removeItem(this);
-	}
-
-	void MenuItem::setItemId(const std::string& _id)
-	{
-		mOwner->setItemId(this, _id);
-	}
-
-	const std::string& MenuItem::getItemId()
-	{
-		return mOwner->getItemId(this);
-	}
-
-	size_t MenuItem::getItemIndex()
-	{
-		return mOwner->getItemIndex(this);
-	}
-
-	MenuCtrl* MenuItem::createItemChild()
-	{
-		return mOwner->createItemChild(this);
-	}
-
-	void MenuItem::setItemType(MenuItemType _type)
-	{
-		mOwner->setItemType(this, _type);
-	}
-
-	MenuItemType MenuItem::getItemType()
-	{
-		return mOwner->getItemType(this);
-	}
-
-	void MenuItem::setItemChildVisible(bool _visible)
-	{
-		mOwner->setItemChildVisible(this, _visible);
-	}
-
-	MenuCtrl* MenuItem::getItemChild()
-	{
-		return mOwner->getItemChild(this);
-	}
-
-	void MenuItem::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "MenuItem_Id") setItemId(_value);
-		else if (_key == "MenuItem_Type") setItemType(utility::parseValue<MenuItemType>(_value));
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Message.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Message.cpp
deleted file mode 100644
index 21bd2070eb..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Message.cpp
+++ /dev/null
@@ -1,449 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Message.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_ControllerManager.h"
-#include "MyGUI_StaticImage.h"
-#include "MyGUI_LanguageManager.h"
-
-namespace MyGUI
-{
-
-	const float MESSAGE_ALPHA_MAX = 0.5f;
-	const float MESSAGE_ALPHA_MIN = 0.0f;
-	const float MESSAGE_SPEED_COEF = 3.0f;
-
-	Message::Message() :
-		mWidgetText(nullptr),
-		mInfoOk(MessageBoxStyle::None),
-		mInfoCancel(MessageBoxStyle::None),
-		mSmoothShow(false),
-		mWidgetFade(nullptr),
-		mIcon(nullptr),
-		mLeftOffset1(0),
-		mLeftOffset2(0)
-	{
-	}
-
-	void Message::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	Message::~Message()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void Message::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void Message::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// парсим виджет для текста
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "Text")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetText, "widget already assigned");
-				mWidgetText = (*iter);
-				mOffsetText.set(mCoord.width - mWidgetText->getWidth(), mCoord.height - mWidgetText->getHeight());
-				mLeftOffset2 = mLeftOffset1 = mWidgetText->getLeft();
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "Icon")
-			{
-				MYGUI_DEBUG_ASSERT( ! mIcon, "widget already assigned");
-				mIcon = (*iter)->castType<StaticImage>();
-			}
-		}
-		//MYGUI_ASSERT(nullptr != mWidgetText, "Child Text not found in skin (MessageBox must have widget for text)");
-
-		if (mIcon != nullptr)
-		{
-			mLeftOffset2 = mIcon->getRight() + 3;
-		}
-
-		// парсим свойства
-		const MapString& properties = _info->getProperties();
-		if (!properties.empty())
-		{
-			MapString::const_iterator iter = properties.find("ButtonSkin");
-			if (iter != properties.end()) mButtonSkin = iter->second;
-			iter = properties.find("ButtonType");
-			if (iter != properties.end()) mButtonType = iter->second;
-			iter = properties.find("ButtonSize");
-			if (iter != properties.end()) mButtonSize = IntSize::parse(iter->second);
-			iter = properties.find("ButtonOffset");
-			if (iter != properties.end()) mButtonOffset = IntSize::parse(iter->second);
-			iter = properties.find("DefaultLayer");
-			if (iter != properties.end()) mDefaultLayer = iter->second;
-			iter = properties.find("FadeSkin");
-			if (iter != properties.end()) mFadeSkin = iter->second;
-			iter = properties.find("FadeLayer");
-			if (iter != properties.end()) mFadeLayer = iter->second;
-		}
-
-	}
-
-	void Message::shutdownWidgetSkin()
-	{
-		mWidgetText = nullptr;
-		mIcon = nullptr;
-	}
-
-	void Message::setMessageText(const UString& _message)
-	{
-		if (mWidgetText != nullptr)
-			mWidgetText->setCaption(_message);
-		updateSize();
-	}
-
-	MessageBoxStyle Message::addButtonName(const UString& _name)
-	{
-		//FIXME
-		if (mVectorButton.size() >= MessageBoxStyle::_CountUserButtons)
-		{
-			MYGUI_LOG(Warning, "Too many buttons in message box, ignored");
-			return MessageBoxStyle::None;
-		}
-		// бит, номер кнопки + смещение до Button1
-		MessageBoxStyle info = MessageBoxStyle(MessageBoxStyle::Enum(MYGUI_FLAG(mVectorButton.size() + MessageBoxStyle::_IndexUserButton1)));
-
-		// запоминаем кнопки для отмены и подтверждения
-		if (mVectorButton.empty()) mInfoOk = info;
-		mInfoCancel = info;
-
-		Widget* button = createWidgetT(mButtonType, mButtonSkin, IntCoord(), Align::Left | Align::Bottom);
-		button->eventMouseButtonClick = newDelegate(this, &Message::notifyButtonClick);
-		button->setCaption(_name);
-		button->_setInternalData(info);
-		mVectorButton.push_back(button);
-
-		updateSize();
-		return info;
-	}
-
-	void Message::setMessageIcon(MessageBoxStyle _icon)
-	{
-		if (nullptr == mIcon) return;
-		if (mIcon->getItemResource() != nullptr)
-		{
-			mIcon->setItemName( getIconName(_icon.getIconIndex()) );
-		}
-		else
-		{
-			mIcon->setImageIndex(_icon.getIconIndex());
-		}
-
-		updateSize();
-	}
-
-	void Message::setMessageButton(MessageBoxStyle _info)
-	{
-		clearButton();
-
-		std::vector<MessageBoxStyle> buttons = _info.getButtons();
-
-		for (size_t index=0; index<buttons.size(); ++index)
-		{
-			// корректируем ее номер
-			MessageBoxStyle info = buttons[index];
-
-			// если бит есть то ставим кнопку
-			addButtonName(getButtonName(info));
-
-			// внутри адд сбрасывается
-			mVectorButton.back()->_setInternalData(info);
-
-			// первая кнопка
-			if (mVectorButton.size() == 1) mInfoOk = info;
-			// последняя кнопка
-			mInfoCancel = info;
-		}
-
-		updateSize();
-	}
-
-	void Message::setMessageStyle(MessageBoxStyle _style)
-	{
-		setMessageButton(_style);
-		setMessageIcon(_style);
-	}
-
-	void Message::notifyButtonClick(MyGUI::Widget* _sender)
-	{
-		_destroyMessage(*_sender->_getInternalData<MessageBoxStyle>());
-	}
-
-	void Message::clearButton()
-	{
-		for (VectorWidgetPtr::iterator iter=mVectorButton.begin(); iter!=mVectorButton.end(); ++iter)
-		{
-			WidgetManager::getInstance().destroyWidget(*iter);
-		}
-		mVectorButton.clear();
-	}
-
-	void Message::onKeyButtonPressed(KeyCode _key, Char _char)
-	{
-		Base::onKeyButtonPressed(_key, _char);
-		if ((_key == KeyCode::Return) || (_key == KeyCode::NumpadEnter)) _destroyMessage(mInfoOk);
-		else if (_key == KeyCode::Escape) _destroyMessage(mInfoCancel);
-	}
-
-	void Message::_destroyMessage(MessageBoxStyle _result)
-	{
-		eventMessageBoxResult(this, _result);
-		if (nullptr != mWidgetFade)
-		{
-			if (mSmoothShow)
-			{
-				ControllerFadeAlpha* controller = createControllerFadeAlpha(MESSAGE_ALPHA_MIN, MESSAGE_SPEED_COEF, false);
-				controller->eventPostAction = newDelegate(action::actionWidgetDestroy);
-				ControllerManager::getInstance().addItem(mWidgetFade, controller);
-			}
-			else
-			{
-				WidgetManager::getInstance().destroyWidget(mWidgetFade);
-			}
-		}
-		if (mSmoothShow) destroySmooth();
-		else WidgetManager::getInstance().destroyWidget(this);
-	}
-
-	void Message::setSmoothShow(bool _smooth)
-	{
-		mSmoothShow = _smooth;
-		if (mSmoothShow)
-		{
-			setAlpha(ALPHA_MIN);
-			setVisible(true);
-			setVisibleSmooth(true);
-		}
-	}
-
-	void Message::setWindowFade(bool _fade)
-	{
-		return; //пока пропустим
-
-		if (_fade)
-		{
-			if (nullptr == mWidgetFade)
-			{
-				Gui& gui = Gui::getInstance();
-				mWidgetFade = gui.createWidgetT(Widget::getClassTypeName(), mFadeSkin, IntCoord(0, 0, gui.getViewSize().width, gui.getViewSize().height), Align::Stretch, mFadeLayer);
-				if (mSmoothShow)
-				{
-					mWidgetFade->setVisible(false);
-
-					ControllerFadeAlpha* controller = createControllerFadeAlpha(MESSAGE_ALPHA_MAX, MESSAGE_SPEED_COEF, false);
-					ControllerManager::getInstance().addItem(mWidgetFade, controller);
-				}
-				else
-				{
-					mWidgetFade->setAlpha(MESSAGE_ALPHA_MAX);
-				}
-			}
-		}
-		else
-		{
-			if (nullptr != mWidgetFade)
-			{
-				WidgetManager::getInstance().destroyWidget(mWidgetFade);
-				mWidgetFade = nullptr;
-			}
-		}
-	}
-
-	const char * Message::getIconName(size_t _index)
-	{
-		static const size_t CountIcons = 4;
-		static const char * IconNames[CountIcons + 1] = { "Info", "Quest", "Error", "Warning", "" };
-		if (_index >= CountIcons) return IconNames[CountIcons];
-		return IconNames[_index];
-	}
-
-	MyGUI::Message* Message::createMessageBox(
-		const std::string& _skin,
-		const UString& _caption,
-		const UString& _message,
-		MessageBoxStyle _style,
-		const std::string& _layer,
-		bool _modal,
-		const std::string& _button1,
-		const std::string& _button2,
-		const std::string& _button3,
-		const std::string& _button4)
-	{
-		Message* mess = Gui::getInstance().createWidget<Message>(_skin, IntCoord(), Align::Default, _layer);
-
-		mess->setCaption(_caption);
-		mess->setMessageText(_message);
-
-		mess->setSmoothShow(true);
-		if (_modal) mess->setWindowFade(true);
-
-		mess->setMessageStyle(_style);
-
-		if (!_button1.empty())
-		{
-			mess->addButtonName(_button1);
-			if (!_button2.empty())
-			{
-				mess->addButtonName(_button2);
-				if (!_button3.empty())
-				{
-					mess->addButtonName(_button3);
-				}
-			}
-		}
-
-		if (_layer.empty()) LayerManager::getInstance().attachToLayerNode(mess->getDefaultLayer(), mess);
-		if (_modal) InputManager::getInstance().addWidgetModal(mess);
-
-		return mess;
-	}
-
-	void Message::updateSize()
-	{
-		ISubWidgetText* text = nullptr;
-		if (mWidgetText != nullptr)
-			text = mWidgetText->getSubWidgetText();
-		IntSize size = text == nullptr ? IntSize() : text->getTextSize();
-		// минимум высота иконки
-		if ((nullptr != mIcon) && (mIcon->getImageIndex() != ITEM_NONE))
-		{
-			if (size.height < mIcon->getHeight()) size.height = mIcon->getHeight();
-			size.width += mIcon->getSize().width;
-		}
-		size += mOffsetText;
-		size.width += 3;
-
-		int width = ((int)mVectorButton.size() * mButtonSize.width) + (((int)mVectorButton.size()+1) * mButtonOffset.width);
-		if (size.width < width) size.width = width;
-
-		int offset = (size.width - width)/2;
-		offset += mButtonOffset.width;
-
-		const IntSize& view = Gui::getInstance().getViewSize();
-		setCoord((view.width-size.width)/2, (view.height-size.height)/2, size.width, size.height);
-
-		if (nullptr != mIcon)
-		{
-			if (mWidgetText != nullptr)
-			{
-				if (mIcon->getImageIndex() != ITEM_NONE) mWidgetText->setCoord(mLeftOffset2, mWidgetText->getTop(), mWidgetText->getWidth(), mWidgetText->getHeight());
-				else mWidgetText->setCoord(mLeftOffset1, mWidgetText->getTop(), mWidgetText->getWidth(), mWidgetText->getHeight());
-			}
-		}
-
-		for (VectorWidgetPtr::iterator iter=mVectorButton.begin(); iter!=mVectorButton.end(); ++iter)
-		{
-			(*iter)->setCoord(offset, mCoord.height - mButtonOffset.height, mButtonSize.width, mButtonSize.height);
-			offset += mButtonOffset.width + mButtonSize.width;
-		}
-	}
-
-	ControllerFadeAlpha* Message::createControllerFadeAlpha(float _alpha, float _coef, bool _enable)
-	{
-		ControllerItem* item = ControllerManager::getInstance().createItem(ControllerFadeAlpha::getClassTypeName());
-		ControllerFadeAlpha* controller = item->castType<ControllerFadeAlpha>();
-
-		controller->setAlpha(_alpha);
-		controller->setCoef(_coef);
-		controller->setEnabled(_enable);
-
-		return controller;
-	}
-
-	void Message::setMessageModal(bool _value)
-	{
-		if (_value) InputManager::getInstance().addWidgetModal(this);
-		else InputManager::getInstance().removeWidgetModal(this);
-	}
-
-	UString Message::getButtonName(MessageBoxStyle _style)
-	{
-		size_t index = _style.getButtonIndex();
-		const char* tag = getButtonTag(index);
-		UString result = LanguageManager::getInstance().replaceTags(utility::toString("#{", tag, "}"));
-		if (result == tag) return getButtonName(index);
-		return result;
-	}
-
-	const char * Message::getButtonName(size_t _index)
-	{
-		static const size_t Count = 9;
-		static const char * Names[Count + 1] = { "Ok", "Yes", "No", "Abort", "Retry", "Ignore", "Cancel", "Try", "Continue", "" };
-		if (_index >= Count) return Names[Count];
-		return Names[_index];
-	}
-
-	const char * Message::getButtonTag(size_t _index)
-	{
-		static const size_t Count = 9;
-		static const char * Names[Count + 1] = { "MyGUI_MessageBox_Ok", "MyGUI_MessageBox_Yes", "MyGUI_MessageBox_No", "MyGUI_MessageBox_Abort", "MyGUI_MessageBox_Retry", "MyGUI_MessageBox_Ignore", "MyGUI_MessageBox_Cancel", "MyGUI_MessageBox_Try", "MyGUI_MessageBox_Continue", "" };
-		if (_index >= Count) return Names[Count];
-		return Names[_index];
-	}
-
-	void Message::endMessage(MessageBoxStyle _result)
-	{
-		_destroyMessage(_result);
-	}
-
-	void Message::endMessage()
-	{
-		_destroyMessage(mInfoCancel);
-	}
-
-	void Message::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "Message_Caption") setCaption(_value);
-		else if (_key == "Message_Message") setMessageText(_value);
-		else if (_key == "Message_Modal") setMessageModal(utility::parseValue<bool>(_value));
-		else if (_key == "Message_Button") setMessageButton(utility::parseValue<MessageBoxStyle>(_value));
-		else if (_key == "Message_AddButton") addButtonName(_value);
-		else if (_key == "Message_SmoothShow") setSmoothShow(utility::parseValue<bool>(_value));
-		else if (_key == "Message_Fade") setWindowFade(utility::parseValue<bool>(_value));
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MultiList.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MultiList.cpp
deleted file mode 100644
index 84ac402b08..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_MultiList.cpp
+++ /dev/null
@@ -1,637 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_MultiList.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_Button.h"
-#include "MyGUI_StaticImage.h"
-#include "MyGUI_List.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_WidgetManager.h"
-
-namespace MyGUI
-{
-
-	MultiList::MultiList() :
-		mHeightButton(0),
-		mWidthBar(0),
-		mButtonMain(nullptr),
-		mLastMouseFocusIndex(ITEM_NONE),
-		mSortUp(true),
-		mSortColumnIndex(ITEM_NONE),
-		mWidthSeparator(0),
-		mOffsetButtonSeparator(2),
-		mItemSelected(ITEM_NONE),
-		mFrameAdvise(false),
-		mClient(nullptr)
-	{
-	}
-
-	void MultiList::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	MultiList::~MultiList()
-	{
-		frameAdvise(false);
-		shutdownWidgetSkin();
-	}
-
-	void MultiList::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void MultiList::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// парсим свойства
-		const MapString& properties = _info->getProperties();
-		if (!properties.empty())
-		{
-			MapString::const_iterator iter = properties.find("SkinButton");
-			if (iter != properties.end()) mSkinButton = iter->second;
-			iter = properties.find("HeightButton");
-			if (iter != properties.end()) mHeightButton = utility::parseInt(iter->second);
-			if (mHeightButton < 0) mHeightButton = 0;
-
-			iter = properties.find("SkinList");
-			if (iter != properties.end()) mSkinList = iter->second;
-
-			iter = properties.find("SkinButtonEmpty");
-			if (iter != properties.end())
-			{
-				mButtonMain = mClient->createWidget<Button>(iter->second,
-					IntCoord(0, 0, mClient->getWidth(), mHeightButton), Align::Default);
-			}
-
-			iter = properties.find("WidthSeparator");
-			if (iter != properties.end()) mWidthSeparator = utility::parseInt(iter->second);
-			iter = properties.find("SkinSeparator");
-			if (iter != properties.end()) mSkinSeparator = iter->second;
-		}
-
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "Client")
-			{
-				MYGUI_DEBUG_ASSERT( ! mClient, "widget already assigned");
-				mClient = (*iter);
-				mWidgetClient = (*iter); // чтобы размер возвращался клиентской зоны
-			}
-		}
-		// мона и без клиента
-		if (nullptr == mClient) mClient = this;
-	}
-
-	void MultiList::shutdownWidgetSkin()
-	{
-		mWidgetClient = nullptr;
-		mClient = nullptr;
-	}
-
-	//----------------------------------------------------------------------------------//
-	// методы для работы со столбцами
-	void MultiList::insertColumnAt(size_t _column, const UString& _name, int _width, Any _data)
-	{
-		MYGUI_ASSERT_RANGE_INSERT(_column, mVectorColumnInfo.size(), "MultiList::insertColumnAt");
-		if (_column == ITEM_NONE) _column = mVectorColumnInfo.size();
-
-		// скрываем у крайнего скролл
-		if (!mVectorColumnInfo.empty())
-			mVectorColumnInfo.back().list->setScrollVisible(false);
-		else mSortColumnIndex = 0;
-
-		ColumnInfo column;
-		column.width = _width < 0 ? 0 : _width;
-
-		column.list = mClient->createWidget<List>(mSkinList, IntCoord(), Align::Left | Align::VStretch);
-		column.list->eventListChangePosition = newDelegate(this, &MultiList::notifyListChangePosition);
-		column.list->eventListMouseItemFocus = newDelegate(this, &MultiList::notifyListChangeFocus);
-		column.list->eventListChangeScroll = newDelegate(this, &MultiList::notifyListChangeScrollPosition);
-		column.list->eventListSelectAccept = newDelegate(this, &MultiList::notifyListSelectAccept);
-
-		column.button = mClient->createWidget<Button>(mSkinButton, IntCoord(), Align::Default);
-		column.button->eventMouseButtonClick = newDelegate(this, &MultiList::notifyButtonClick);
-		column.name = _name;
-		column.data = _data;
-
-		// если уже были столбики, то делаем то же колличество полей
-		if (!mVectorColumnInfo.empty())
-		{
-			size_t count = mVectorColumnInfo.front().list->getItemCount();
-			for (size_t pos=0; pos<count; ++pos)
-				column.list->addItem("");
-		}
-
-		mVectorColumnInfo.insert(mVectorColumnInfo.begin() + _column, column);
-
-		updateColumns();
-
-		// показываем скролл нового крайнего
-		mVectorColumnInfo.back().list->setScrollVisible(true);
-	}
-
-	void MultiList::setColumnNameAt(size_t _column, const UString& _name)
-	{
-		MYGUI_ASSERT_RANGE(_column, mVectorColumnInfo.size(), "MultiList::setColumnNameAt");
-		mVectorColumnInfo[_column].name = _name;
-		redrawButtons();
-	}
-
-	void MultiList::setColumnWidthAt(size_t _column, int _width)
-	{
-		MYGUI_ASSERT_RANGE(_column, mVectorColumnInfo.size(), "MultiList::setColumnWidthAt");
-		mVectorColumnInfo[_column].width = _width < 0 ? 0 : _width;
-		updateColumns();
-	}
-
-	const UString& MultiList::getColumnNameAt(size_t _column)
-	{
-		MYGUI_ASSERT_RANGE(_column, mVectorColumnInfo.size(), "MultiList::getColumnNameAt");
-		return mVectorColumnInfo[_column].name;
-	}
-
-	int MultiList::getColumnWidthAt(size_t _column)
-	{
-		MYGUI_ASSERT_RANGE(_column, mVectorColumnInfo.size(), "MultiList::getColumnWidthAt");
-		return mVectorColumnInfo[_column].width;
-	}
-
-	void MultiList::removeColumnAt(size_t _column)
-	{
-		MYGUI_ASSERT_RANGE(_column, mVectorColumnInfo.size(), "MultiList::removeColumnAt");
-
-		ColumnInfo& info = mVectorColumnInfo[_column];
-
-		WidgetManager& manager = WidgetManager::getInstance();
-		manager.destroyWidget(info.button);
-		manager.destroyWidget(info.list);
-
-		mVectorColumnInfo.erase(mVectorColumnInfo.begin() + _column);
-
-		if (mVectorColumnInfo.empty())
-		{
-			mSortColumnIndex = ITEM_NONE;
-			mItemSelected = ITEM_NONE;
-		}
-		else
-		{
-			mSortColumnIndex = 0;
-			mSortUp = true;
-			sortList();
-		}
-
-		updateColumns();
-	}
-
-	void MultiList::removeAllColumns()
-	{
-		WidgetManager& manager = WidgetManager::getInstance();
-		for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-		{
-			manager.destroyWidget((*iter).button);
-			manager.destroyWidget((*iter).list);
-		}
-		mVectorColumnInfo.clear();
-		mSortColumnIndex = ITEM_NONE;
-
-		updateColumns();
-
-		mItemSelected = ITEM_NONE;
-	}
-
-	void MultiList::sortByColumn(size_t _column, bool _backward)
-	{
-		mSortColumnIndex = _column;
-		if (_backward)
-		{
-			mSortUp = !mSortUp;
-			redrawButtons();
-			// если было недосортированно то сортируем
-			if (mFrameAdvise) sortList();
-
-			flipList();
-		}
-		else
-		{
-			mSortUp = true;
-			redrawButtons();
-			sortList();
-		}
-	}
-
-	size_t MultiList::getItemCount() const
-	{
-		if (mVectorColumnInfo.empty()) return 0;
-		return mVectorColumnInfo.front().list->getItemCount();
-	}
-
-	void MultiList::removeAllItems()
-	{
-		BiIndexBase::removeAllItems();
-		for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-		{
-			(*iter).list->removeAllItems();
-		}
-
-		mItemSelected = ITEM_NONE;
-	}
-
-	/*size_t MultiList::getItemIndexSelected()
-	{
-		if (mVectorColumnInfo.empty()) return ITEM_NONE;
-		size_t item = mVectorColumnInfo.front().list->getItemIndexSelected();
-		return (ITEM_NONE == item) ? ITEM_NONE : BiIndexBase::convertToFace(item);
-	}*/
-
-	void MultiList::updateBackSelected(size_t _index)
-	{
-		if (_index == ITEM_NONE)
-		{
-			for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-			{
-				(*iter).list->clearIndexSelected();
-			}
-		}
-		else
-		{
-			//size_t index = BiIndexBase::convertToBack(_index);
-			for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-			{
-				(*iter).list->setIndexSelected(_index);
-			}
-		}
-	}
-
-	void MultiList::setIndexSelected(size_t _index)
-	{
-		if (_index == mItemSelected) return;
-
-		MYGUI_ASSERT_RANGE(0, mVectorColumnInfo.size(), "MultiList::setIndexSelected");
-		MYGUI_ASSERT_RANGE_AND_NONE(_index, mVectorColumnInfo.begin()->list->getItemCount(), "MultiList::setIndexSelected");
-
-		mItemSelected = _index;
-		updateBackSelected(BiIndexBase::convertToBack(mItemSelected));
-	}
-
-	void MultiList::setSubItemNameAt(size_t _column, size_t _index, const UString& _name)
-	{
-		MYGUI_ASSERT_RANGE(_column, mVectorColumnInfo.size(), "MultiList::setSubItemAt");
-		MYGUI_ASSERT_RANGE(_index, mVectorColumnInfo.begin()->list->getItemCount(), "MultiList::setSubItemAt");
-
-		size_t index = BiIndexBase::convertToBack(_index);
-		mVectorColumnInfo[_column].list->setItemNameAt(index, _name);
-
-		// если мы попортили список с активным сортом, надо пересчитывать
-		if (_column == mSortColumnIndex) frameAdvise(true);
-	}
-
-	const UString& MultiList::getSubItemNameAt(size_t _column, size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_column, mVectorColumnInfo.size(), "MultiList::getSubItemNameAt");
-		MYGUI_ASSERT_RANGE(_index, mVectorColumnInfo.begin()->list->getItemCount(), "MultiList::getSubItemNameAt");
-
-		size_t index = BiIndexBase::convertToBack(_index);
-		return mVectorColumnInfo[_column].list->getItemNameAt(index);
-	}
-
-	size_t MultiList::findSubItemWith(size_t _column, const UString& _name)
-	{
-		MYGUI_ASSERT_RANGE(_column, mVectorColumnInfo.size(), "MultiList::findSubItemWith");
-
-		size_t index = mVectorColumnInfo[_column].list->findItemIndexWith(_name);
-		return BiIndexBase::convertToFace(index);
-	}
-	//----------------------------------------------------------------------------------//
-
-	void MultiList::updateOnlyEmpty()
-	{
-		if (nullptr == mButtonMain) return;
-		// кнопка, для заполнения пустоты
-		if (mWidthBar >= mClient->getWidth()) mButtonMain->setVisible(false);
-		else
-		{
-			mButtonMain->setCoord(mWidthBar, 0, mClient->getWidth()-mWidthBar, mHeightButton);
-			mButtonMain->setVisible(true);
-		}
-	}
-
-	void MultiList::notifyListChangePosition(List* _sender, size_t _position)
-	{
-		for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-		{
-			if (_sender != (*iter).list) (*iter).list->setIndexSelected(_position);
-		}
-
-		updateBackSelected(_position);
-
-		mItemSelected = BiIndexBase::convertToFace(_position);
-
-		// наш евент
-		eventListChangePosition(this, mItemSelected);
-	}
-
-	void MultiList::notifyListSelectAccept(List* _sender, size_t _position)
-	{
-		// наш евент
-		eventListSelectAccept(this, BiIndexBase::convertToFace(_position));
-	}
-
-	void MultiList::notifyListChangeFocus(List* _sender, size_t _position)
-	{
-		for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-		{
-			if (_sender != (*iter).list)
-			{
-				if (ITEM_NONE != mLastMouseFocusIndex) (*iter).list->_setItemFocus(mLastMouseFocusIndex, false);
-				if (ITEM_NONE != _position) (*iter).list->_setItemFocus(_position, true);
-			}
-		}
-		mLastMouseFocusIndex = _position;
-	}
-
-	void MultiList::notifyListChangeScrollPosition(List* _sender, size_t _position)
-	{
-		for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-		{
-			if (_sender != (*iter).list)
-				(*iter).list->setScrollPosition(_position);
-		}
-	}
-
-	void MultiList::notifyButtonClick(MyGUI::Widget* _sender)
-	{
-		size_t index = *_sender->_getInternalData<size_t>();
-		sortByColumn(index, index == mSortColumnIndex);
-	}
-
-	void MultiList::redrawButtons()
-	{
-		size_t pos = 0;
-		for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-		{
-			if (pos == mSortColumnIndex)
-			{
-				if (mSortUp) setButtonImageIndex((*iter).button, SORT_UP);
-				else setButtonImageIndex((*iter).button, SORT_DOWN);
-			}
-			else setButtonImageIndex((*iter).button, SORT_NONE);
-			(*iter).button->setCaption((*iter).name);
-			pos++;
-		}
-	}
-
-	void MultiList::setButtonImageIndex(Button* _button, size_t _index)
-	{
-		StaticImage* image = _button->getStaticImage();
-		if ( nullptr == image ) return;
-		if (image->getItemResource())
-		{
-			static const size_t CountIcons = 3;
-			static const char * IconNames[CountIcons + 1] = { "None", "Up", "Down", "" };
-			if (_index >= CountIcons) _index = CountIcons;
-			image->setItemName(IconNames[_index]);
-		}
-		else
-		{
-			image->setItemSelect(_index);
-		}
-	}
-
-	void MultiList::frameEntered(float _frame)
-	{
-		sortList();
-	}
-
-	void MultiList::frameAdvise(bool _advise)
-	{
-		if ( _advise )
-		{
-			if ( ! mFrameAdvise )
-			{
-				MyGUI::Gui::getInstance().eventFrameStart += MyGUI::newDelegate( this, &MultiList::frameEntered );
-				mFrameAdvise = true;
-			}
-		}
-		else
-		{
-			if ( mFrameAdvise )
-			{
-				MyGUI::Gui::getInstance().eventFrameStart -= MyGUI::newDelegate( this, &MultiList::frameEntered );
-				mFrameAdvise = false;
-			}
-		}
-	}
-
-	Widget* MultiList::getSeparator(size_t _index)
-	{
-		if (!mWidthSeparator || mSkinSeparator.empty()) return nullptr;
-		// последний столбик
-		if (_index == mVectorColumnInfo.size()-1) return nullptr;
-
-		while (_index >= mSeparators.size())
-		{
-			Widget* separator = mClient->createWidget<Widget>(mSkinSeparator, IntCoord(), Align::Default);
-			mSeparators.push_back(separator);
-		}
-
-		return mSeparators[_index];
-	}
-
-	void MultiList::updateColumns()
-	{
-		mWidthBar = 0;
-		size_t index = 0;
-		for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-		{
-			(*iter).list->setCoord(mWidthBar, mHeightButton, (*iter).width, mClient->getHeight() - mHeightButton);
-			(*iter).button->setCoord(mWidthBar, 0, (*iter).width, mHeightButton);
-			(*iter).button->_setInternalData(index);
-
-			mWidthBar += (*iter).width;
-
-			// промежуток между листами
-			Widget* separator = getSeparator(index);
-			if (separator)
-			{
-				separator->setCoord(mWidthBar, 0, mWidthSeparator, mClient->getHeight());
-			}
-
-			mWidthBar += mWidthSeparator;
-			index++;
-		}
-
-		redrawButtons();
-		updateOnlyEmpty();
-	}
-
-	void MultiList::flipList()
-	{
-		if (ITEM_NONE == mSortColumnIndex) return;
-
-		size_t last = mVectorColumnInfo.front().list->getItemCount();
-		if (0 == last) return;
-		last --;
-		size_t first = 0;
-
-		while (first < last)
-		{
-			BiIndexBase::swapItemsBackAt(first, last);
-			for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-			{
-				(*iter).list->swapItemsAt(first, last);
-			}
-
-			first++;
-			last--;
-		}
-
-		updateBackSelected(BiIndexBase::convertToBack(mItemSelected));
-	}
-
-	bool MultiList::compare(List* _list, size_t _left, size_t _right)
-	{
-		bool result = false;
-		if (mSortUp) std::swap(_left, _right);
-		if (requestOperatorLess.empty()) result = _list->getItemNameAt(_left) < _list->getItemNameAt(_right);
-		else requestOperatorLess(this, mSortColumnIndex, _list->getItemNameAt(_left), _list->getItemNameAt(_right), result);
-		return result;
-	}
-
-	void MultiList::sortList()
-	{
-		if (ITEM_NONE == mSortColumnIndex) return;
-
-		List* list = mVectorColumnInfo[mSortColumnIndex].list;
-
-		size_t count = list->getItemCount();
-		if (0 == count) return;
-
-		// shell sort
-		int first, last;
-		for (size_t step = count>>1; step>0 ; step >>= 1)
-		{
-			for (size_t i=0;i<(count-step);i++)
-			{
-				first=i;
-				while (first>=0)
-				{
-					last = first+step;
-					if (compare(list, first, last))
-					{
-						BiIndexBase::swapItemsBackAt(first, last);
-						for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-						{
-							(*iter).list->swapItemsAt(first, last);
-						}
-					}
-					first--;
-				}
-			}
-		}
-
-		frameAdvise(false);
-
-		updateBackSelected(BiIndexBase::convertToBack(mItemSelected));
-	}
-
-	void MultiList::insertItemAt(size_t _index, const UString& _name, Any _data)
-	{
-		MYGUI_ASSERT_RANGE(0, mVectorColumnInfo.size(), "MultiList::insertItemAt");
-		MYGUI_ASSERT_RANGE_INSERT(_index, mVectorColumnInfo.front().list->getItemCount(), "MultiList::insertItemAt");
-		if (ITEM_NONE == _index) _index = mVectorColumnInfo.front().list->getItemCount();
-
-		// если надо, то меняем выделенный элемент
-		// при сортировке, обновится
-		if ((mItemSelected != ITEM_NONE) && (_index <= mItemSelected)) mItemSelected ++;
-
-		size_t index = BiIndexBase::insertItemAt(_index);
-
-		// вставляем во все поля пустые, а потом присваиваем первому
-		for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-		{
-			(*iter).list->insertItemAt(index, "");
-		}
-		mVectorColumnInfo.front().list->setItemNameAt(index, _name);
-		mVectorColumnInfo.front().list->setItemDataAt(index, _data);
-
-		frameAdvise(true);
-	}
-
-	void MultiList::removeItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(0, mVectorColumnInfo.size(), "MultiList::removeItemAt");
-		MYGUI_ASSERT_RANGE(_index, mVectorColumnInfo.begin()->list->getItemCount(), "MultiList::removeItemAt");
-
-		size_t index = BiIndexBase::removeItemAt(_index);
-
-		for (VectorColumnInfo::iterator iter=mVectorColumnInfo.begin(); iter!=mVectorColumnInfo.end(); ++iter)
-		{
-			(*iter).list->removeItemAt(index);
-		}
-
-		// если надо, то меняем выделенный элемент
-		size_t count = mVectorColumnInfo.begin()->list->getItemCount();
-		if (count == 0) mItemSelected = ITEM_NONE;
-		else if (mItemSelected != ITEM_NONE)
-		{
-			if (_index < mItemSelected) mItemSelected --;
-			else if ((_index == mItemSelected) && (mItemSelected == count)) mItemSelected --;
-		}
-		updateBackSelected(BiIndexBase::convertToBack(mItemSelected));
-	}
-
-	void MultiList::swapItemsAt(size_t _index1, size_t _index2)
-	{
-		MYGUI_ASSERT_RANGE(0, mVectorColumnInfo.size(), "MultiList::removeItemAt");
-		MYGUI_ASSERT_RANGE(_index1, mVectorColumnInfo.begin()->list->getItemCount(), "MultiList::swapItemsAt");
-		MYGUI_ASSERT_RANGE(_index2, mVectorColumnInfo.begin()->list->getItemCount(), "MultiList::swapItemsAt");
-
-		// при сортированном, меняем только индексы
-		BiIndexBase::swapItemsFaceAt(_index1, _index2);
-
-		// при несортированном, нужно наоборот, поменять только данные
-		// FIXME
-	}
-
-	void MultiList::setColumnDataAt(size_t _index, Any _data)
-	{
-		MYGUI_ASSERT_RANGE(_index, mVectorColumnInfo.size(), "MultiList::setColumnDataAt");
-		mVectorColumnInfo[_index].data = _data;
-	}
-
-	void MultiList::setSubItemDataAt(size_t _column, size_t _index, Any _data)
-	{
-		MYGUI_ASSERT_RANGE(_column, mVectorColumnInfo.size(), "MultiList::setSubItemDataAt");
-		MYGUI_ASSERT_RANGE(_index, mVectorColumnInfo.begin()->list->getItemCount(), "MultiList::setSubItemDataAt");
-
-		size_t index = BiIndexBase::convertToBack(_index);
-		mVectorColumnInfo[_column].list->setItemDataAt(index, _data);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_OverlappedLayer.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_OverlappedLayer.cpp
deleted file mode 100644
index 745abad871..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_OverlappedLayer.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_LayerItem.h"
-#include "MyGUI_OverlappedLayer.h"
-#include "MyGUI_LayerNode.h"
-#include "MyGUI_RenderManager.h"
-
-namespace MyGUI
-{
-
-	OverlappedLayer::OverlappedLayer() :
-		mIsPick(false)
-	{
-	}
-
-	OverlappedLayer::~OverlappedLayer()
-	{
-		MYGUI_ASSERT(mChildItems.empty(), "Layer '" << getName() << "' must be empty before destroy");
-	}
-
-	void OverlappedLayer::deserialization(xml::ElementPtr _node, Version _version)
-	{
-		mName = _node->findAttribute("name");
-		if (_version >= Version(1, 2))
-		{
-			MyGUI::xml::ElementEnumerator propert = _node->getElementEnumerator();
-			while (propert.next("Property"))
-			{
-				const std::string& key = propert->findAttribute("key");
-				const std::string& value = propert->findAttribute("value");
-				if (key == "Pick") mIsPick = utility::parseValue<bool>(value);
-			}
-		}
-		else
-		{
-			mIsPick = utility::parseBool(_version < Version(1, 0) ? _node->findAttribute("peek") : _node->findAttribute("pick"));
-		}
-	}
-
-	ILayerNode * OverlappedLayer::createChildItemNode()
-	{
-		// ������� ������� �����
-		ILayerNode * node = new LayerNode(this);
-		mChildItems.push_back(node);
-
-		return node;
-	}
-
-	void OverlappedLayer::destroyChildItemNode(ILayerNode* _item)
-	{
-		// ���� ���� ����, �� ����� ��� � �������
-		ILayerNode * parent = _item->getParent();
-		if (parent)
-		{
-			parent->destroyChildItemNode(_item);
-			return;
-		}
-
-		// ����� �������, �� �������
-		for (VectorILayerNode::iterator iter=mChildItems.begin(); iter!=mChildItems.end(); ++iter)
-		{
-			if ((*iter) == _item)
-			{
-				delete _item;
-				mChildItems.erase(iter);
-				return;
-			}
-		}
-		MYGUI_EXCEPT("item node not found");
-	}
-
-	void OverlappedLayer::upChildItemNode(ILayerNode* _item)
-	{
-		// ���� ���� ����, �� ����� ��� �����
-		ILayerNode* parent = _item->getParent();
-		if (parent != nullptr)
-		{
-			parent->upChildItemNode(_item);
-			return;
-		}
-
-		if ((2 > mChildItems.size()) || (mChildItems.back() == _item)) return;
-		for (VectorILayerNode::iterator iter=mChildItems.begin(); iter!=mChildItems.end(); ++iter)
-		{
-			if ((*iter) == _item)
-			{
-				mChildItems.erase(iter);
-				mChildItems.push_back(_item);
-				return;
-			}
-		}
-
-		MYGUI_EXCEPT("item node not found");
-	}
-
-	ILayerItem * OverlappedLayer::getLayerItemByPoint(int _left, int _top)
-	{
-		if (!mIsPick) return nullptr;
-		VectorILayerNode::reverse_iterator iter = mChildItems.rbegin();
-		while (iter != mChildItems.rend())
-		{
-			ILayerItem * item = (*iter)->getLayerItemByPoint(_left, _top);
-			if (item != nullptr) return item;
-			++iter;
-		}
-		return nullptr;
-	}
-
-	IntPoint OverlappedLayer::getPosition(int _left, int _top) const
-	{
-		return IntPoint(_left, _top);
-	}
-
-	void OverlappedLayer::renderToTarget(IRenderTarget* _target, bool _update)
-	{
-		for (VectorILayerNode::iterator iter=mChildItems.begin(); iter!=mChildItems.end(); ++iter)
-		{
-			(*iter)->renderToTarget(_target, _update);
-		}
-	}
-
-	EnumeratorILayerNode OverlappedLayer::getEnumerator()
-	{
-		return EnumeratorILayerNode(mChildItems);
-	}
-
-	void OverlappedLayer::dumpStatisticToLog()
-	{
-		static const char* spacer = "                                                                                                                        ";
-		MYGUI_LOG(Info, spacer);
-		MYGUI_LOG(Info, "Layer name='" << getName() << "'" << " type='" << getTypeName() << "'" << spacer);
-		MYGUI_LOG(Info, "Count root nodes : " << mChildItems.size() << spacer);
-
-		for (VectorILayerNode::iterator iter=mChildItems.begin(); iter!=mChildItems.end(); ++iter)
-		{
-			(*iter)->dumpStatisticToLog(0);
-		}
-	}
-
-	const IntSize& OverlappedLayer::getSize() const
-	{
-		return RenderManager::getInstance().getViewSize();
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_PluginManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_PluginManager.cpp
deleted file mode 100644
index 6707ceb45a..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_PluginManager.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*!
-	@file
-	@author		Denis Koronchik
-	@date		09/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_PluginManager.h"
-#include "MyGUI_DynLibManager.h"
-
-namespace MyGUI
-{
-	const std::string XML_TYPE("Plugin");
-
-	MYGUI_INSTANCE_IMPLEMENT( PluginManager )
-
-	void PluginManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		ResourceManager::getInstance().registerLoadXmlDelegate(XML_TYPE) = newDelegate(this, &PluginManager::_load);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void PluginManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		unloadAllPlugins();
-		ResourceManager::getInstance().unregisterLoadXmlDelegate(XML_TYPE);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	bool PluginManager::loadPlugin(const std::string& _file)
-	{
-		// check initialise
-		MYGUI_ASSERT(mIsInitialise, INSTANCE_TYPE_NAME << "used but not initialised");
-
-		// Load plugin library
-		DynLib* lib = DynLibManager::getInstance().load(_file);
-		if (!lib)
-		{
-			MYGUI_LOG(Error, "Plugin '" << _file << "' not found");
-			return false;
-		}
-
-		// Call startup function
-		DLL_START_PLUGIN pFunc = (DLL_START_PLUGIN)lib->getSymbol("dllStartPlugin");
-		if (!pFunc)
-		{
-			MYGUI_LOG(Error, "Cannot find symbol 'dllStartPlugin' in library " << _file);
-			return false;
-		}
-
-		// Store for later unload
-		mLibs[_file] = lib;
-
-		// This must call installPlugin
-		pFunc();
-
-		return true;
-	}
-
-	void PluginManager::unloadPlugin(const std::string& _file)
-	{
-		// check initialise
-		MYGUI_ASSERT(mIsInitialise, INSTANCE_TYPE_NAME << "used but not initialised");
-
-		DynLibList::iterator it = mLibs.find(_file);
-		if (it != mLibs.end())
-		{
-			// Call plugin shutdown
-			DLL_STOP_PLUGIN pFunc = (DLL_STOP_PLUGIN)(*it).second->getSymbol("dllStopPlugin");
-
-			MYGUI_ASSERT(nullptr != pFunc, INSTANCE_TYPE_NAME << "Cannot find symbol 'dllStopPlugin' in library " << _file);
-
-			// this must call uninstallPlugin
-			pFunc();
-			// Unload library (destroyed by DynLibManager)
-			DynLibManager::getInstance().unload((*it).second);
-			mLibs.erase(it);
-		}
-	}
-
-	bool PluginManager::load(const std::string& _file)
-	{
-		return ResourceManager::getInstance()._loadImplement(_file, true, XML_TYPE, INSTANCE_TYPE_NAME);
-	}
-
-	void PluginManager::_load(xml::ElementPtr _node, const std::string& _file, Version _version)
-	{
-		xml::ElementEnumerator node = _node->getElementEnumerator();
-		while (node.next())
-		{
-			if (node->getName() == "path")
-			{
-				std::string source;
-				if (node->findAttribute("source", source))
-					loadPlugin(source);
-			}
-			else if (node->getName() == "Plugin")
-			{
-				std::string source, source_debug;
-
-				xml::ElementEnumerator source_node = node->getElementEnumerator();
-				while (source_node.next("Source"))
-				{
-					std::string build = source_node->findAttribute("build");
-					if (build == "Debug")
-						source_debug = source_node->getContent();
-					else
-						source = source_node->getContent();
-				}
-#if MYGUI_DEBUG_MODE == 0
-				if (!source.empty())
-					loadPlugin(source);
-#else
-				if (!source_debug.empty())
-					loadPlugin(source_debug);
-#endif
-			}
-		}
-	}
-
-	void PluginManager::installPlugin(IPlugin* _plugin)
-	{
-		// check initialise
-		MYGUI_ASSERT(mIsInitialise, INSTANCE_TYPE_NAME << "used but not initialised");
-
-		MYGUI_LOG(Info, "Installing plugin: " << _plugin->getName());
-
-		mPlugins.insert(_plugin);
-		_plugin->install();
-
-		_plugin->initialize();
-
-		MYGUI_LOG(Info, "Plugin successfully installed");
-	}
-
-	void PluginManager::uninstallPlugin(IPlugin* _plugin)
-	{
-		// check initialise
-		MYGUI_ASSERT(mIsInitialise, INSTANCE_TYPE_NAME << "used but not initialised");
-
-		MYGUI_LOG(Info, "Uninstalling plugin: " << _plugin->getName());
-		PluginList::iterator it = mPlugins.find(_plugin);
-		if (it != mPlugins.end())
-		{
-			_plugin->shutdown();
-			_plugin->uninstall();
-			mPlugins.erase(it);
-		}
-		MYGUI_LOG(Info, "Plugin successfully uninstalled");
-	}
-
-	void PluginManager::unloadAllPlugins()
-	{
-		while (!mLibs.empty())
-			unloadPlugin((*mLibs.begin()).first);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_PointerManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_PointerManager.cpp
deleted file mode 100644
index b823fecb91..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_PointerManager.cpp
+++ /dev/null
@@ -1,355 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_PointerManager.h"
-#include "MyGUI_CoordConverter.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_FactoryManager.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_Gui.h"
-
-#include "MyGUI_ResourceManualPointer.h"
-#include "MyGUI_ResourceImageSetPointer.h"
-
-namespace MyGUI
-{
-
-	const std::string XML_TYPE("Pointer");
-	const std::string XML_TYPE_RESOURCE("Resource");
-	const std::string XML_TYPE_PROPERTY("Property");
-	const std::string RESOURCE_DEFAULT_NAME("Default");
-
-	MYGUI_INSTANCE_IMPLEMENT( PointerManager )
-
-	void PointerManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		Gui::getInstance().eventFrameStart += newDelegate(this, &PointerManager::notifyFrameStart);
-		InputManager::getInstance().eventChangeMouseFocus += newDelegate(this, &PointerManager::notifyChangeMouseFocus);
-		WidgetManager::getInstance().registerUnlinker(this);
-
-		ResourceManager::getInstance().registerLoadXmlDelegate(XML_TYPE) = newDelegate(this, &PointerManager::_load);
-
-		FactoryManager::getInstance().registerFactory<ResourceManualPointer>(XML_TYPE_RESOURCE);
-		FactoryManager::getInstance().registerFactory<ResourceImageSetPointer>(XML_TYPE_RESOURCE);
-
-		mPointer = nullptr;
-		mMousePointer = nullptr;
-		mWidgetOwner = nullptr;
-		mVisible = true;
-
-		mSkinName = "StaticImage";
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void PointerManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		InputManager::getInstance().eventChangeMouseFocus -= newDelegate(this, &PointerManager::notifyChangeMouseFocus);
-		Gui::getInstance().eventFrameStart -= newDelegate(this, &PointerManager::notifyFrameStart);
-
-		FactoryManager::getInstance().unregisterFactory<ResourceManualPointer>(XML_TYPE_RESOURCE);
-		FactoryManager::getInstance().unregisterFactory<ResourceImageSetPointer>(XML_TYPE_RESOURCE);
-
-		// удаляем все виджеты
-		_destroyAllChildWidget();
-
-		mWidgetOwner = nullptr;
-
-		WidgetManager::getInstance().unregisterUnlinker(this);
-		ResourceManager::getInstance().unregisterLoadXmlDelegate(XML_TYPE);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	bool PointerManager::load(const std::string& _file)
-	{
-		return ResourceManager::getInstance()._loadImplement(_file, true, XML_TYPE, INSTANCE_TYPE_NAME);
-	}
-
-	void PointerManager::_load(xml::ElementPtr _node, const std::string& _file, Version _version)
-	{
-		std::string pointer;
-		std::string layer;
-
-		xml::ElementEnumerator node = _node->getElementEnumerator();
-		while (node.next())
-		{
-			if (node->getName() == XML_TYPE)
-			{
-				layer = node->findAttribute("layer");
-				pointer = node->findAttribute("default");
-
-				// сохраняем
-				std::string shared_text = node->findAttribute("texture");
-
-				// берем детей и крутимся, основной цикл
-				xml::ElementEnumerator info = node->getElementEnumerator();
-				while (info.next("Info"))
-				{
-					std::string name = info->findAttribute("name");
-					if (name.empty()) continue;
-
-					std::string texture = info->findAttribute("texture");
-
-					std::string type = (shared_text.empty() && texture.empty()) ? "ResourceImageSetPointer" : "ResourceManualPointer";
-
-					xml::Document doc;
-					xml::ElementPtr root = doc.createRoot("MyGUI");
-					xml::ElementPtr newnode = root->createChild("Resource");
-					newnode->addAttribute("type", type);
-					newnode->addAttribute("name", name);
-
-					std::string tmp;
-					if (info->findAttribute("point", tmp))
-					{
-						xml::ElementPtr prop = newnode->createChild("Property");
-						prop->addAttribute("key", "Point");
-						prop->addAttribute("value", tmp);
-					}
-
-					if (info->findAttribute("size", tmp))
-					{
-						xml::ElementPtr prop = newnode->createChild("Property");
-						prop->addAttribute("key", "Size");
-						prop->addAttribute("value", tmp);
-					}
-
-					if (info->findAttribute("resource", tmp))
-					{
-						xml::ElementPtr prop = newnode->createChild("Property");
-						prop->addAttribute("key", "Resource");
-						prop->addAttribute("value", tmp);
-					}
-
-					if (info->findAttribute("offset", tmp))
-					{
-						xml::ElementPtr prop = newnode->createChild("Property");
-						prop->addAttribute("key", "Coord");
-						prop->addAttribute("value", tmp);
-					}
-
-					if (!shared_text.empty() || !texture.empty())
-					{
-						xml::ElementPtr prop = newnode->createChild("Property");
-						prop->addAttribute("key", "Texture");
-						prop->addAttribute("value",  shared_text.empty() ? texture : shared_text);
-					}
-
-					ResourceManager::getInstance()._load(root, _file, _version);
-				}
-
-			}
-			else if (node->getName() == XML_TYPE_PROPERTY)
-			{
-				const std::string& key = node->findAttribute("key");
-				const std::string& value = node->findAttribute("value");
-				if (key == "Default")
-					setDeafultPointer(value);
-				else if (key == "Layer")
-					setLayerName(value);
-				else if (key == "Skin")
-					mSkinName = value;
-			}
-		}
-
-		if (!layer.empty())
-			setLayerName(layer);
-
-		if (!pointer.empty())
-			setDeafultPointer(pointer);
-
-	}
-
-	void PointerManager::notifyFrameStart(float _time)
-	{
-		mPoint = InputManager::getInstance().getMousePosition();
-		if (nullptr != mMousePointer && mPointer != nullptr)
-			mPointer->setPosition(mMousePointer, mPoint);
-	}
-
-	void PointerManager::setVisible(bool _visible)
-	{
-		if (nullptr != mMousePointer) mMousePointer->setVisible(_visible);
-		mVisible = _visible;
-	}
-
-	void PointerManager::setPointer(const std::string& _name, Widget* _owner)
-	{
-		if (nullptr == mMousePointer)
-			return;
-
-		IResource* result = getByName(_name);
-		if (result == nullptr)
-		{
-			mPointer = nullptr;
-			mMousePointer->setVisible(false);
-			return;
-		}
-
-		mMousePointer->setVisible(mVisible);
-		mPointer = result->castType<IPointer>();
-		mPointer->setImage(mMousePointer);
-		mPointer->setPosition(mMousePointer, mPoint);
-
-		mWidgetOwner = _owner;
-	}
-
-	void PointerManager::_unlinkWidget(Widget* _widget)
-	{
-		if (_widget == mWidgetOwner) setPointer(mDefaultName, nullptr);
-		else if (_widget == mMousePointer) mMousePointer = nullptr;
-	}
-
-	void PointerManager::resetToDefaultPointer()
-	{
-		setPointer(mDefaultName, nullptr);
-	}
-
-	// создает виджет
-	Widget* PointerManager::baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name)
-	{
-		Widget* widget = WidgetManager::getInstance().createWidget(_style, _type, _skin, _coord, _align, nullptr, nullptr, this, _name);
-		mWidgetChild.push_back(widget);
-		// присоединяем виджет с уровню
-		if (!_layer.empty())
-			LayerManager::getInstance().attachToLayerNode(_layer, widget);
-		return widget;
-	}
-
-	// удяляет неудачника
-	void PointerManager::_destroyChildWidget(Widget* _widget)
-	{
-		MYGUI_ASSERT(nullptr != _widget, "invalid widget pointer");
-
-		VectorWidgetPtr::iterator iter = std::find(mWidgetChild.begin(), mWidgetChild.end(), _widget);
-		if (iter != mWidgetChild.end())
-		{
-			// сохраняем указатель
-			MyGUI::Widget* widget = *iter;
-
-			// удаляем из списка
-			*iter = mWidgetChild.back();
-			mWidgetChild.pop_back();
-
-			// отписываем от всех
-			WidgetManager::getInstance().unlinkFromUnlinkers(_widget);
-
-			// непосредственное удаление
-			_deleteWidget(widget);
-		}
-		else
-		{
-			MYGUI_EXCEPT("Widget '" << _widget->getName() << "' not found");
-		}
-	}
-
-	// удаляет всех детей
-	void PointerManager::_destroyAllChildWidget()
-	{
-		WidgetManager& manager = WidgetManager::getInstance();
-		while (!mWidgetChild.empty())
-		{
-			// сразу себя отписывем, иначе вложенной удаление убивает все
-			Widget* widget = mWidgetChild.back();
-			mWidgetChild.pop_back();
-
-			// отписываем от всех
-			manager.unlinkFromUnlinkers(widget);
-
-			// и сами удалим, так как его больше в списке нет
-			_deleteWidget(widget);
-		}
-	}
-
-	void PointerManager::setDeafultPointer(const std::string& _value)
-	{
-		Update();
-
-		mDefaultName = _value;
-		setPointer(mDefaultName, nullptr);
-	}
-
-	void PointerManager::setLayerName(const std::string& _value)
-	{
-		Update();
-
-		mLayerName = _value;
-		if (LayerManager::getInstance().isExist(_value))
-			LayerManager::getInstance().attachToLayerNode(mLayerName, mMousePointer);
-	}
-
-	void PointerManager::Update()
-	{
-		if (mMousePointer == nullptr)
-			mMousePointer = static_cast<StaticImage*>(baseCreateWidget(WidgetStyle::Overlapped, StaticImage::getClassTypeName(), mSkinName, IntCoord(), Align::Default, "", ""));
-	}
-
-	IPointer* PointerManager::getByName(const std::string& _name) const
-	{
-		IResource* result = nullptr;
-		if (!_name.empty() && _name != RESOURCE_DEFAULT_NAME)
-			result = ResourceManager::getInstance().getByName(_name, false);
-
-		if (result == nullptr)
-			result = ResourceManager::getInstance().getByName(mDefaultName, false);
-
-		return result ? result->castType<IPointer>(false) : nullptr;
-	}
-
-	void PointerManager::notifyChangeMouseFocus(Widget* _widget)
-	{
-		std::string pointer = _widget == nullptr ? "" : _widget->getPointer();
-		if (pointer != mCurrentMousePointer)
-		{
-			mCurrentMousePointer = pointer;
-			if (mCurrentMousePointer.empty())
-			{
-				resetToDefaultPointer();
-				eventChangeMousePointer(mDefaultName);
-			}
-			else
-			{
-				setPointer(mCurrentMousePointer, _widget);
-				eventChangeMousePointer(mCurrentMousePointer);
-			}
-		}
-	}
-
-	void PointerManager::setPointer(const std::string& _name)
-	{
-		setPointer(_name, nullptr);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_PopupMenu.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_PopupMenu.cpp
deleted file mode 100644
index a850031f8e..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_PopupMenu.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_PopupMenu.h"
-
-namespace MyGUI
-{
-
-	PopupMenu::PopupMenu()
-	{
-		mHideByLostKey = true;
-	}
-
-	void PopupMenu::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	PopupMenu::~PopupMenu()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void PopupMenu::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void PopupMenu::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-	}
-
-	void PopupMenu::shutdownWidgetSkin()
-	{
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Precompiled.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Precompiled.cpp
deleted file mode 100644
index f459954cb5..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Precompiled.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "MyGUI_Precompiled.h"
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Progress.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Progress.cpp
deleted file mode 100644
index 57738819bb..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Progress.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Progress.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_SkinManager.h"
-
-namespace MyGUI
-{
-
-	const size_t PROGRESS_AUTO_WIDTH = 200;
-	const size_t PROGRESS_AUTO_RANGE = 1000;
-	const float PROGRESS_AUTO_COEF = 400;
-
-	Progress::Progress() :
-		mTrackWidth(1),
-		mTrackStep(0),
-		mTrackMin(0),
-		mRange(0),
-		mStartPosition(0),
-		mEndPosition(0),
-		mAutoPosition(0.0f),
-		mAutoTrack(false),
-		mFillTrack(false),
-		mStartPoint(Align::Left),
-		mClient(nullptr)
-	{
-	}
-
-	void Progress::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	Progress::~Progress()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void Progress::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void Progress::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "Client")
-			{
-				MYGUI_DEBUG_ASSERT( ! mClient, "widget already assigned");
-				mClient = (*iter);
-			}
-		}
-		if (nullptr == mClient) mClient = this;
-
-		const MapString& properties = _info->getProperties();
-		MapString::const_iterator iterS = properties.find("TrackSkin");
-		if (iterS != properties.end()) mTrackSkin = iterS->second;
-		iterS = properties.find("TrackWidth");
-		if (iterS != properties.end()) mTrackWidth = utility::parseInt(iterS->second);
-		iterS = properties.find("TrackMin");
-		if (iterS != properties.end()) mTrackMin = utility::parseInt(iterS->second);
-		if (1 > mTrackWidth) mTrackWidth = 1;
-		iterS = properties.find("TrackStep");
-		if (iterS != properties.end()) mTrackStep = utility::parseInt(iterS->second);
-		else mTrackStep = mTrackWidth;
-		iterS = properties.find("TrackFill");
-		if (iterS != properties.end()) mFillTrack = utility::parseBool(iterS->second);
-		iterS = properties.find("StartPoint");
-		if (iterS != properties.end()) setProgressStartPoint(Align::parse(iterS->second));
-
-	}
-
-	void Progress::shutdownWidgetSkin()
-	{
-		mClient = nullptr;
-	}
-
-	void Progress::setProgressRange(size_t _range)
-	{
-		if (mAutoTrack) return;
-		mRange = _range;
-		if (mEndPosition > mRange) mEndPosition = mRange;
-		if (mStartPosition > mRange) mStartPosition = mRange;
-		updateTrack();
-	}
-
-	void Progress::setProgressPosition(size_t _pos)
-	{
-		if (mAutoTrack) return;
-		mEndPosition = _pos;
-		if (mEndPosition > mRange) mEndPosition = mRange;
-		updateTrack();
-	}
-
-	void Progress::setProgressAutoTrack(bool _auto)
-	{
-		if (mAutoTrack == _auto) return;
-		mAutoTrack = _auto;
-
-		if (mAutoTrack)
-		{
-			Gui::getInstance().eventFrameStart += newDelegate(this, &Progress::frameEntered);
-			mRange = PROGRESS_AUTO_RANGE;
-			mEndPosition = mStartPosition = 0;
-			mAutoPosition = 0.0f;
-		}
-		else
-		{
-			Gui::getInstance().eventFrameStart -= newDelegate(this, &Progress::frameEntered);
-			mRange = mEndPosition = mStartPosition = 0;
-		}
-		updateTrack();
-	}
-
-	void Progress::frameEntered(float _time)
-	{
-		if (!mAutoTrack) return;
-		mAutoPosition += (PROGRESS_AUTO_COEF * _time);
-		size_t pos = (size_t)mAutoPosition;
-
-		if (pos > (mRange + PROGRESS_AUTO_WIDTH)) mAutoPosition = 0.0f;
-
-		if (pos > mRange) mEndPosition = mRange;
-		else mEndPosition = size_t(mAutoPosition);
-
-		if (pos < PROGRESS_AUTO_WIDTH) mStartPosition = 0;
-		else mStartPosition = pos - PROGRESS_AUTO_WIDTH;
-
-		updateTrack();
-	}
-
-	void Progress::setPosition(const IntPoint& _point)
-	{
-		Base::setPosition(_point);
-	}
-
-	void Progress::setSize(const IntSize& _size)
-	{
-		updateTrack();
-
-		Base::setSize(_size);
-	}
-
-	void Progress::setCoord(const IntCoord& _coord)
-	{
-		updateTrack();
-
-		Base::setCoord(_coord);
-	}
-
-	void Progress::updateTrack()
-	{
-		// все скрыто
-		if ((0 == mRange) || (0 == mEndPosition))
-		{
-			for (VectorWidgetPtr::iterator iter=mVectorTrack.begin(); iter!=mVectorTrack.end(); ++iter)
-			{
-				(*iter)->setVisible(false);
-			}
-			return;
-		}
-
-		// тут попроще расчеты
-		if (mFillTrack)
-		{
-			if (mVectorTrack.empty())
-			{
-				Widget* widget = mClient->createWidget<Widget>(mTrackSkin, IntCoord(), Align::Left | Align::VStretch);
-				mVectorTrack.push_back(widget);
-			}
-			else
-			{
-				// первый показываем и ставим норм альфу
-				VectorWidgetPtr::iterator iter=mVectorTrack.begin();
-				(*iter)->setVisible(true);
-				(*iter)->setAlpha(ALPHA_MAX);
-
-				// все начиная со второго скрываем
-				++iter;
-				for (; iter!=mVectorTrack.end(); ++iter)
-				{
-					(*iter)->setVisible(false);
-				}
-			}
-
-			Widget* wid = mVectorTrack.front();
-
-			// полностью виден
-			if ((0 == mStartPosition) && (mRange == mEndPosition))
-			{
-				setTrackPosition(wid, 0, 0, getClientWidth(), getClientHeight());
-			}
-			// эх
-			else
-			{
-				int pos = (int)mStartPosition * (getClientWidth() - mTrackMin) / (int)mRange;
-				setTrackPosition(wid, pos, 0, ((int)mEndPosition * (getClientWidth() - mTrackMin) / (int)mRange) - pos + mTrackMin, getClientHeight());
-			}
-
-			return;
-		}
-
-		// сначала проверяем виджеты для трека
-		int width = getClientWidth() - mTrackWidth + mTrackStep;
-		int count = width / mTrackStep;
-		int ost = (width % mTrackStep);
-		if (ost > 0)
-		{
-			width += mTrackStep - ost;
-			count ++;
-		}
-
-		while ((int)mVectorTrack.size() < count)
-		{
-			Widget* widget = mClient->createWidget<Widget>(mTrackSkin, IntCoord(/*(int)mVectorTrack.size() * mTrackStep, 0, mTrackWidth, getClientHeight()*/), Align::Left | Align::VStretch);
-			widget->setVisible(false);
-			mVectorTrack.push_back(widget);
-		}
-
-		// все видно
-		if ((0 == mStartPosition) && (mRange == mEndPosition))
-		{
-			int pos = 0;
-			for (VectorWidgetPtr::iterator iter=mVectorTrack.begin(); iter!=mVectorTrack.end(); ++iter)
-			{
-				(*iter)->setAlpha(ALPHA_MAX);
-				(*iter)->setVisible(true);
-				setTrackPosition(*iter, pos * mTrackStep, 0, mTrackWidth, getClientHeight());
-				pos++;
-			}
-		}
-		// эх, придется считать
-		else
-		{
-			// сколько не видно
-			int hide_pix = (width * (int)mStartPosition / (int)mRange);
-			int hide_count = hide_pix / mTrackStep;
-			// сколько видно
-			int show_pix = (width * (int)mEndPosition / (int)mRange);
-			int show_count = show_pix / mTrackStep;
-
-			int pos = 0;
-			for (VectorWidgetPtr::iterator iter=mVectorTrack.begin(); iter!=mVectorTrack.end(); ++iter)
-			{
-				if (0 > show_count)
-				{
-					(*iter)->setVisible(false);
-				}
-				else if (0 == show_count)
-				{
-					(*iter)->setAlpha((float)(show_pix % mTrackStep) / (float)mTrackStep);
-					(*iter)->setVisible(true);
-					setTrackPosition(*iter, pos * mTrackStep, 0, mTrackWidth, getClientHeight());
-				}
-				else
-				{
-					if (0 < hide_count)
-					{
-						(*iter)->setVisible(false);
-					}
-					else if (0 == hide_count)
-					{
-						(*iter)->setAlpha(1.0f - ((float)(hide_pix % mTrackStep) / (float)mTrackStep));
-						(*iter)->setVisible(true);
-						setTrackPosition(*iter, pos * mTrackStep, 0, mTrackWidth, getClientHeight());
-					}
-					else
-					{
-						(*iter)->setAlpha(ALPHA_MAX);
-						(*iter)->setVisible(true);
-						setTrackPosition(*iter, pos * mTrackStep, 0, mTrackWidth, getClientHeight());
-					}
-				}
-				hide_count --;
-				show_count --;
-				pos ++;
-			}
-		}
-	}
-
-	void Progress::setTrackPosition(Widget* _widget, int _left, int _top, int _width, int _height)
-	{
-		if (mStartPoint.isLeft()) _widget->setCoord(_left, _top, _width, _height);
-		else if (mStartPoint.isRight()) _widget->setCoord(mClient->getWidth() - _left - _width, _top, _width, _height);
-		else if (mStartPoint.isTop()) _widget->setCoord(_top, _left, _height, _width);
-		else if (mStartPoint.isBottom()) _widget->setCoord(_top, mClient->getHeight() - _left - _width, _height, _width);
-	}
-
-	void Progress::setProgressStartPoint(Align _align)
-	{
-		if ((_align == Align::Left) || (_align == Align::Right) || (_align == Align::Top) || (_align == Align::Bottom))
-		{
-			mStartPoint = _align;
-		}
-		else
-		{
-			mStartPoint = Align::Left;
-			MYGUI_LOG(Warning, "Progress bar support only Left, Right, Top or Bottom align values");
-		}
-		updateTrack();
-	}
-
-	void Progress::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "Progress_Range") setProgressRange(utility::parseValue<size_t>(_value));
-		else if (_key == "Progress_Position") setProgressPosition(utility::parseValue<size_t>(_value));
-		else if (_key == "Progress_AutoTrack") setProgressAutoTrack(utility::parseValue<bool>(_value));
-		else if (_key == "Progress_StartPoint") setProgressStartPoint(utility::parseValue<Align>(_value));
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RawRect.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RawRect.cpp
deleted file mode 100644
index 5645ddbbc3..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RawRect.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		03/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_RawRect.h"
-#include "MyGUI_RenderItem.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_LanguageManager.h"
-#include "MyGUI_CommonStateInfo.h"
-
-namespace MyGUI
-{
-
-	MYGUI_FORCEINLINE void ConvertColour(uint32& _colour, VertexColourType _format)
-	{
-		if (_format == VertexColourType::ColourABGR)
-			_colour = ((_colour & 0x00FF0000) >> 16) | ((_colour & 0x000000FF) << 16) | (_colour & 0xFF00FF00);
-	}
-
-	RawRect::RawRect() :
-		SubSkin(),
-		mRectTextureLT(FloatPoint(0, 0)),
-		mRectTextureRT(FloatPoint(1, 0)),
-		mRectTextureLB(FloatPoint(0, 1)),
-		mRectTextureRB(FloatPoint(1, 1)),
-		mColourLT(Colour::White),
-		mColourRT(Colour::White),
-		mColourLB(Colour::White),
-		mColourRB(Colour::White),
-		mRenderColourLT(0xFFFFFFFF),
-		mRenderColourRT(0xFFFFFFFF),
-		mRenderColourLB(0xFFFFFFFF),
-		mRenderColourRB(0xFFFFFFFF)
-	{
-		mVertexFormat = RenderManager::getInstance().getVertexFormat();
-	}
-
-	RawRect::~RawRect()
-	{
-	}
-
-	void RawRect::setAlpha(float _alpha)
-	{
-		mCurrentColour = ((uint8)(_alpha*255) << 24);
-
-		mRenderColourLT = mCurrentColour | (mRenderColourLT & 0x00FFFFFF);
-		mRenderColourRT = mCurrentColour | (mRenderColourRT & 0x00FFFFFF);
-		mRenderColourLB = mCurrentColour | (mRenderColourLB & 0x00FFFFFF);
-		mRenderColourRB = mCurrentColour | (mRenderColourRB & 0x00FFFFFF);
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void RawRect::setRectColour(const Colour& _colourLT, const Colour& _colourRT, const Colour& _colourLB, const Colour& _colourRB)
-	{
-		mColourLT = _colourLT;
-		mRenderColourLT = texture_utility::toColourARGB(mColourLT);
-		ConvertColour(mRenderColourLT, mVertexFormat);
-		mRenderColourLT = mCurrentColour | (mRenderColourLT & 0x00FFFFFF);
-
-		mColourRT = _colourRT;
-		mRenderColourRT = texture_utility::toColourARGB(mColourRT);
-		ConvertColour(mRenderColourRT, mVertexFormat);
-		mRenderColourRT = mCurrentColour | (mRenderColourRT & 0x00FFFFFF);
-
-		mColourLB = _colourLB;
-		mRenderColourLB = texture_utility::toColourARGB(mColourLB);
-		ConvertColour(mRenderColourLB, mVertexFormat);
-		mRenderColourLB = mCurrentColour | (mRenderColourLB & 0x00FFFFFF);
-
-		mColourRB = _colourRB;
-		mRenderColourRB = texture_utility::toColourARGB(mColourRB);
-		ConvertColour(mRenderColourRB, mVertexFormat);
-		mRenderColourRB = mCurrentColour | (mRenderColourRB & 0x00FFFFFF);
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void RawRect::setRectTexture(const FloatPoint& _pointLT, const FloatPoint& _pointRT, const FloatPoint& _pointLB, const FloatPoint& _pointRB)
-	{
-		mRectTextureLT = _pointLT;
-		mRectTextureRT = _pointRT;
-		mRectTextureLB = _pointLB;
-		mRectTextureRB = _pointRB;
-	}
-
-	void RawRect::doRender()
-	{
-		if (!mVisible || mEmptyView) return;
-
-		Vertex* _vertex = mRenderItem->getCurrentVertextBuffer();
-
-		const RenderTargetInfo& info = mRenderItem->getRenderTarget()->getInfo();
-
-		float vertex_z = info.maximumDepth;
-
-		float vertex_left = ((info.pixScaleX * (float)(mCurrentCoord.left + mCroppedParent->getAbsoluteLeft() - info.leftOffset) + info.hOffset) * 2) - 1;
-		float vertex_right = vertex_left + (info.pixScaleX * (float)mCurrentCoord.width * 2);
-		float vertex_top = -(((info.pixScaleY * (float)(mCurrentCoord.top + mCroppedParent->getAbsoluteTop() - info.topOffset) + info.vOffset) * 2) - 1);
-		float vertex_bottom = vertex_top - (info.pixScaleY * (float)mCurrentCoord.height * 2);
-
-		// first triangle - left top
-		_vertex[0].x = vertex_left;
-		_vertex[0].y = vertex_top;
-		_vertex[0].z = vertex_z;
-		_vertex[0].colour = mRenderColourLT;
-		_vertex[0].u = mRectTextureLT.left;
-		_vertex[0].v = mRectTextureLT.top;
-
-		// first triangle - left bottom
-		_vertex[1].x = vertex_left;
-		_vertex[1].y = vertex_bottom;
-		_vertex[1].z = vertex_z;
-		_vertex[1].colour = mRenderColourLB;
-		_vertex[1].u = mRectTextureLB.left;
-		_vertex[1].v = mRectTextureLB.top;
-
-		// first triangle - right top
-		_vertex[2].x = vertex_right;
-		_vertex[2].y = vertex_top;
-		_vertex[2].z = vertex_z;
-		_vertex[2].colour = mRenderColourRT;
-		_vertex[2].u = mRectTextureRT.left;
-		_vertex[2].v = mRectTextureRT.top;
-
-		// second triangle - right top
-		_vertex[3].x = vertex_right;
-		_vertex[3].y = vertex_top;
-		_vertex[3].z = vertex_z;
-		_vertex[3].colour = mRenderColourRT;
-		_vertex[3].u = mRectTextureRT.left;
-		_vertex[3].v = mRectTextureRT.top;
-
-		// second triangle = left bottom
-		_vertex[4].x = vertex_left;
-		_vertex[4].y = vertex_bottom;
-		_vertex[4].z = vertex_z;
-		_vertex[4].colour = mRenderColourLB;
-		_vertex[4].u = mRectTextureLB.left;
-		_vertex[4].v = mRectTextureLB.top;
-
-		// second triangle - right botton
-		_vertex[5].x = vertex_right;
-		_vertex[5].y = vertex_bottom;
-		_vertex[5].z = vertex_z;
-		_vertex[5].colour = mRenderColourRB;
-		_vertex[5].u = mRectTextureRB.left;
-		_vertex[5].v = mRectTextureRB.top;
-
-		mRenderItem->setLastVertexCount(VertexQuad::VertexCount);
-	}
-
-	void RawRect::setStateData(IStateInfo * _data)
-	{
-		SubSkinStateInfo* data = _data->castType<SubSkinStateInfo>();
-		const FloatRect& rect = data->getRect();
-		mRectTextureLT.set(rect.left, rect.top);
-		mRectTextureRT.set(rect.right, rect.top);
-		mRectTextureLB.set(rect.left, rect.bottom);
-		mRectTextureRB.set(rect.right, rect.bottom);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RenderItem.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RenderItem.cpp
deleted file mode 100644
index 606e90279f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RenderItem.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_RenderItem.h"
-#include "MyGUI_LayerNode.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_DataManager.h"
-#include "MyGUI_RenderManager.h"
-
-namespace MyGUI
-{
-
-	RenderItem::RenderItem() :
-		mTexture(nullptr),
-		mNeedVertexCount(0),
-		mOutDate(false),
-		mCountVertex(0),
-		mCurrentUpdate(true),
-		mCurrentVertext(nullptr),
-		mLastVertextCount(0),
-		mVertexBuffer(nullptr),
-		mRenderTarget(nullptr),
-		mCompression(false)
-	{
-		mVertexBuffer = RenderManager::getInstance().createVertexBuffer();
-	}
-
-	RenderItem::~RenderItem()
-	{
-		RenderManager::getInstance().destroyVertexBuffer(mVertexBuffer);
-		mVertexBuffer = nullptr;
-	}
-
-	void RenderItem::renderToTarget(IRenderTarget* _target, bool _update)
-	{
-		if (mTexture == nullptr)
-			return;
-
-		mRenderTarget = _target;
-
-		mCurrentUpdate = _update;
-
-		if (mOutDate || _update)
-		{
-			mCountVertex = 0;
-			Vertex * buffer = (Vertex*)mVertexBuffer->lock();
-
-			for (VectorDrawItem::iterator iter=mDrawItems.begin(); iter!=mDrawItems.end(); ++iter)
-			{
-				// перед вызовом запоминаем позицию в буфере
-				mCurrentVertext = buffer;
-				mLastVertextCount = 0;
-
-				(*iter).first->doRender();
-
-				// колличество отрисованных вершин
-				MYGUI_DEBUG_ASSERT(mLastVertextCount <= (*iter).second, "It is too much vertexes");
-				buffer += mLastVertextCount;
-				mCountVertex += mLastVertextCount;
-			}
-
-			mVertexBuffer->unlock();
-
-			mOutDate = false;
-		}
-
-		// хоть с 0 не выводиться батч, но все равно не будем дергать стейт и операцию
-		if (0 != mCountVertex)
-		{
-#if MYGUI_DEBUG_MODE == 1
-			if (!RenderManager::getInstance().checkTexture(mTexture))
-			{
-				mTexture = nullptr;
-				MYGUI_EXCEPT("texture pointer is not valid, texture name '" << mTextureName << "'");
-				return;
-			}
-#endif
-			// непосредственный рендринг
-			_target->doRender(mVertexBuffer, mTexture, mCountVertex);
-		}
-	}
-
-	void RenderItem::removeDrawItem(ISubWidget* _item)
-	{
-		for (VectorDrawItem::iterator iter=mDrawItems.begin(); iter!=mDrawItems.end(); ++iter)
-		{
-			if ((*iter).first == _item)
-			{
-				mNeedVertexCount -= (*iter).second;
-				mDrawItems.erase(iter);
-				mOutDate = true;
-
-				mVertexBuffer->setVertextCount(mNeedVertexCount);
-
-				// если все отдетачились, расскажем отцу
-				if (mDrawItems.empty())
-				{
-					mTexture = nullptr;
-					mCompression = true;
-				}
-
-				return;
-			}
-		}
-		MYGUI_EXCEPT("DrawItem not found");
-	}
-
-	void RenderItem::addDrawItem(ISubWidget* _item, size_t _count)
-	{
-
-// проверяем только в дебаге
-#if MYGUI_DEBUG_MODE == 1
-		for (VectorDrawItem::iterator iter=mDrawItems.begin(); iter!=mDrawItems.end(); ++iter)
-		{
-			MYGUI_ASSERT((*iter).first != _item, "DrawItem exist");
-		}
-#endif
-
-		mDrawItems.push_back(DrawItemInfo(_item, _count));
-		mNeedVertexCount += _count;
-		mOutDate = true;
-
-		mVertexBuffer->setVertextCount(mNeedVertexCount);
-	}
-
-	void RenderItem::reallockDrawItem(ISubWidget* _item, size_t _count)
-	{
-		for (VectorDrawItem::iterator iter=mDrawItems.begin(); iter!=mDrawItems.end(); ++iter)
-		{
-			if ((*iter).first == _item)
-			{
-				// если нужно меньше, то ниче не делаем
-				if ((*iter).second < _count)
-				{
-					mNeedVertexCount -= (*iter).second;
-					mNeedVertexCount += _count;
-					(*iter).second = _count;
-					mOutDate = true;
-
-					mVertexBuffer->setVertextCount(mNeedVertexCount);
-				}
-				return;
-			}
-		}
-		MYGUI_EXCEPT("DrawItem not found");
-	}
-
-	void RenderItem::setTexture(ITexture* _value)
-	{
-		MYGUI_DEBUG_ASSERT(mVertexBuffer->getVertextCount() == 0, "change texture only empty buffer");
-		MYGUI_DEBUG_ASSERT(mNeedVertexCount == 0, "change texture only empty buffer");
-
-		mTexture = _value;
-
-#if MYGUI_DEBUG_MODE == 1
-		mTextureName = mTexture == nullptr ? "" : mTexture->getName();
-#endif
-	}
-
-	ITexture* RenderItem::getTexture()
-	{
-		return mTexture;
-	}
-
-	bool RenderItem::getCompression()
-	{
-		bool result = mCompression;
-		mCompression = false;
-		return result;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RenderManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RenderManager.cpp
deleted file mode 100644
index b10526651a..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RenderManager.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_RenderManager.h"
-
-namespace MyGUI
-{
-
-	const std::string INSTANCE_TYPE_NAME("RenderManager");
-
-	RenderManager* RenderManager::msInstance = 0;
-
-	RenderManager::RenderManager() :
-		mIsInitialise(false)
-	{
-		MYGUI_ASSERT(0 == msInstance, "instance " << INSTANCE_TYPE_NAME << " is exsist");
-		msInstance = this;
-	}
-
-	RenderManager::~RenderManager()
-	{
-		msInstance = 0;
-	}
-
-	RenderManager* RenderManager::getInstancePtr()
-	{
-		return msInstance;
-	}
-
-	RenderManager& RenderManager::getInstance()
-	{
-		MYGUI_ASSERT(0 != msInstance, "instance " << INSTANCE_TYPE_NAME << " was not created");
-		return (*msInstance);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RenderOut.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RenderOut.cpp
deleted file mode 100644
index 026c2f673d..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RenderOut.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_RenderOut.h"
-#include "MyGUI_Utility.h"
-
-#include "MyGUI_Gui.h"
-#include "MyGUI_FontManager.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_StaticText.h"
-
-namespace MyGUI
-{
-	namespace implement
-	{
-
-		// структура информации об одной строке
-		struct info
-		{
-			info() : num(0), count(1)  { }
-			info(size_t _num, const std::string& _line) : num(_num), count(1), line(_line) { }
-
-			size_t num;
-			size_t count;
-			std::string line;
-		};
-
-		void render_out(const std::string& _value)
-		{
-			// очередь
-			typedef std::deque<info> DequeInfo;
-
-			// текущая строка
-			static size_t num = 0;
-			// очередь всех наших строк
-			static DequeInfo lines;
-
-			const int offset = 10;
-			const size_t count_lines = 20;
-			static const std::string font = "DejaVuSans.14";
-			static const std::string layer = "Statistic";
-			static const std::string skin = "StaticText";
-
-			static StaticText* widget = nullptr;
-			static StaticText* widget_shadow = nullptr;
-
-			if (widget == nullptr)
-			{
-				Gui * gui = Gui::getInstancePtr();
-				if (gui == nullptr) return;
-
-				const IntSize& size = gui->getViewSize();
-
-				if (!LayerManager::getInstance().isExist(layer)) return;
-				if (!SkinManager::getInstance().isExist(skin)) return;
-
-
-				widget_shadow = gui->createWidget<StaticText>(skin, IntCoord(offset + 1, offset + 1, size.width - offset - offset, size.height - offset - offset), Align::Stretch, layer);
-				widget_shadow->setNeedMouseFocus(false);
-				widget_shadow->setTextAlign(Align::Default);
-				widget_shadow->setTextColour(Colour::Black);
-
-				widget = gui->createWidget<StaticText>(skin, IntCoord(offset, offset, size.width - offset - offset, size.height - offset - offset), Align::Stretch, layer);
-				widget->setNeedMouseFocus(false);
-				widget->setTextAlign(Align::Default);
-				widget->setTextColour(Colour::White);
-
-				if (FontManager::getInstance().getByName(font) != nullptr)
-				{
-					widget_shadow->setFontName(font);
-					widget->setFontName(font);
-				}
-			}
-
-			// первый раз просто добавляем
-			if (lines.empty())
-			{
-				lines.push_back(info(num++, _value));
-
-			}
-			// не первый раз мы тут
-			else
-			{
-				// сравниваем последнюю строку
-				if (lines.back().line == _value) lines.back().count ++;
-				else
-				{
-					lines.push_back(info(num++, _value));
-					// удаляем лишнее
-					if (lines.size() > count_lines) lines.pop_front();
-				}
-
-			}
-
-			// а вот теперь выводми строки
-			std::string str_out;
-			str_out.reserve(2048);
-
-			for (DequeInfo::iterator iter=lines.begin(); iter != lines.end(); ++iter)
-			{
-				str_out += utility::toString("[ ", (unsigned int)iter->num, (iter->count > 1) ? (" , " + utility::toString((unsigned int)iter->count)) : "", " ]  ", iter->line, "\n");
-			}
-
-			// непосредственный вывод
-			widget_shadow->setCaption(str_out);
-			widget->setCaption(str_out);
-		}
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceImageSet.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceImageSet.cpp
deleted file mode 100644
index 9d15645a90..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceImageSet.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ResourceImageSet.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_LanguageManager.h"
-
-namespace MyGUI
-{
-
-	std::string ResourceImageSet::mTextureEmpty;
-	IntSize ResourceImageSet::mSizeEmpty;
-	std::vector<IntPoint> ResourceImageSet::mFramesEmpty;
-
-	void ResourceImageSet::deserialization(xml::ElementPtr _node, Version _version)
-	{
-		Base::deserialization(_node, _version);
-
-		// берем детей и крутимся, основной цикл
-		xml::ElementEnumerator group_node = _node->getElementEnumerator();
-		while (group_node.next("Group"))
-		{
-			GroupImage group;
-			group.name = group_node->findAttribute("name");
-
-			group.texture = group_node->findAttribute("texture");
-			// поддержка замены тегов
-			if (_version >= Version(1, 1))
-			{
-				group.texture = LanguageManager::getInstance().replaceTags(group.texture);
-			}
-
-			group.size = IntSize::parse(group_node->findAttribute("size"));
-
-			xml::ElementEnumerator index_node = group_node->getElementEnumerator();
-			while (index_node.next("Index"))
-			{
-				IndexImage index;
-				index.name = index_node->findAttribute("name");
-				index.rate = utility::parseFloat(index_node->findAttribute("rate"));
-
-				xml::ElementEnumerator frame_node = index_node->getElementEnumerator();
-				while (frame_node.next("Frame"))
-				{
-					size_t count = utility::parseSizeT(frame_node->findAttribute("count"));
-					const IntPoint& point = IntPoint::parse(frame_node->findAttribute("point"));
-					if ((count < 1) || (count > 256)) count = 1;
-					while (count > 0)
-					{
-						index.frames.push_back(point);
-						-- count;
-					}
-				}
-
-				group.indexes.push_back(index);
-			}
-
-			mGroups.push_back(group);
-		}
-	}
-
-	ImageIndexInfo ResourceImageSet::getIndexInfo(const std::string& _group, const std::string& _index)
-	{
-		size_t index_group = getGroupIndex(_group);
-		if (index_group != ITEM_NONE)
-		{
-			GroupImage& group = mGroups[index_group];
-			size_t index_image = getImageIndex(group, _index);
-			if (index_image != ITEM_NONE)
-			{
-				IndexImage& index = group.indexes[index_image];
-				return ImageIndexInfo(group.texture, group.size, index.rate, index.frames);
-			}
-		}
-		return ImageIndexInfo(mTextureEmpty, mSizeEmpty, 0, mFramesEmpty);
-	}
-
-	ImageIndexInfo ResourceImageSet::getIndexInfo(size_t _group, const std::string& _index)
-	{
-		if (_group < mGroups.size())
-		{
-			GroupImage& group = mGroups[_group];
-			size_t index_image = getImageIndex(group, _index);
-			if (index_image != ITEM_NONE)
-			{
-				IndexImage& index = group.indexes[index_image];
-				return ImageIndexInfo(group.texture, group.size, index.rate, index.frames);
-			}
-		}
-		return ImageIndexInfo(mTextureEmpty, mSizeEmpty, 0, mFramesEmpty);
-	}
-
-	ImageIndexInfo ResourceImageSet::getIndexInfo(const std::string& _group, size_t _index)
-	{
-		size_t index_group = getGroupIndex(_group);
-		if (index_group != ITEM_NONE)
-		{
-			GroupImage& group = mGroups[index_group];
-			if (_index < group.indexes.size())
-			{
-				IndexImage& index = group.indexes[_index];
-				return ImageIndexInfo(group.texture, group.size, index.rate, index.frames);
-			}
-		}
-		return ImageIndexInfo(mTextureEmpty, mSizeEmpty, 0, mFramesEmpty);
-	}
-
-	ImageIndexInfo ResourceImageSet::getIndexInfo(size_t _group, size_t _index)
-	{
-		if (_group < mGroups.size())
-		{
-			GroupImage& group = mGroups[_group];
-			if (_index < group.indexes.size())
-			{
-				IndexImage& index = group.indexes[_index];
-				return ImageIndexInfo(group.texture, group.size, index.rate, index.frames);
-			}
-		}
-		return ImageIndexInfo(mTextureEmpty, mSizeEmpty, 0, mFramesEmpty);
-	}
-
-	ImageIndexInfo ResourceImageSet::getIndexInfo(const IntSize& _group, size_t _index)
-	{
-		size_t index_group = getGroupIndex(_group);
-		if (index_group != ITEM_NONE)
-		{
-			GroupImage& group = mGroups[index_group];
-			if (_index < group.indexes.size())
-			{
-				IndexImage& index = group.indexes[_index];
-				return ImageIndexInfo(group.texture, group.size, index.rate, index.frames);
-			}
-		}
-		return ImageIndexInfo(mTextureEmpty, mSizeEmpty, 0, mFramesEmpty);
-	}
-
-	ImageIndexInfo ResourceImageSet::getIndexInfo(const IntSize& _group, const std::string& _index)
-	{
-		size_t index_group = getGroupIndex(_group);
-		if (index_group != ITEM_NONE)
-		{
-			GroupImage& group = mGroups[index_group];
-			size_t index_image = getImageIndex(group, _index);
-			if (index_image != ITEM_NONE)
-			{
-				IndexImage& index = group.indexes[index_image];
-				return ImageIndexInfo(group.texture, group.size, index.rate, index.frames);
-			}
-		}
-		return ImageIndexInfo(mTextureEmpty, mSizeEmpty, 0, mFramesEmpty);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceImageSetPointer.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceImageSetPointer.cpp
deleted file mode 100644
index ec39d0078e..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceImageSetPointer.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ResourceImageSetPointer.h"
-#include "MyGUI_StaticImage.h"
-#include "MyGUI_ResourceManager.h"
-
-namespace MyGUI
-{
-
-	ResourceImageSetPointer::ResourceImageSetPointer() :
-		mImageSet(nullptr)
-	{
-	}
-
-	void ResourceImageSetPointer::deserialization(xml::ElementPtr _node, Version _version)
-	{
-		Base::deserialization(_node, _version);
-
-		// ����� ����� � ��������, �������� ����
-		xml::ElementEnumerator info = _node->getElementEnumerator();
-		while (info.next("Property"))
-		{
-			const std::string& key = info->findAttribute("key");
-			const std::string& value = info->findAttribute("value");
-
-			if (key == "Point") mPoint = IntPoint::parse(value);
-			else if (key == "Size") mSize = IntSize::parse(value);
-			else if (key == "Resource") mImageSet = ResourceManager::getInstance().getByName(value)->castType<ResourceImageSet>();
-		}
-	}
-
-	void ResourceImageSetPointer::setImage(StaticImage* _image)
-	{
-		if (mImageSet != nullptr)
-			_image->setItemResourceInfo(mImageSet->getIndexInfo(0, 0));
-	}
-
-	void ResourceImageSetPointer::setPosition(StaticImage* _image, const IntPoint& _point)
-	{
-		_image->setCoord(_point.left - mPoint.left, _point.top - mPoint.top, mSize.width, mSize.height);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceManager.cpp
deleted file mode 100644
index cce65354bf..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceManager.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_IResource.h"
-#include "MyGUI_DataManager.h"
-#include "MyGUI_FactoryManager.h"
-
-#include "MyGUI_ResourceImageSet.h"
-
-namespace MyGUI
-{
-
-	const std::string XML_TYPE("Resource");
-	const std::string XML_TYPE_LIST("List");
-
-	MYGUI_INSTANCE_IMPLEMENT( ResourceManager )
-
-	void ResourceManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		registerLoadXmlDelegate(XML_TYPE) = newDelegate(this, &ResourceManager::_load);
-		registerLoadXmlDelegate(XML_TYPE_LIST) = newDelegate(this, &ResourceManager::_loadList);
-
-		// регестрируем дефолтные ресурсы
-		FactoryManager::getInstance().registerFactory<ResourceImageSet>(XML_TYPE);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void ResourceManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		FactoryManager::getInstance().unregisterFactory<ResourceImageSet>(XML_TYPE);
-
-		clear();
-		unregisterLoadXmlDelegate(XML_TYPE);
-		unregisterLoadXmlDelegate(XML_TYPE_LIST);
-
-		mMapLoadXmlDelegate.clear();
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	bool ResourceManager::load(const std::string& _file)
-	{
-		return _loadImplement(_file, false, "", INSTANCE_TYPE_NAME);
-	}
-
-	void ResourceManager::_load(xml::ElementPtr _node, const std::string& _file, Version _version)
-	{
-		FactoryManager& factory = FactoryManager::getInstance();
-
-		VectorGuid vector_guid;
-		// берем детей и крутимся, основной цикл
-		xml::ElementEnumerator root = _node->getElementEnumerator();
-		while (root.next(XML_TYPE))
-		{
-			// парсим атрибуты
-			std::string id, type, name;
-			root->findAttribute("type", type);
-			root->findAttribute("name", name);
-			root->findAttribute("id", id);
-
-			Guid guid(id);
-			if (!guid.empty())
-			{
-				if (mResourcesID.find(guid) != mResourcesID.end())
-				{
-					MYGUI_LOG(Warning, "dublicate resource id " << guid.print());
-				}
-			}
-
-			if (mResources.find(name) != mResources.end())
-			{
-				MYGUI_LOG(Warning, "dublicate resource name '" << name << "'");
-			}
-
-			vector_guid.push_back(guid);
-
-			IObject* object = factory.createObject(XML_TYPE, type);
-			if (object == nullptr)
-			{
-				MYGUI_LOG(Error, "resource type '" << type << "' not found");
-				continue;
-			}
-
-			IResourcePtr resource = object->castType<IResource>();
-			resource->deserialization(root.current(), _version);
-
-			if (!guid.empty()) mResourcesID[guid] = resource;
-			if (!name.empty()) mResources[name] = resource;
-		}
-
-		if (!vector_guid.empty())
-		{
-			mListFileGuid[_file] = vector_guid;
-		}
-
-	}
-
-	std::string ResourceManager::getFileNameByID(const Guid& _id)
-	{
-		for (MapVectorString::iterator item=mListFileGuid.begin(); item!=mListFileGuid.end(); ++item)
-		{
-			for (VectorGuid::iterator item2=item->second.begin(); item2!=item->second.end(); ++item2)
-			{
-				if (*item2 == _id)
-				{
-					return item->first;
-				}
-			}
-		}
-		return "";
-	}
-
-	void ResourceManager::_loadList(xml::ElementPtr _node, const std::string& _file, Version _version)
-	{
-		// берем детей и крутимся, основной цикл
-		xml::ElementEnumerator node = _node->getElementEnumerator();
-		while (node.next(XML_TYPE_LIST))
-		{
-			std::string source;
-			if (!node->findAttribute("file", source)) continue;
-			MYGUI_LOG(Info, "Load ini file '" << source << "'");
-			_loadImplement(source, false, "", INSTANCE_TYPE_NAME);
-		}
-	}
-
-	ResourceManager::LoadXmlDelegate& ResourceManager::registerLoadXmlDelegate(const std::string& _key)
-	{
-		MapLoadXmlDelegate::iterator iter = mMapLoadXmlDelegate.find(_key);
-		MYGUI_ASSERT(iter == mMapLoadXmlDelegate.end(), "name delegate is exist");
-		return (mMapLoadXmlDelegate[_key] = LoadXmlDelegate());
-	}
-
-	void ResourceManager::unregisterLoadXmlDelegate(const std::string& _key)
-	{
-		MapLoadXmlDelegate::iterator iter = mMapLoadXmlDelegate.find(_key);
-		if (iter != mMapLoadXmlDelegate.end()) mMapLoadXmlDelegate.erase(iter);
-	}
-
-	bool ResourceManager::_loadImplement(const std::string& _file, bool _match, const std::string& _type, const std::string& _instance)
-	{
-		IDataStream* data = DataManager::getInstance().getData(_file);
-		if (data == nullptr)
-		{
-			MYGUI_LOG(Error, _instance << " : '" << _file << "', not found");
-			return false;
-		}
-
-		xml::Document doc;
-		if (!doc.open(data))
-		{
-			MYGUI_LOG(Error, _instance << " : '" << _file << "', " << doc.getLastError());
-
-			// FIXME
-			delete data;
-
-			return false;
-		}
-
-		// FIXME
-		delete data;
-
-		xml::ElementPtr root = doc.getRoot();
-		if ( (nullptr == root) || (root->getName() != "MyGUI") )
-		{
-			MYGUI_LOG(Error, _instance << " : '" << _file << "', tag 'MyGUI' not found");
-			return false;
-		}
-
-		std::string type;
-		if (root->findAttribute("type", type))
-		{
-			Version version = Version::parse(root->findAttribute("version"));
-			MapLoadXmlDelegate::iterator iter = mMapLoadXmlDelegate.find(type);
-			if (iter != mMapLoadXmlDelegate.end())
-			{
-				if ((!_match) || (type == _type)) (*iter).second(root, _file, version);
-				else
-				{
-					MYGUI_LOG(Error, _instance << " : '" << _file << "', type '" << _type << "' not found");
-					return false;
-				}
-			}
-			else
-			{
-				MYGUI_LOG(Error, _instance << " : '" << _file << "', delegate for type '" << type << "'not found");
-				return false;
-			}
-		}
-		// предпологаем что будут вложенные
-		else if (!_match)
-		{
-			xml::ElementEnumerator node = root->getElementEnumerator();
-			while (node.next("MyGUI"))
-			{
-				if (node->findAttribute("type", type))
-				{
-					Version version = Version::parse(root->findAttribute("version"));
-					MapLoadXmlDelegate::iterator iter = mMapLoadXmlDelegate.find(type);
-					if (iter != mMapLoadXmlDelegate.end())
-					{
-						(*iter).second(node.current(), _file, version);
-					}
-					else
-					{
-						MYGUI_LOG(Error, _instance << " : '" << _file << "', delegate for type '" << type << "'not found");
-					}
-				}
-				else
-				{
-					MYGUI_LOG(Error, _instance << " : '" << _file << "', tag 'type' not found");
-				}
-			}
-		}
-
-		return true;
-	}
-
-	IResourcePtr ResourceManager::getByID(const Guid& _id, bool _throw)
-	{
-		MapResourceID::iterator iter = mResourcesID.find(_id);
-		if (iter == mResourcesID.end())
-		{
-			if (_throw) MYGUI_EXCEPT("resource '" << _id.print() << "' not found");
-			MYGUI_LOG(Warning, "resource '" << _id.print() << "' not found");
-			return nullptr;
-		}
-		return iter->second;
-	}
-
-	void ResourceManager::addResource(IResourcePtr _item)
-	{
-		if (!_item->getResourceName().empty())
-			mResources[_item->getResourceName()] = _item;
-		if (!_item->getResourceID().empty())
-			mResourcesID[_item->getResourceID()] = _item;
-	}
-
-	void ResourceManager::removeResource(IResourcePtr _item)
-	{
-		if (_item == nullptr) return;
-
-		if (!_item->getResourceName().empty())
-		{
-			MapResource::iterator item = mResources.find(_item->getResourceName());
-			if (item != mResources.end())
-				mResources.erase(item);
-		}
-
-		if (!_item->getResourceID().empty())
-		{
-			MapResourceID::iterator id = mResourcesID.find(_item->getResourceID());
-			if (id != mResourcesID.end())
-				mResourcesID.erase(id);
-		}
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceManualFont.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceManualFont.cpp
deleted file mode 100644
index d88637c09a..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceManualFont.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ResourceManualFont.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_TextureUtility.h"
-
-namespace MyGUI
-{
-
-	ResourceManualFont::ResourceManualFont() :
-		mDefaultHeight(0),
-		mTexture(nullptr)
-	{
-	}
-
-	ResourceManualFont::~ResourceManualFont()
-	{
-	}
-
-	GlyphInfo * ResourceManualFont::getGlyphInfo(Char _id)
-	{
-		for (VectorRangeInfo::iterator iter=mVectorRangeInfo.begin(); iter!=mVectorRangeInfo.end(); ++iter)
-		{
-			GlyphInfo * info = iter->getInfo(_id);
-			if (info == nullptr) continue;
-			return info;
-		}
-		// ��� ������� ���������� ������
-		return &mSpaceGlyphInfo;
-	}
-
-	void ResourceManualFont::checkTexture()
-	{
-		if (mTexture == nullptr)
-		{
-			RenderManager& render = RenderManager::getInstance();
-			mTexture = render.getTexture(mSource);
-			if (mTexture == nullptr)
-			{
-				mTexture = render.createTexture(mSource);
-				mTexture->loadFromFile(mSource);
-			}
-		}
-	}
-
-	void ResourceManualFont::addGlyph(GlyphInfo * _info, Char _index, int _left, int _top, int _right, int _bottom, int _finalw, int _finalh, float _aspect, int _addHeight)
-	{
-		_info->codePoint = _index;
-		_info->uvRect.left = (float)_left / (float)_finalw;  // u1
-		_info->uvRect.top = (float)(_top + _addHeight) / (float)_finalh;  // v1
-		_info->uvRect.right = (float)( _right ) / (float)_finalw; // u2
-		_info->uvRect.bottom = ( _bottom + _addHeight ) / (float)_finalh; // v2
-		_info->width = _right - _left;
-	}
-
-	void ResourceManualFont::addGlyph(Char _code, const IntCoord& _coord)
-	{
-		mVectorPairCodeCoord.push_back(PairCodeCoord(_code, _coord));
-	}
-
-	void ResourceManualFont::initialise()
-	{
-		if (mVectorPairCodeCoord.empty()) return;
-
-		std::sort(mVectorPairCodeCoord.begin(), mVectorPairCodeCoord.end());
-
-		const IntSize& size = texture_utility::getTextureSize(mSource);
-		float aspect = (float)size.width / (float)size.height;
-
-		Char code = mVectorPairCodeCoord.front().code;
-		size_t count = mVectorPairCodeCoord.size();
-		size_t first = 0;
-
-		for (size_t pos=1; pos<count; ++pos)
-		{
-			// �������� ���������
-			if (code + 1 != mVectorPairCodeCoord[pos].code)
-			{
-				addRange(mVectorPairCodeCoord, first, pos-1, size.width, size.height, aspect);
-				code = mVectorPairCodeCoord[pos].code;
-				first = pos;
-			}
-			else
-			{
-				code ++;
-			}
-		}
-
-		addRange(mVectorPairCodeCoord, first, count-1, size.width, size.height, aspect);
-
-		// ���������� �����
-		VectorPairCodeCoord tmp;
-		std::swap(tmp, mVectorPairCodeCoord);
-
-		checkTexture();
-	}
-
-	void ResourceManualFont::addRange(VectorPairCodeCoord& _info, size_t _first, size_t _last, int _width, int _height, float _aspect)
-	{
-		RangeInfo range = RangeInfo(_info[_first].code, _info[_last].code);
-
-		for (size_t pos=_first; pos<=_last; ++pos)
-		{
-			GlyphInfo * info = range.getInfo(_info[pos].code);
-			const IntCoord& coord = _info[pos].coord;
-			addGlyph(info, _info[pos].code, coord.left, coord.top, coord.right(), coord.bottom(), _width, _height, _aspect);
-
-			if (_info[pos].code == FontCodeType::Space)
-				mSpaceGlyphInfo = *info;
-		}
-
-		mVectorRangeInfo.push_back(range);
-	}
-
-	void ResourceManualFont::deserialization(xml::ElementPtr _node, Version _version)
-	{
-		Base::deserialization(_node, _version);
-
-		xml::ElementEnumerator node = _node->getElementEnumerator();
-		while (node.next())
-		{
-			if (node->getName() == "Property")
-			{
-				const std::string& key = node->findAttribute("key");
-				const std::string& value = node->findAttribute("value");
-				if (key == "Source") mSource = value;
-				else if (key == "DefaultHeight") mDefaultHeight = utility::parseInt(value);
-			}
-			else if (node->getName() == "Codes")
-			{
-				xml::ElementEnumerator range = node->getElementEnumerator();
-				while (range.next("Code"))
-				{
-					std::string range_value;
-					std::vector<std::string> parse_range;
-					// ������� ������
-					if (range->findAttribute("index", range_value))
-					{
-						Char id = 0;
-						if (range_value == "cursor")
-							id = FontCodeType::Cursor;
-						else if (range_value == "selected")
-							id = FontCodeType::Selected;
-						else if (range_value == "selected_back")
-							id = FontCodeType::SelectedBack;
-						else
-							id = utility::parseUInt(range_value);
-
-						addGlyph(id, utility::parseValue<IntCoord>(range->findAttribute("coord")));
-					}
-				}
-			}
-		}
-
-		// ��������������
-		initialise();
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceManualPointer.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceManualPointer.cpp
deleted file mode 100644
index f784517df6..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceManualPointer.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ResourceManualPointer.h"
-#include "MyGUI_StaticImage.h"
-#include "MyGUI_CoordConverter.h"
-#include "MyGUI_TextureUtility.h"
-
-namespace MyGUI
-{
-
-	void ResourceManualPointer::deserialization(xml::ElementPtr _node, Version _version)
-	{
-		Base::deserialization(_node, _version);
-
-		IntCoord coord;
-
-		// ����� ����� � ��������, �������� ����
-		xml::ElementEnumerator info = _node->getElementEnumerator();
-		while (info.next("Property"))
-		{
-			const std::string& key = info->findAttribute("key");
-			const std::string& value = info->findAttribute("value");
-
-			if (key == "Point") mPoint = IntPoint::parse(value);
-			else if (key == "Size") mSize = IntSize::parse(value);
-			else if (key == "Texture") mTexture = value;
-			else if (key == "Coord") coord = IntCoord::parse(value);
-		}
-
-		mOffset = CoordConverter::convertTextureCoord(
-			coord,
-			texture_utility::getTextureSize(mTexture));
-	}
-
-	void ResourceManualPointer::setImage(StaticImage* _image)
-	{
-		_image->deleteAllItems();
-		_image->_setTextureName(mTexture);
-		_image->_setUVSet(mOffset);
-	}
-
-	void ResourceManualPointer::setPosition(StaticImage* _image, const IntPoint& _point)
-	{
-		_image->setCoord(_point.left - mPoint.left, _point.top - mPoint.top, mSize.width, mSize.height);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceSkin.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceSkin.cpp
deleted file mode 100644
index 61ad6fdd12..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceSkin.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		26/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_FactoryManager.h"
-#include "MyGUI_LanguageManager.h"
-
-namespace MyGUI
-{
-
-	ResourceSkin::ResourceSkin()
-	{
-	}
-
-	void ResourceSkin::deserialization(xml::ElementPtr _node, Version _version)
-	{
-		Base::deserialization(_node, _version);
-
-		// ������ �������� �����
-		std::string name, texture, tmp;
-		IntSize size;
-		_node->findAttribute("name", name);
-		_node->findAttribute("texture", texture);
-		if (_node->findAttribute("size", tmp)) size = IntSize::parse(tmp);
-
-		LanguageManager& localizator = LanguageManager::getInstance();
-
-		// ��������������� ����� ��� �������� ���������
-		SubWidgetBinding bind;
-
-		// ��������� ������ ����� � ������
-		if (_version >= Version(1, 1))
-		{
-			texture = localizator.replaceTags(texture);
-		}
-
-		setInfo(size, texture);
-
-		// ��������� �����
-		if (_node->findAttribute("mask", tmp))
-		{
-			if (!loadMask(tmp))
-			{
-				MYGUI_LOG(Error, "Skin: mask not load '" << tmp << "'");
-			}
-		}
-
-		// ����� ����� � ��������, ���� � ��� �������
-		xml::ElementEnumerator basis = _node->getElementEnumerator();
-		while (basis.next())
-		{
-			if (basis->getName() == "Property")
-			{
-				// ��������� ��������
-				std::string key, value;
-				if (!basis->findAttribute("key", key)) continue;
-				if (!basis->findAttribute("value", value)) continue;
-
-				// ��������� ������ ����� � ������
-				if (_version >= Version(1, 1))
-				{
-					value = localizator.replaceTags(value);
-				}
-
-				// ��������� ��������
-				addProperty(key, value);
-			}
-			else if (basis->getName() == "Child")
-			{
-				ChildSkinInfo child(
-					basis->findAttribute("type"),
-					WidgetStyle::parse(basis->findAttribute("style")),
-					basis->findAttribute("skin"),
-					IntCoord::parse(basis->findAttribute("offset")),
-					Align::parse(basis->findAttribute("align")),
-					basis->findAttribute("layer"),
-					basis->findAttribute("name")
-					);
-
-				xml::ElementEnumerator child_params = basis->getElementEnumerator();
-				while (child_params.next("Property"))
-					child.addParam(child_params->findAttribute("key"), child_params->findAttribute("value"));
-
-				addChild(child);
-				//continue;
-			}
-			else if (basis->getName() == "BasisSkin")
-			{
-				// ������ ��������
-				std::string basisSkinType, tmp_str;
-				IntCoord offset;
-				Align align = Align::Default;
-				basis->findAttribute("type", basisSkinType);
-				if (basis->findAttribute("offset", tmp_str)) offset = IntCoord::parse(tmp_str);
-				if (basis->findAttribute("align", tmp_str)) align = Align::parse(tmp_str);
-
-				bind.create(offset, align, basisSkinType);
-
-				// ����� ����� � ��������, ���� �� ��������
-				xml::ElementEnumerator state = basis->getElementEnumerator();
-
-				// ��������� �� ����� ������ �������
-				bool new_format = false;
-				// ���� ������ ������ 1.0 �� ��������������� ������
-				if (_version < Version(1, 0))
-				{
-					while (state.next())
-					{
-						if (state->getName() == "State")
-						{
-							const std::string& name_state = state->findAttribute("name");
-							if ((name_state == "normal_checked") || (state->findAttribute("name") == "normal_check"))
-							{
-								new_format = true;
-								break;
-							}
-						}
-					}
-					// ���������
-					state = basis->getElementEnumerator();
-				}
-
-				while (state.next())
-				{
-					if (state->getName() == "State")
-					{
-						// ������ �������� ������
-						std::string basisStateName;
-						state->findAttribute("name", basisStateName);
-
-						// ���� ������ ������ 1.0 �� ��������������� ������
-						if (_version < Version(1, 0))
-						{
-							// ��� ������� ����� �����
-							if (basisStateName == "disable_check") basisStateName = "disabled_checked";
-							else if (basisStateName == "normal_check") basisStateName = "normal_checked";
-							else if (basisStateName == "active_check") basisStateName = "highlighted_checked";
-							else if (basisStateName == "pressed_check") basisStateName = "pushed_checked";
-							else if (basisStateName == "disable") basisStateName = "disabled";
-							else if (basisStateName == "active") basisStateName = "highlighted";
-							else if (basisStateName == "select") basisStateName = "pushed";
-							else if (basisStateName == "pressed")
-							{
-								if (new_format) basisStateName = "pushed";
-								else basisStateName = "normal_checked";
-							}
-						}
-
-						// ������������ ���� � ������
-						IStateInfo* data = nullptr;
-						IObject* object = FactoryManager::getInstance().createObject("BasisSkin/State", basisSkinType);
-						if (object != nullptr)
-						{
-							data = object->castType<IStateInfo>();
-							data->deserialization(state.current(), _version);
-						}
-
-						// ��������� ���� � ������
-						bind.add(basisStateName, data, name);
-					}
-				}
-
-				// ������ �� ������ ��������� � ����
-				addInfo(bind);
-			}
-
-		}
-	}
-
-	void ResourceSkin::setInfo(const IntSize& _size, const std::string &_texture)
-	{
-		mSize = _size;
-		mTexture = _texture;
-	}
-
-	void ResourceSkin::addInfo(const SubWidgetBinding& _bind)
-	{
-		checkState(_bind.mStates);
-		mBasis.push_back(SubWidgetInfo(_bind.mType, _bind.mOffset, _bind.mAlign));
-		checkBasis();
-		fillState(_bind.mStates, mBasis.size()-1);
-	}
-
-	void ResourceSkin::addProperty(const std::string &_key, const std::string &_value)
-	{
-		mProperties[_key] = _value;
-	}
-
-	void ResourceSkin::addChild(const ChildSkinInfo& _child)
-	{
-		mChilds.push_back(_child);
-	}
-
-	bool ResourceSkin::loadMask(const std::string& _file)
-	{
-		return mMaskPeek.load(_file);
-	}
-
-	void ResourceSkin::clear()
-	{
-		for (MapWidgetStateInfo::iterator iter = mStates.begin(); iter!=mStates.end(); ++iter)
-		{
-			for (VectorStateInfo::iterator iter2=iter->second.begin(); iter2!=iter->second.end(); ++iter2)
-			{
-				delete *iter2;
-			}
-		}
-	}
-
-	void ResourceSkin::checkState(const MapStateInfo& _states)
-	{
-		for (MapStateInfo::const_iterator iter = _states.begin(); iter != _states.end(); ++iter)
-		{
-			checkState(iter->first);
-		}
-	}
-
-	void ResourceSkin::checkState(const std::string& _name)
-	{
-		// ���� ����� �� ����
-		MapWidgetStateInfo::const_iterator iter = mStates.find(_name);
-		if (iter == mStates.end())
-		{
-			// ��������� ����� �����
-			mStates[_name] = VectorStateInfo();
-		}
-	}
-
-	void ResourceSkin::checkBasis()
-	{
-		// � ����������� ������ �������� �� ����������� �����������
-		for (MapWidgetStateInfo::iterator iter = mStates.begin(); iter!=mStates.end(); ++iter)
-		{
-			iter->second.resize(mBasis.size());
-		}
-	}
-
-	void ResourceSkin::fillState(const MapStateInfo& _states, size_t _index)
-	{
-		for (MapStateInfo::const_iterator iter = _states.begin(); iter != _states.end(); ++iter)
-		{
-			mStates[iter->first][_index] = iter->second;
-		}
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceTrueTypeFont.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceTrueTypeFont.cpp
deleted file mode 100644
index 82843b442a..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ResourceTrueTypeFont.cpp
+++ /dev/null
@@ -1,490 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ResourceTrueTypeFont.h"
-#include "MyGUI_DataManager.h"
-#include "MyGUI_RenderManager.h"
-
-#ifdef MYGUI_USE_FREETYPE
-	#include <ft2build.h>
-	#include FT_FREETYPE_H
-	#include FT_GLYPH_H
-#endif // MYGUI_USE_FREETYPE
-
-namespace MyGUI
-{
-
-	const unsigned char FONT_MASK_SELECT = 0x88;
-	const unsigned char FONT_MASK_SELECT_DEACTIVE = 0x60;
-	const unsigned char FONT_MASK_SPACE = 0x00;
-	const unsigned char FONT_MASK_CHAR = 0xFF;
-	const size_t MIN_FONT_TEXTURE_WIDTH = 256;
-
-	ResourceTrueTypeFont::ResourceTrueTypeFont() :
-		mTtfSize(0),
-		mTtfResolution(0),
-		mAntialiasColour(false),
-		mDistance(0),
-		mSpaceWidth(0),
-		mTabWidth(0),
-		mCursorWidth(2),
-		mSelectionWidth(2),
-		mOffsetHeight(0),
-		mHeightPix(0),
-		mTexture(nullptr)
-	{
-	}
-
-	ResourceTrueTypeFont::~ResourceTrueTypeFont()
-	{
-		if (mTexture != nullptr)
-		{
-			RenderManager::getInstance().destroyTexture(mTexture);
-			mTexture = nullptr;
-		}
-	}
-
-	GlyphInfo* ResourceTrueTypeFont::getGlyphInfo(Char _id)
-	{
-		for (VectorRangeInfo::iterator iter=mVectorRangeInfo.begin(); iter!=mVectorRangeInfo.end(); ++iter)
-		{
-			GlyphInfo* info = iter->getInfo(_id);
-			if (info == nullptr) continue;
-			return info;
-		}
-		// при ошибках возвращаем пробел
-		return &mSpaceGlyphInfo;
-	}
-
-	void ResourceTrueTypeFont::addGlyph(GlyphInfo * _info, Char _index, int _left, int _top, int _right, int _bottom, int _finalw, int _finalh, float _aspect, int _addHeight)
-	{
-		_info->codePoint = _index;
-		_info->uvRect.left = (float)_left / (float)_finalw;  // u1
-		_info->uvRect.top = (float)(_top + _addHeight) / (float)_finalh;  // v1
-		_info->uvRect.right = (float)( _right ) / (float)_finalw; // u2
-		_info->uvRect.bottom = ( _bottom + _addHeight ) / (float)_finalh; // v2
-		_info->width = _right - _left;
-	}
-
-	uint8* ResourceTrueTypeFont::writeData(uint8* _pDest, unsigned char _luminance, unsigned char _alpha, bool _rgba)
-	{
-		if (_rgba)
-		{
-			*_pDest++ = _luminance; // luminance
-			*_pDest++ = _luminance; // luminance
-			*_pDest++ = _luminance; // luminance
-			*_pDest++ = _alpha; // alpha
-		}
-		else
-		{
-			*_pDest++ = _luminance; // luminance
-			*_pDest++ = _alpha; // alpha
-		}
-		return _pDest;
-	}
-
-	void ResourceTrueTypeFont::initialise()
-	{
-
-#ifndef MYGUI_USE_FREETYPE
-
-		MYGUI_LOG(Error, "ResourceTrueTypeFont '" << getResourceName() << "' - Ttf font disabled. Define MYGUI_USE_FREETYE if you need ttf fonts.");
-
-#else // MYGUI_USE_FREETYPE
-
-		mTexture = RenderManager::getInstance().createTexture(MyGUI::utility::toString((size_t)this, "_TrueTypeFont"));
-
-		// ManualResourceLoader implementation - load the texture
-		FT_Library ftLibrary;
-		// Init freetype
-		if ( FT_Init_FreeType( &ftLibrary ) ) MYGUI_EXCEPT("Could not init FreeType library!");
-
-		// Load font
-		FT_Face face;
-
-		//FIXME научить работать без шрифтов
-		IDataStream* datastream = DataManager::getInstance().getData(mSource);
-		MYGUI_ASSERT(datastream, "Could not open font face!");
-
-		size_t datasize = datastream->size();
-		uint8* data = new uint8[datasize];
-		datastream->read(data, datasize);
-		delete datastream;
-
-		if ( FT_New_Memory_Face( ftLibrary, data, (FT_Long)datasize, 0, &face ) )
-			MYGUI_EXCEPT("Could not open font face!");
-
-		// Convert our point size to freetype 26.6 fixed point format
-		FT_F26Dot6 ftSize = (FT_F26Dot6)(mTtfSize * (1 << 6));
-		if ( FT_Set_Char_Size( face, ftSize, 0, mTtfResolution, mTtfResolution ) )
-			MYGUI_EXCEPT("Could not set char size!");
-
-		int max_height = 0, max_bear = 0;
-
-		int spec_len = mCursorWidth + mSelectionWidth + mSelectionWidth + mSpaceWidth + mTabWidth + (mDistance * 5);
-		int len = mDistance + spec_len;
-		int height = 0; // здесь используется как колличество строк
-
-		size_t finalWidth = MIN_FONT_TEXTURE_WIDTH;
-		// trying to guess necessary width for texture
-		while (mTtfSize*mTtfResolution > finalWidth*6) finalWidth *= 2;
-
-		for (VectorRangeInfo::iterator iter=mVectorRangeInfo.begin(); iter!=mVectorRangeInfo.end(); ++iter)
-		{
-			for (Char index=iter->first; index<=iter->last; ++index)
-			{
-
-				// символ рисовать ненужно
-				if (checkHidePointCode(index)) continue;
-
-				if (FT_Load_Char( face, index, FT_LOAD_RENDER )) continue;
-				if (nullptr == face->glyph->bitmap.buffer) continue;
-				FT_Int advance = (face->glyph->advance.x >> 6 ) + ( face->glyph->metrics.horiBearingX >> 6 );
-
-				if ( ( 2 * ( face->glyph->bitmap.rows << 6 ) - face->glyph->metrics.horiBearingY ) > max_height )
-					max_height = ( 2 * ( face->glyph->bitmap.rows << 6 ) - face->glyph->metrics.horiBearingY );
-
-				if ( face->glyph->metrics.horiBearingY > max_bear )
-					max_bear = face->glyph->metrics.horiBearingY;
-
-				len += (advance + mDistance);
-				if ( int(finalWidth - 1) < (len + advance + mDistance) ) { height ++; len = mDistance;}
-
-			}
-		}
-
-		max_height >>= 6;
-		max_bear >>= 6;
-
-		size_t finalHeight = (height+1) * (max_height + mDistance) + mDistance;
-
-		//make it more squared
-		while (finalHeight > finalWidth)
-		{
-			finalHeight /= 2;
-			finalWidth *= 2;
-		}
-
-		// вычисляем ближайшую кратную 2
-		size_t needHeight = 1;
-		while (needHeight < finalHeight) needHeight <<= 1;
-		finalHeight = needHeight;
-
-		float textureAspect = (float)finalWidth / (float)finalHeight;
-
-		// if L8A8 (2 bytes per pixel) not supported use 4 bytes per pixel R8G8B8A8
-		// where R == G == B == L
-		bool rgbaMode = ! MyGUI::RenderManager::getInstance().isFormatSupported(PixelFormat::L8A8, TextureUsage::Static | TextureUsage::Write);
-
-		const size_t pixel_bytes = rgbaMode ? 4 : 2;
-		size_t data_width = finalWidth * pixel_bytes;
-		size_t data_size = finalWidth * finalHeight * pixel_bytes;
-
-		MYGUI_LOG(Info, "ResourceTrueTypeFont '" << getResourceName() << "' using texture size " << finalWidth << " x " << finalHeight);
-		MYGUI_LOG(Info, "ResourceTrueTypeFont '" << getResourceName() << "' using real height " << max_height << " pixels");
-		mHeightPix = max_height;
-
-		uint8* imageData = new uint8[data_size];
-
-		uint8* dest = imageData;
-		// Reset content (White, transparent)
-		for (size_t i = 0; i < data_size; i += pixel_bytes)
-		{
-			dest = writeData(dest, 0xFF, 0x00, rgbaMode);
-		}
-
-		// текущее положение в текстуре
-		len = mDistance;
-		height = mDistance; // здесь используется как текущее положение высоты
-		FT_Int advance = 0;
-
-		//------------------------------------------------------------------
-		// создаем символ пробела
-		//------------------------------------------------------------------
-		advance = mSpaceWidth;
-
-		// перевод на новую строку
-		if ( int(finalWidth - 1) < (len + advance + mDistance) ) { height += max_height + mDistance; len = mDistance; }
-
-		for (int j = 0; j < max_height; j++ )
-		{
-			int row = j + (int)height;
-			uint8* pDest = &imageData[(row * data_width) + len * pixel_bytes];
-			for (int k = 0; k < advance; k++ )
-			{
-				pDest = writeData(pDest, FONT_MASK_CHAR, FONT_MASK_SPACE, rgbaMode);
-			}
-		}
-
-		addGlyph(&mSpaceGlyphInfo, FontCodeType::Space, len, height, len + advance, height + max_height, finalWidth, finalHeight, textureAspect, mOffsetHeight);
-		len += (advance + mDistance);
-
-		//------------------------------------------------------------------
-		// создаем табуляцию
-		//------------------------------------------------------------------
-		advance = mTabWidth;
-
-		// перевод на новую строку
-		if ( int(finalWidth - 1) < (len + advance + mDistance) ) { height += max_height + mDistance; len = mDistance; }
-
-		for (int j = 0; j < max_height; j++ )
-		{
-			int row = j + (int)height;
-			uint8* pDest = &imageData[(row * data_width) + len * pixel_bytes];
-			for (int k = 0; k < advance; k++ )
-			{
-				pDest = writeData(pDest, FONT_MASK_CHAR, FONT_MASK_SPACE, rgbaMode);
-			}
-		}
-
-		addGlyph(&mTabGlyphInfo, FontCodeType::Tab, len, height, len + advance, height + max_height, finalWidth, finalHeight, textureAspect, mOffsetHeight);
-		len += (advance + mDistance);
-
-		//------------------------------------------------------------------
-		// создаем выделение
-		//------------------------------------------------------------------
-		advance = mSelectionWidth;
-		for (int j = 0; j < max_height; j++ )
-		{
-			int row = j + (int)height;
-			uint8* pDest = &imageData[(row * data_width) + len * pixel_bytes];
-			for (int k = 0; k < advance; k++ )
-			{
-				pDest = writeData(pDest, FONT_MASK_CHAR, FONT_MASK_SELECT, rgbaMode);
-			}
-		}
-
-		// перевод на новую строку
-		if ( int(finalWidth - 1) < (len + advance + mDistance) ) { height += max_height + mDistance; len = mDistance; }
-
-		addGlyph(&mSelectGlyphInfo, FontCodeType::Selected, len, height, len + advance, height + max_height, finalWidth, finalHeight, textureAspect, mOffsetHeight);
-		len += (advance + mDistance);
-
-		//------------------------------------------------------------------
-		// создаем неактивное выделение
-		//------------------------------------------------------------------
-		advance = mSelectionWidth;
-
-		// перевод на новую строку
-		if ( int(finalWidth - 1) < (len + advance + mDistance) ) { height += max_height + mDistance; len = mDistance; }
-
-		for (int j = 0; j < max_height; j++ )
-		{
-			int row = j + (int)height;
-			uint8* pDest = &imageData[(row * data_width) + len * pixel_bytes];
-			for (int k = 0; k < advance; k++ )
-			{
-				pDest = writeData(pDest, FONT_MASK_CHAR, FONT_MASK_SELECT_DEACTIVE, rgbaMode);
-			}
-		}
-
-		addGlyph(&mSelectDeactiveGlyphInfo, FontCodeType::SelectedBack, len, height, len + advance, height + max_height, finalWidth, finalHeight, textureAspect, mOffsetHeight);
-		len += (advance + mDistance);
-
-		//------------------------------------------------------------------
-		// создаем курсор
-		//------------------------------------------------------------------
-		advance = mCursorWidth;
-
-		// перевод на новую строку
-		if ( int(finalWidth - 1) < (len + advance + mDistance) ) { height += max_height + mDistance; len = mDistance; }
-
-		for (int j = 0; j < max_height; j++ )
-		{
-			int row = j + (int)height;
-			uint8* pDest = &imageData[(row * data_width) + len * pixel_bytes];
-			for (int k = 0; k < advance; k++ )
-			{
-				pDest = writeData(pDest, (k&1) ? 0 : 0xFF, FONT_MASK_CHAR, rgbaMode);
-			}
-		}
-
-		addGlyph(&mCursorGlyphInfo, FontCodeType::Cursor, len, height, len + advance, height + max_height, finalWidth, finalHeight, textureAspect, mOffsetHeight);
-		len += (advance + mDistance);
-
-		//------------------------------------------------------------------
-		// создаем все остальные символы
-		//------------------------------------------------------------------
-		FT_Error ftResult;
-		for (VectorRangeInfo::iterator iter=mVectorRangeInfo.begin(); iter!=mVectorRangeInfo.end(); ++iter)
-		{
-			size_t pos = 0;
-			for (Char index=iter->first; index<=iter->last; ++index, ++pos)
-			{
-				// сомвол рисовать не нада
-				if (checkHidePointCode(index)) continue;
-
-				GlyphInfo& info = iter->range.at(pos);
-
-				ftResult = FT_Load_Char( face, index, FT_LOAD_RENDER );
-				if (ftResult)
-				{
-					// problem loading this glyph, continue
-					MYGUI_LOG(Warning, "cannot load character " << index << " in font " << getResourceName());
-					continue;
-				}
-
-				FT_Int glyph_advance = (face->glyph->advance.x >> 6 );
-				unsigned char* buffer = face->glyph->bitmap.buffer;
-
-				if (nullptr == buffer)
-				{
-					// Yuck, FT didn't detect this but generated a nullptr pointer!
-					MYGUI_LOG(Warning, "Freetype returned nullptr for character " << index << " in font " << getResourceName());
-					continue;
-				}
-
-				int y_bearnig = max_bear - ( face->glyph->metrics.horiBearingY >> 6 );
-
-				// перевод на новую строку
-				if ( int(finalWidth - 1) < (len + face->glyph->bitmap.width + mDistance) ) { height += max_height + mDistance; len = mDistance; }
-
-				for (int j = 0; j < face->glyph->bitmap.rows; j++ )
-				{
-					int row = j + (int)height + y_bearnig;
-					uint8* pDest = &imageData[(row * data_width) + (len + ( face->glyph->metrics.horiBearingX >> 6 )) * pixel_bytes];
-					for (int k = 0; k < face->glyph->bitmap.width; k++ )
-					{
-						if (mAntialiasColour) pDest = writeData(pDest, *buffer, *buffer, rgbaMode);
-						else pDest = writeData(pDest, FONT_MASK_CHAR, *buffer, rgbaMode);
-						buffer++;
-					}
-				}
-
-				addGlyph(&info, index, len, height, len + glyph_advance, height + max_height, finalWidth, finalHeight, textureAspect, mOffsetHeight);
-				len += (glyph_advance + mDistance);
-
-			}
-		}
-
-		// Добавляем спец символы в основной список
-		// пробел можно не добавлять, его вернет по ошибке
-		RangeInfo info(FontCodeType::Selected, FontCodeType::Tab);
-		info.setInfo(FontCodeType::Selected, &mSelectGlyphInfo);
-		info.setInfo(FontCodeType::SelectedBack, &mSelectDeactiveGlyphInfo);
-		info.setInfo(FontCodeType::Cursor, &mCursorGlyphInfo);
-		info.setInfo(FontCodeType::Tab, &mTabGlyphInfo);
-
-		mVectorRangeInfo.push_back(info);
-
-
-		mTexture->createManual(finalWidth, finalHeight, TextureUsage::Static | TextureUsage::Write, rgbaMode ? PixelFormat::R8G8B8A8 : PixelFormat::L8A8);
-
-		void* buffer_ptr = mTexture->lock(TextureUsage::Write);
-		memcpy(buffer_ptr, imageData, data_size);
-		mTexture->unlock();
-
-		delete [] imageData;
-		delete [] data;
-
-		FT_Done_FreeType(ftLibrary);
-
-#endif // MYGUI_USE_FREETYPE
-
-	}
-
-	void ResourceTrueTypeFont::addCodePointRange(Char _first, Char _second)
-	{
-		mVectorRangeInfo.push_back(RangeInfo(_first, _second));
-	}
-
-	void ResourceTrueTypeFont::addHideCodePointRange(Char _first, Char _second)
-	{
-		mVectorHideCodePoint.push_back(PairCodePoint(_first, _second));
-	}
-
-	// проверяет, входит ли символ в зоны ненужных символов
-	bool ResourceTrueTypeFont::checkHidePointCode(Char _id)
-	{
-		for (VectorPairCodePoint::iterator iter=mVectorHideCodePoint.begin(); iter!=mVectorHideCodePoint.end(); ++iter)
-		{
-			if (iter->isExist(_id)) return true;
-		}
-		return false;
-	}
-
-	void ResourceTrueTypeFont::clearCodePointRanges()
-	{
-		mVectorRangeInfo.clear();
-		mVectorHideCodePoint.clear();
-	}
-
-	void ResourceTrueTypeFont::deserialization(xml::ElementPtr _node, Version _version)
-	{
-		Base::deserialization(_node, _version);
-
-		xml::ElementEnumerator node = _node->getElementEnumerator();
-		while (node.next())
-		{
-			if (node->getName() == "Property")
-			{
-				const std::string& key = node->findAttribute("key");
-				const std::string& value = node->findAttribute("value");
-				if (key == "Source") mSource = value;
-				else if (key == "Size") mTtfSize = utility::parseFloat(value);
-				else if (key == "Resolution") mTtfResolution = utility::parseUInt(value);
-				else if (key == "Antialias") mAntialiasColour = utility::parseBool(value);
-				else if (key == "SpaceWidth") mSpaceWidth = utility::parseInt(value);
-				else if (key == "TabWidth") mTabWidth = utility::parseInt(value);
-				//else if (key == "CursorWidth") mCursorWidth = utility::parseInt(value);
-				else if (key == "Distance") mDistance = utility::parseInt(value);
-				else if (key == "OffsetHeight") mOffsetHeight = utility::parseInt(value);
-			}
-			else if (node->getName() == "Codes")
-			{
-				xml::ElementEnumerator range = node->getElementEnumerator();
-				while (range.next("Code"))
-				{
-					std::string range_value;
-					std::vector<std::string> parse_range;
-					// диапазон включений
-					if (range->findAttribute("range", range_value))
-					{
-						parse_range = utility::split(range_value);
-						if (!parse_range.empty())
-						{
-							int first = utility::parseInt(parse_range[0]);
-							int last = parse_range.size() > 1 ? utility::parseInt(parse_range[1]) : first;
-							addCodePointRange(first, last);
-						}
-					}
-					// диапазон исключений
-					else if (range->findAttribute("hide", range_value))
-					{
-						parse_range = utility::split(range_value);
-						if (!parse_range.empty())
-						{
-							int first = utility::parseInt(parse_range[0]);
-							int last = parse_range.size() > 1 ? utility::parseInt(parse_range[1]) : first;
-							addHideCodePointRange(first, last);
-						}
-					}
-				}
-			}
-		}
-
-		// инициализируем
-		initialise();
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RotatingSkin.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RotatingSkin.cpp
deleted file mode 100644
index 4f3eb2058a..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_RotatingSkin.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*!
-	@file
-	@author		George Evmenov
-	@date		05/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_RotatingSkin.h"
-#include "MyGUI_RenderItem.h"
-#include "MyGUI_CommonStateInfo.h"
-
-namespace MyGUI
-{
-
-	RotatingSkin::RotatingSkin() :
-		SubSkin(),
-		mAngle(0.0f),
-		mLocalCenter(false)
-	{
-		for (int i = 0; i<4; ++i)
-		{
-			mBaseAngles[i] = 0.0f;
-			mBaseDistances[i] = 0.0f;
-		}
-	}
-
-	RotatingSkin::~RotatingSkin()
-	{
-	}
-
-	void RotatingSkin::setAngle(float _angle)
-	{
-		mAngle = _angle;
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void RotatingSkin::setCenter(const IntPoint &_center, bool _local)
-	{
-		mCenterPos = _center;
-		mLocalCenter = _local;
-		recalculateAngles();
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	IntPoint RotatingSkin::getCenter(bool _local) const
-	{
-		return mCenterPos + (_local ? IntPoint() : mCroppedParent->getAbsolutePosition());
-	}
-
-	void RotatingSkin::doRender()
-	{
-		if ((!mVisible) || mEmptyView) return;
-
-		VertexQuad* quad = (VertexQuad*)mRenderItem->getCurrentVertextBuffer();
-
-		const RenderTargetInfo& info = mRenderItem->getRenderTarget()->getInfo();
-
-		float vertex_z = info.maximumDepth;
-
-		float vertex_left_base = ((info.pixScaleX * (float)(mCurrentCoord.left + mCroppedParent->getAbsoluteLeft() + mCenterPos.left) + info.hOffset) * 2) - 1;
-		float vertex_top_base = -(((info.pixScaleY * (float)(mCurrentCoord.top + mCroppedParent->getAbsoluteTop() + mCenterPos.top) + info.vOffset) * 2) - 1);
-
-		// FIXME: do it only when size changes
-		recalculateAngles();
-
-		quad->set(
-			vertex_left_base + cos(-mAngle + mBaseAngles[0]) * mBaseDistances[0] * info.pixScaleX * -2,
-			vertex_top_base + sin(-mAngle + mBaseAngles[0]) * mBaseDistances[0] * info.pixScaleY * -2,
-			vertex_left_base + cos(-mAngle + mBaseAngles[3]) * mBaseDistances[3] * info.pixScaleX * -2,
-			vertex_top_base + sin(-mAngle + mBaseAngles[3]) * mBaseDistances[3] * info.pixScaleY * -2,
-			vertex_left_base + cos(-mAngle + mBaseAngles[2]) * mBaseDistances[2] * info.pixScaleX * -2,
-			vertex_top_base + sin(-mAngle + mBaseAngles[2]) * mBaseDistances[2] * info.pixScaleY * -2,
-			vertex_left_base + cos(-mAngle + mBaseAngles[1]) * mBaseDistances[1] * info.pixScaleX * -2,
-			vertex_top_base + sin(-mAngle + mBaseAngles[1]) * mBaseDistances[1] * info.pixScaleY * -2,
-			vertex_z,
-			mCurrentTexture.left,
-			mCurrentTexture.top,
-			mCurrentTexture.right,
-			mCurrentTexture.bottom,
-			mCurrentColour
-			);
-
-		mRenderItem->setLastVertexCount(VertexQuad::VertexCount);
-	}
-
-	inline float len(float x, float y) { return sqrt(x*x + y*y); }
-
-	void RotatingSkin::recalculateAngles()
-	{
-#ifndef M_PI
-		const float M_PI = 3.141593f;
-#endif
-		// FIXME mLocalCenter ignored
-		float left_base = 0;
-		float top_base = 0;
-
-		if (!mLocalCenter)
-		{
-			left_base = (float)mCurrentCoord.width;
-			top_base = (float)mCurrentCoord.height;
-		}
-
-		float width_base = (float)mCurrentCoord.width;
-		float height_base = (float)mCurrentCoord.height;
-
-		mBaseAngles[0] = atan2((float)           - mCenterPos.left,             - mCenterPos.top) + M_PI/2;
-		mBaseAngles[1] = atan2((float)           - mCenterPos.left, height_base - mCenterPos.top) + M_PI/2;
-		mBaseAngles[2] = atan2((float)width_base - mCenterPos.left, height_base - mCenterPos.top) + M_PI/2;
-		mBaseAngles[3] = atan2((float)width_base - mCenterPos.left,             - mCenterPos.top) + M_PI/2;
-
-		mBaseDistances[0] = len((float)           - mCenterPos.left,             - mCenterPos.top);
-		mBaseDistances[1] = len((float)           - mCenterPos.left, height_base - mCenterPos.top);
-		mBaseDistances[2] = len((float)width_base - mCenterPos.left, height_base - mCenterPos.top);
-		mBaseDistances[3] = len((float)width_base - mCenterPos.left,             - mCenterPos.top);
-
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ScrollView.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ScrollView.cpp
deleted file mode 100644
index d6a177c55f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ScrollView.cpp
+++ /dev/null
@@ -1,357 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		08/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ScrollView.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_ISubWidgetText.h"
-#include "MyGUI_VScroll.h"
-#include "MyGUI_HScroll.h"
-
-namespace MyGUI
-{
-
-	const int SCROLL_VIEW_MOUSE_WHEEL = 50; // колличество пикселей для колеса мыши
-	const int SCROLL_VIEW_SCROLL_PAGE = 16; // колличество пикселей для кнопок скрола
-
-	ScrollView::ScrollView() :
-		mIsFocus(false),
-		mIsPressed(false),
-		mScrollClient(nullptr),
-		mContentAlign(Align::Center)
-	{
-		mChangeContentByResize = false;
-		mContentAlign = Align::Center;
-	}
-
-	void ScrollView::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	ScrollView::~ScrollView()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void ScrollView::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void ScrollView::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// нам нужен фокус клавы
-		mNeedKeyFocus = true;
-
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "Client")
-			{
-				MYGUI_DEBUG_ASSERT( ! mScrollClient, "widget already assigned");
-				mScrollClient = (*iter);
-				mScrollClient->eventMouseSetFocus = newDelegate(this, &ScrollView::notifyMouseSetFocus);
-				mScrollClient->eventMouseLostFocus = newDelegate(this, &ScrollView::notifyMouseLostFocus);
-				mScrollClient->eventMouseWheel = newDelegate(this, &ScrollView::notifyMouseWheel);
-				mClient = mScrollClient;
-
-				// создаем холcт, реальный владелец детей
-				mWidgetClient = mScrollClient->createWidget<Widget>("Default", IntCoord(), Align::Default);
-				mWidgetClient->eventMouseWheel = newDelegate(this, &ScrollView::notifyMouseWheel);
-				mWidgetClient->eventMouseSetFocus = newDelegate(this, &ScrollView::notifyMouseSetFocus);
-				mWidgetClient->eventMouseLostFocus = newDelegate(this, &ScrollView::notifyMouseLostFocus);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "VScroll")
-			{
-				MYGUI_DEBUG_ASSERT( ! mVScroll, "widget already assigned");
-				mVScroll = (*iter)->castType<VScroll>();
-				mVScroll->eventScrollChangePosition = newDelegate(this, &ScrollView::notifyScrollChangePosition);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "HScroll")
-			{
-				MYGUI_DEBUG_ASSERT( ! mHScroll, "widget already assigned");
-				mHScroll = (*iter)->castType<HScroll>();
-				mHScroll->eventScrollChangePosition = newDelegate(this, &ScrollView::notifyScrollChangePosition);
-			}
-		}
-
-		//MYGUI_ASSERT(nullptr != mScrollClient, "Child Widget Client not found in skin (ScrollView must have Client)");
-
-		updateView();
-	}
-
-	void ScrollView::shutdownWidgetSkin()
-	{
-		mWidgetClient = nullptr;
-		mVScroll = nullptr;
-		mHScroll = nullptr;
-		mScrollClient = nullptr;
-	}
-
-	void ScrollView::notifyMouseSetFocus(Widget* _sender, Widget* _old)
-	{
-		if ((_old == mScrollClient) || (mIsFocus))
-			return;
-
-		mIsFocus = true;
-		updateScrollViewState();
-	}
-
-	void ScrollView::notifyMouseLostFocus(Widget* _sender, Widget* _new)
-	{
-		if ((_new == mScrollClient) || (!mIsFocus))
-			return;
-
-		mIsFocus = false;
-		updateScrollViewState();
-	}
-
-	void ScrollView::onKeySetFocus(Widget* _old)
-	{
-		if (!mIsPressed)
-		{
-			mIsPressed = true;
-			updateScrollViewState();
-		}
-
-		Base::onKeySetFocus(_old);
-	}
-
-	void ScrollView::onKeyLostFocus(Widget* _new)
-	{
-		if (mIsPressed)
-		{
-			mIsPressed = false;
-			updateScrollViewState();
-		}
-
-		Base::onKeyLostFocus(_new);
-	}
-
-	void ScrollView::updateScrollViewState()
-	{
-		if (!mEnabled) setState("disabled");
-		else if (mIsPressed)
-		{
-			if (mIsFocus) setState("pushed");
-			else setState("normal_checked");
-		}
-		else if (mIsFocus) setState("highlighted");
-		else setState("normal");
-	}
-
-	void ScrollView::setPosition(const IntPoint& _point)
-	{
-		Base::setPosition(_point);
-	}
-
-	void ScrollView::setSize(const IntSize& _size)
-	{
-		Base::setSize(_size);
-
-		updateView();
-	}
-
-	void ScrollView::setCoord(const IntCoord& _coord)
-	{
-		Base::setCoord(_coord);
-
-		updateView();
-	}
-
-	void ScrollView::notifyScrollChangePosition(VScroll* _sender, size_t _position)
-	{
-		if (mWidgetClient == nullptr)
-			return;
-
-		if (_sender == mVScroll)
-		{
-			IntPoint point = mWidgetClient->getPosition();
-			point.top = -(int)_position;
-			mWidgetClient->setPosition(point);
-		}
-		else if (_sender == mHScroll)
-		{
-			IntPoint point = mWidgetClient->getPosition();
-			point.left = -(int)_position;
-			mWidgetClient->setPosition(point);
-		}
-	}
-
-	void ScrollView::notifyMouseWheel(Widget* _sender, int _rel)
-	{
-		if (mWidgetClient == nullptr)
-			return;
-
-		if (mVRange != 0)
-		{
-			IntPoint point = mWidgetClient->getPosition();
-			int offset = -point.top;
-			if (_rel < 0) offset += SCROLL_VIEW_MOUSE_WHEEL;
-			else  offset -= SCROLL_VIEW_MOUSE_WHEEL;
-
-			if (offset < 0) offset = 0;
-			else if (offset > (int)mVRange) offset = mVRange;
-
-			if (offset != point.top)
-			{
-				point.top = -offset;
-				if (mVScroll != nullptr)
-				{
-					mVScroll->setScrollPosition(offset);
-				}
-				mWidgetClient->setPosition(point);
-			}
-		}
-		else if (mHRange != 0)
-		{
-			IntPoint point = mWidgetClient->getPosition();
-			int offset = -point.left;
-			if (_rel < 0) offset += SCROLL_VIEW_MOUSE_WHEEL;
-			else  offset -= SCROLL_VIEW_MOUSE_WHEEL;
-
-			if (offset < 0) offset = 0;
-			else if (offset > (int)mHRange) offset = mHRange;
-
-			if (offset != point.left)
-			{
-				point.left = -offset;
-				if (mHScroll != nullptr)
-				{
-					mHScroll->setScrollPosition(offset);
-				}
-				mWidgetClient->setPosition(point);
-			}
-		}
-	}
-
-	Widget* ScrollView::baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name)
-	{
-		if (mWidgetClient == nullptr)
-			return Base::baseCreateWidget(_style, _type, _skin, _coord, _align, _layer, _name);
-		return mWidgetClient->createWidgetT(_style, _type, _skin, _coord, _align, _layer, _name);
-	}
-
-	IntSize ScrollView::getContentSize()
-	{
-		return mWidgetClient == nullptr ? IntSize() : mWidgetClient->getSize();
-	}
-
-	IntPoint ScrollView::getContentPosition()
-	{
-		return mWidgetClient == nullptr ? IntPoint() : (IntPoint() - mWidgetClient->getPosition());
-	}
-
-	void ScrollView::setContentPosition(const IntPoint& _point)
-	{
-		if (mWidgetClient != nullptr)
-			mWidgetClient->setPosition(IntPoint() - _point);
-	}
-
-	IntSize ScrollView::getViewSize() const
-	{
-		return mScrollClient == nullptr ? IntSize() : mScrollClient->getSize();
-	}
-
-	size_t ScrollView::getVScrollPage()
-	{
-		return SCROLL_VIEW_SCROLL_PAGE;
-	}
-
-	size_t ScrollView::getHScrollPage()
-	{
-		return SCROLL_VIEW_SCROLL_PAGE;
-	}
-
-	void ScrollView::updateView()
-	{
-		updateScrollSize();
-		updateScrollPosition();
-	}
-
-	void ScrollView::setVisibleVScroll(bool _value)
-	{
-		mVisibleVScroll = _value;
-		updateView();
-	}
-
-	void ScrollView::setVisibleHScroll(bool _value)
-	{
-		mVisibleHScroll = _value;
-		updateView();
-	}
-
-	void ScrollView::setCanvasAlign(Align _value)
-	{
-		mContentAlign = _value;
-		updateView();
-	}
-
-	void ScrollView::setCanvasSize(const IntSize& _value)
-	{
-		if (mWidgetClient != nullptr)
-			mWidgetClient->setSize(_value); updateView();
-	}
-
-	void ScrollView::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "ScrollView_VisibleVScroll") setVisibleVScroll(utility::parseValue<bool>(_value));
-		else if (_key == "ScrollView_VisibleHScroll") setVisibleHScroll(utility::parseValue<bool>(_value));
-		else if (_key == "ScrollView_CanvasAlign") setCanvasAlign(utility::parseValue<Align>(_value));
-		else if (_key == "ScrollView_CanvasSize") setCanvasSize(utility::parseValue<IntSize>(_value));
-
-#ifndef MYGUI_DONT_USE_OBSOLETE
-		else if (_key == "ScrollView_VScroll")
-		{
-			MYGUI_LOG(Warning, "ScrollView_VScroll is obsolete, use ScrollView_VisibleVScroll");
-			setVisibleVScroll(utility::parseValue<bool>(_value));
-		}
-		else if (_key == "ScrollView_HScroll")
-		{
-			MYGUI_LOG(Warning, "ScrollView_HScroll is obsolete, use ScrollView_VisibleHScroll");
-			setVisibleHScroll(utility::parseValue<bool>(_value));
-		}
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-	const IntCoord& ScrollView::getClientCoord()
-	{
-		return mScrollClient == nullptr ? getCoord() : mScrollClient->getCoord();
-	}
-
-	IntSize ScrollView::getCanvasSize()
-	{
-		return mWidgetClient == nullptr ? IntSize() : mWidgetClient->getSize();
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ScrollViewBase.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ScrollViewBase.cpp
deleted file mode 100644
index 2546b25212..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ScrollViewBase.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		10/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_ScrollViewBase.h"
-#include "MyGUI_VScroll.h"
-#include "MyGUI_HScroll.h"
-
-namespace MyGUI
-{
-
-	ScrollViewBase::ScrollViewBase() :
-		mVScroll(nullptr),
-		mHScroll(nullptr),
-		mClient(nullptr),
-		mVisibleHScroll(true),
-		mVisibleVScroll(true),
-		mVRange(0),
-		mHRange(0),
-		mChangeContentByResize(false)
-	{
-	}
-
-	void ScrollViewBase::updateScrollSize()
-	{
-		if (mClient == nullptr)
-			return;
-
-		eraseContent();
-		IntSize contentSize = getContentSize();
-		IntSize viewSize = getViewSize();
-
-		// ������������ ������� �� ����������
-		if (contentSize.height > viewSize.height)
-		{
-			if (mVScroll != nullptr)
-			{
-				if (( ! mVScroll->isVisible()) && (mVisibleVScroll))
-				{
-					mVScroll->setVisible(true);
-					mClient->setSize(mClient->getWidth() - mVScroll->getWidth(), mClient->getHeight());
-
-					// ������ ����� ����������
-					if (mChangeContentByResize)
-					{
-						eraseContent();
-						contentSize = getContentSize();
-						viewSize = getViewSize();
-					}
-
-					if (mHScroll != nullptr)
-					{
-						mHScroll->setSize(mHScroll->getWidth() - mVScroll->getWidth(), mHScroll->getHeight());
-
-						// ���� �������� ������������ ����� ���, ����������� ��� �� �����������,
-						// ������������� �������������� ����� �� ������� ������
-						if ((contentSize.width > viewSize.width) && ( ! mHScroll->isVisible()) && (mVisibleHScroll))
-						{
-							mHScroll->setVisible(true);
-							mClient->setSize(mClient->getWidth(), mClient->getHeight() - mHScroll->getHeight());
-							mVScroll->setSize(mVScroll->getWidth(), mVScroll->getHeight() - mHScroll->getHeight());
-
-							// ������ ����� ����������
-							if (mChangeContentByResize)
-							{
-								eraseContent();
-								contentSize = getContentSize();
-								viewSize = getViewSize();
-							}
-
-						}
-					}
-				}
-			}
-		}
-		// ������������ ������� ����������
-		else
-		{
-			if (mVScroll != nullptr)
-			{
-				if (mVScroll->isVisible())
-				{
-					mVScroll->setVisible(false);
-					mClient->setSize(mClient->getWidth() + mVScroll->getWidth(), mClient->getHeight());
-
-					// ������ ����� ����������
-					if (mChangeContentByResize)
-					{
-						eraseContent();
-						contentSize = getContentSize();
-						viewSize = getViewSize();
-					}
-
-					if (mHScroll != nullptr)
-					{
-						mHScroll->setSize(mHScroll->getWidth() + mVScroll->getWidth(), mHScroll->getHeight());
-
-						// ���� ������ ������������ ����� ���, ����������� ��� �� �����������,
-						// ������������� �������������� ����� �� ������� �������
-						if ((contentSize.width <= viewSize.width) && (mHScroll->isVisible()))
-						{
-							mHScroll->setVisible(false);
-							mClient->setSize(mClient->getWidth(), mClient->getHeight() + mHScroll->getHeight());
-							mVScroll->setSize(mVScroll->getWidth(), mVScroll->getHeight() + mHScroll->getHeight());
-
-							// ������ ����� ����������
-							if (mChangeContentByResize)
-							{
-								eraseContent();
-								contentSize = getContentSize();
-								viewSize = getViewSize();
-							}
-
-						}
-					}
-				}
-			}
-		}
-
-
-		// �������������� ������� �� ����������
-		if (contentSize.width > viewSize.width)
-		{
-			if (mHScroll != nullptr)
-			{
-				if (( ! mHScroll->isVisible()) && (mVisibleHScroll))
-				{
-					mHScroll->setVisible(true);
-					mClient->setSize(mClient->getWidth(), mClient->getHeight() - mHScroll->getHeight());
-
-					// ������ ����� ����������
-					if (mChangeContentByResize)
-					{
-						eraseContent();
-						contentSize = getContentSize();
-						viewSize = getViewSize();
-					}
-
-					if (mVScroll != nullptr)
-					{
-						mVScroll->setSize(mVScroll->getWidth(), mVScroll->getHeight() - mHScroll->getHeight());
-
-						// ���� �������� �������������� ����� ���, ����������� ��� �� ���������,
-						// ������������� ������������ ����� �� ������� ������
-						if ((contentSize.height > viewSize.height) && ( ! mVScroll->isVisible()) && (mVisibleVScroll))
-						{
-							mVScroll->setVisible(true);
-							mClient->setSize(mClient->getWidth() - mVScroll->getWidth(), mClient->getHeight());
-							mHScroll->setSize(mHScroll->getWidth() - mVScroll->getWidth(), mHScroll->getHeight());
-
-							// ������ ����� ����������
-							if (mChangeContentByResize)
-							{
-								eraseContent();
-								contentSize = getContentSize();
-								viewSize = getViewSize();
-							}
-
-						}
-					}
-				}
-			}
-		}
-		// �������������� ������� ����������
-		else
-		{
-			if (mHScroll != nullptr)
-			{
-				if (mHScroll->isVisible())
-				{
-					mHScroll->setVisible(false);
-					mClient->setSize(mClient->getWidth(), mClient->getHeight() + mHScroll->getHeight());
-
-					// ������ ����� ����������
-					if (mChangeContentByResize)
-					{
-						eraseContent();
-						contentSize = getContentSize();
-						viewSize = getViewSize();
-					}
-
-					if (mVScroll != nullptr)
-					{
-						mVScroll->setSize(mVScroll->getWidth(), mVScroll->getHeight() + mHScroll->getHeight());
-
-						// ���� ������ �������������� ����� ���, ����������� ��� �� ���������,
-						// ������������� ������������ ����� �� ������� �������
-						if ((contentSize.height <= viewSize.height) && (mVScroll->isVisible()))
-						{
-							mVScroll->setVisible(false);
-							mClient->setSize(mClient->getWidth() + mVScroll->getWidth(), mClient->getHeight());
-							mHScroll->setSize(mHScroll->getWidth() + mVScroll->getWidth(), mHScroll->getHeight());
-
-							// ������ ����� ����������
-							if (mChangeContentByResize)
-							{
-								eraseContent();
-								contentSize = getContentSize();
-								viewSize = getViewSize();
-							}
-						}
-					}
-				}
-			}
-		}
-
-		mVRange = (viewSize.height >= contentSize.height) ? 0 : contentSize.height - viewSize.height;
-		mHRange = (viewSize.width >= contentSize.width) ? 0 : contentSize.width - viewSize.width;
-
-		if (mVScroll != nullptr)
-		{
-			size_t page = getVScrollPage();
-			mVScroll->setScrollPage(page);
-			mVScroll->setScrollViewPage(viewSize.width > (int)page ? viewSize.width : page);
-			mVScroll->setScrollRange(mVRange + 1);
-			if (contentSize.height) mVScroll->setTrackSize(int (float(mVScroll->getLineSize() * viewSize.height) / float(contentSize.height)));
-		}
-		if (mHScroll != nullptr)
-		{
-			size_t page = getHScrollPage();
-			mHScroll->setScrollPage(page);
-			mHScroll->setScrollViewPage(viewSize.height > (int)page ? viewSize.height : page);
-			mHScroll->setScrollRange(mHRange + 1);
-			if (contentSize.width) mHScroll->setTrackSize(int (float(mHScroll->getLineSize() * viewSize.width) / float(contentSize.width)));
-		}
-	}
-
-	void ScrollViewBase::updateScrollPosition()
-	{
-		// ������ ���������
-		IntSize contentSize = getContentSize();
-		// ������� �������� ���������
-		IntPoint contentPoint = getContentPosition();
-		// ��������� ��������
-		IntPoint offset = contentPoint;
-
-		IntSize viewSize = getViewSize();
-
-		Align align = getContentAlign();
-
-		if (contentSize.width > viewSize.width)
-		{
-			// ������������ ����� �����
-			if ((offset.left + viewSize.width) > contentSize.width)
-			{
-				offset.left = contentSize.width - viewSize.width;
-			}
-			// ������������ ����� ������
-			else if (offset.left < 0)
-			{
-				offset.left = 0;
-			}
-		}
-		else
-		{
-			if (align.isLeft())
-			{
-				offset.left = 0;
-			}
-			else if (align.isRight())
-			{
-				offset.left = contentSize.width - viewSize.width;
-			}
-			else
-			{
-				offset.left = (contentSize.width - viewSize.width) / 2;
-			}
-		}
-
-		if (contentSize.height > viewSize.height)
-		{
-			// ������������ ����� �����
-			if ((offset.top + viewSize.height) > contentSize.height)
-			{
-				offset.top = contentSize.height - viewSize.height;
-			}
-			// ������������ ����� ����
-			else if (offset.top < 0)
-			{
-				offset.top = 0;
-			}
-		}
-		else
-		{
-			if (align.isTop())
-			{
-				offset.top = 0;
-			}
-			else if (align.isBottom())
-			{
-				offset.top = contentSize.height - viewSize.height;
-			}
-			else
-			{
-				offset.top = (contentSize.height - viewSize.height) / 2;
-			}
-		}
-
-		if (offset != contentPoint)
-		{
-			if (nullptr != mVScroll) mVScroll->setScrollPosition(offset.top);
-			if (nullptr != mHScroll) mHScroll->setScrollPosition(offset.left);
-			setContentPosition(offset);
-		}
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SharedLayer.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SharedLayer.cpp
deleted file mode 100644
index 99c0a3b9a1..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SharedLayer.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_LayerItem.h"
-#include "MyGUI_SharedLayer.h"
-#include "MyGUI_LayerNode.h"
-#include "MyGUI_RenderManager.h"
-
-namespace MyGUI
-{
-
-	SharedLayer::SharedLayer() :
-		mIsPick(false),
-		mChildItem(nullptr)
-	{
-	}
-
-	SharedLayer::~SharedLayer()
-	{
-		MYGUI_ASSERT(mChildItem == nullptr, "Layer '" << getName() << "' must be empty before destroy");
-	}
-
-	void SharedLayer::deserialization(xml::ElementPtr _node, Version _version)
-	{
-		mName = _node->findAttribute("name");
-		if (_version >= Version(1, 2))
-		{
-			MyGUI::xml::ElementEnumerator propert = _node->getElementEnumerator();
-			while (propert.next("Property"))
-			{
-				const std::string& key = propert->findAttribute("key");
-				const std::string& value = propert->findAttribute("value");
-				if (key == "Pick") mIsPick = utility::parseValue<bool>(value);
-			}
-		}
-		else
-		{
-			mIsPick = utility::parseBool(_version < Version(1, 0) ? _node->findAttribute("peek") : _node->findAttribute("pick"));
-		}
-	}
-
-	ILayerNode* SharedLayer::createChildItemNode()
-	{
-		if (mChildItem == nullptr)
-		{
-			mChildItem = new SharedLayerNode(this);
-		}
-
-		mChildItem->addUsing();
-		return mChildItem;
-	}
-
-	void SharedLayer::destroyChildItemNode(ILayerNode* _item)
-	{
-		// ����� �������, �� �������
-		if (mChildItem == _item)
-		{
-			mChildItem->removeUsing();
-			if (0 == mChildItem->countUsing())
-			{
-				delete mChildItem;
-				mChildItem = nullptr;
-			}
-			return;
-		}
-		//MYGUI_EXCEPT("item node not found");
-	}
-
-	void SharedLayer::upChildItemNode(ILayerNode* _item)
-	{
-		// ���� ���� ����, �� ����� ��� �����
-		ILayerNode * parent = _item->getParent();
-		if (parent != nullptr)
-		{
-			parent->upChildItemNode(_item);
-		}
-	}
-
-	ILayerItem * SharedLayer::getLayerItemByPoint(int _left, int _top)
-	{
-		if (!mIsPick) return nullptr;
-		if (mChildItem != nullptr)
-		{
-			ILayerItem * item = mChildItem->getLayerItemByPoint(_left, _top);
-			if (item != nullptr) return item;
-		}
-		return nullptr;
-	}
-
-	IntPoint SharedLayer::getPosition(int _left, int _top) const
-	{
-		return IntPoint(_left, _top);
-	}
-
-	void SharedLayer::renderToTarget(IRenderTarget* _target, bool _update)
-	{
-		if (mChildItem != nullptr) mChildItem->renderToTarget(_target, _update);
-	}
-
-	EnumeratorILayerNode SharedLayer::getEnumerator()
-	{
-		static VectorILayerNode nodes;
-		if (mChildItem == nullptr)
-		{
-			nodes.clear();
-		}
-		else
-		{
-			if (nodes.empty()) nodes.push_back(mChildItem);
-			else nodes[0] = mChildItem;
-		}
-
-		return EnumeratorILayerNode(nodes);
-	}
-
-	void SharedLayer::dumpStatisticToLog()
-	{
-		static const char* spacer = "                                                                                                                        ";
-		MYGUI_LOG(Info, spacer);
-		MYGUI_LOG(Info, "Layer name='" << getName() << "'" << " type='" << getTypeName() << "'" << spacer);
-		MYGUI_LOG(Info, "Count root nodes : " << (mChildItem == nullptr ? 0 : 1) << spacer);
-
-		if (mChildItem != nullptr)
-		{
-			mChildItem->dumpStatisticToLog(0);
-		}
-	}
-
-	const IntSize& SharedLayer::getSize() const
-	{
-		return RenderManager::getInstance().getViewSize();
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SharedLayerNode.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SharedLayerNode.cpp
deleted file mode 100644
index 86d0d6e73d..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SharedLayerNode.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_SharedLayerNode.h"
-
-namespace MyGUI
-{
-
-	SharedLayerNode::SharedLayerNode(ILayer* _layer, ILayerNode* _parent) :
-		LayerNode(_layer, _parent),
-		mCountUsing(0)
-	{
-	}
-
-	SharedLayerNode::~SharedLayerNode()
-	{
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SimpleText.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SimpleText.cpp
deleted file mode 100644
index 0ecf14de01..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SimpleText.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_SimpleText.h"
-#include "MyGUI_RenderItem.h"
-#include "MyGUI_LayerNode.h"
-#include "MyGUI_FontManager.h"
-#include "MyGUI_CommonStateInfo.h"
-#include "MyGUI_RenderManager.h"
-
-namespace MyGUI
-{
-
-	SimpleText::SimpleText() :
-		EditText()
-	{
-		mIsAddCursorWidth = false;
-	}
-
-	SimpleText::~SimpleText()
-	{
-	}
-
-	void SimpleText::setViewOffset(const IntPoint& _point)
-	{
-	}
-
-	void SimpleText::doRender()
-	{
-		bool _update = mRenderItem->getCurrentUpdate();
-		if (_update) mTextOutDate = true;
-
-		if (nullptr == mFont) return;
-		if (!mVisible || mEmptyView) return;
-
-		if (mTextOutDate) updateRawData();
-
-		const IntSize& size = mTextView.getViewSize();
-
-		if (mTextAlign.isRight())
-			mViewOffset.left = - (mCoord.width - size.width);
-		else if (mTextAlign.isHCenter())
-			mViewOffset.left = - ((mCoord.width - size.width) / 2);
-		else
-			mViewOffset.left = 0;
-
-		if (mTextAlign.isBottom())
-			mViewOffset.top = - (mCoord.height - size.height);
-		else if (mTextAlign.isVCenter())
-			mViewOffset.top = - ((mCoord.height - size.height) / 2);
-		else
-			mViewOffset.top = 0;
-
-		Base::doRender();
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SkinManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SkinManager.cpp
deleted file mode 100644
index 400f1ca69d..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SkinManager.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_LanguageManager.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_SubWidgetManager.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_DataManager.h"
-#include "MyGUI_FactoryManager.h"
-#include "MyGUI_IStateInfo.h"
-
-namespace MyGUI
-{
-
-	const std::string XML_TYPE("Skin");
-	const std::string XML_TYPE_RESOURCE("Resource");
-	const std::string RESOURCE_DEFAULT_NAME("Default");
-
-	MYGUI_INSTANCE_IMPLEMENT( SkinManager )
-
-	void SkinManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		ResourceManager::getInstance().registerLoadXmlDelegate(XML_TYPE) = newDelegate(this, &SkinManager::_load);
-		FactoryManager::getInstance().registerFactory<ResourceSkin>(XML_TYPE_RESOURCE);
-
-		mDefaultName = "skin_Default";
-		createDefault(mDefaultName);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void SkinManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		ResourceManager::getInstance().unregisterLoadXmlDelegate(XML_TYPE);
-		FactoryManager::getInstance().unregisterFactory<ResourceSkin>(XML_TYPE_RESOURCE);
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	bool SkinManager::load(const std::string& _file)
-	{
-		return ResourceManager::getInstance()._loadImplement(_file, true, XML_TYPE, INSTANCE_TYPE_NAME);
-	}
-
-	void SkinManager::_load(xml::ElementPtr _node, const std::string& _file, Version _version)
-	{
-		// берем детей и крутимся, основной цикл со скинами
-		xml::ElementEnumerator skin = _node->getElementEnumerator();
-		while (skin.next(XML_TYPE))
-		{
-			std::string name = skin->findAttribute("name");
-			std::string type = skin->findAttribute("type");
-			if (type.empty()) type = "ResourceSkin";
-
-			IObject* object = FactoryManager::getInstance().createObject(XML_TYPE_RESOURCE, type);
-			if (object != nullptr)
-			{
-				ResourceSkin* data = object->castType<ResourceSkin>();
-				data->deserialization(skin.current(), _version);
-
-				ResourceManager::getInstance().addResource(data);
-			}
-		}
-	}
-
-	void SkinManager::createDefault(const std::string& _value)
-	{
-		xml::Document doc;
-		xml::ElementPtr root = doc.createRoot("MyGUI");
-		xml::ElementPtr newnode = root->createChild("Resource");
-		newnode->addAttribute("type", ResourceSkin::getClassTypeName());
-		newnode->addAttribute("name", _value);
-
-		ResourceManager::getInstance()._load(root, "", Version());
-	}
-
-	ResourceSkin* SkinManager::getByName(const std::string& _name) const
-	{
-		IResource* result = nullptr;
-		if (!_name.empty() && _name != RESOURCE_DEFAULT_NAME)
-			result = ResourceManager::getInstance().getByName(_name, false);
-
-		if (result == nullptr)
-		{
-			result = ResourceManager::getInstance().getByName(mDefaultName, false);
-			MYGUI_LOG(Error, "Skin '" << _name << "' not found. Replaced with default skin.");
-		}
-
-		return result ? result->castType<ResourceSkin>(false) : nullptr;
-	}
-
-	bool SkinManager::isExist(const std::string& _name) const
-	{
-		return ResourceManager::getInstance().isExist(_name);
-	}
-
-	void SkinManager::setDefaultSkin(const std::string& _value)
-	{
-		mDefaultName = _value;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_StaticImage.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_StaticImage.cpp
deleted file mode 100644
index 4858537d9d..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_StaticImage.cpp
+++ /dev/null
@@ -1,538 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_StaticImage.h"
-#include "MyGUI_CoordConverter.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_RotatingSkin.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_TextureUtility.h"
-
-namespace MyGUI
-{
-
-	const size_t IMAGE_MAX_INDEX = 256;
-
-	StaticImage::StaticImage() :
-		mIndexSelect(ITEM_NONE),
-		mFrameAdvise(false),
-		mCurrentTime(0),
-		mCurrentFrame(0),
-		mResource(nullptr)
-	{
-	}
-
-	void StaticImage::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	StaticImage::~StaticImage()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void StaticImage::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void StaticImage::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// парсим свойства
-		const MapString& properties = _info->getProperties();
-		if ( ! properties.empty() )
-		{
-			MapString::const_iterator iter = properties.end();
-			if ((iter = properties.find("ImageTexture")) != properties.end()) setImageTexture(iter->second);
-			if ((iter = properties.find("ImageRect")) != properties.end()) setImageRect(IntRect::parse(iter->second));
-			if ((iter = properties.find("ImageCoord")) != properties.end()) setImageCoord(IntCoord::parse(iter->second));
-			if ((iter = properties.find("ImageTile")) != properties.end()) setImageTile(IntSize::parse(iter->second));
-			if ((iter = properties.find("ImageIndex")) != properties.end()) setImageIndex(utility::parseInt(iter->second));
-			if ((iter = properties.find("ImageResource")) != properties.end()) setItemResource(iter->second);
-			if ((iter = properties.find("ImageGroup")) != properties.end()) setItemGroup(iter->second);
-			if ((iter = properties.find("ImageName")) != properties.end()) setItemName(iter->second);
-		}
-	}
-
-	void StaticImage::shutdownWidgetSkin()
-	{
-		frameAdvise(false);
-	}
-
-	void StaticImage::setImageInfo(const std::string& _texture, const IntCoord& _coord, const IntSize& _tile)
-	{
-		mCurrentTextureName = _texture;
-		mSizeTexture = texture_utility::getTextureSize(mCurrentTextureName);
-
-		mSizeTile = _tile;
-		mRectImage.left = _coord.left;
-		mRectImage.top = _coord.top;
-		mRectImage.right = _coord.left + _coord.width;
-		mRectImage.bottom = _coord.top + _coord.height;
-
-		recalcIndexes();
-		updateSelectIndex(mIndexSelect);
-	}
-
-	void StaticImage::setImageTile(const IntSize& _tile)
-	{
-		mSizeTile = _tile;
-
-		// если размер еще не установлен, то ставим тот что у тайла
-		if (mRectImage.empty()) mRectImage.set(0, 0, _tile.width, _tile.height);
-		//если индекса еще нет, то ставим 0
-		if (mIndexSelect == ITEM_NONE) mIndexSelect = 0;
-
-		recalcIndexes();
-		updateSelectIndex(mIndexSelect);
-	}
-
-	void StaticImage::setImageCoord(const IntCoord& _coord)
-	{
-		mRectImage.left = _coord.left;
-		mRectImage.top = _coord.top;
-		mRectImage.right = _coord.left + _coord.width;
-		mRectImage.bottom = _coord.top + _coord.height;
-
-		// если тайл еще не установлен, то ставим тот что у координат
-		if (mSizeTile.empty()) mSizeTile = _coord.size();
-		//если индекса еще нет, то ставим 0
-		if (mIndexSelect == ITEM_NONE) mIndexSelect = 0;
-
-		recalcIndexes();
-		updateSelectIndex(mIndexSelect);
-	}
-
-	void StaticImage::setImageRect(const IntRect& _rect)
-	{
-		mRectImage= _rect;
-
-		// если тайл еще не установлен, то ставим тот что у координат
-		if (mSizeTile.empty()) mSizeTile.set(_rect.width(), _rect.height());
-		//если индекса еще нет, то ставим 0
-		if (mIndexSelect == ITEM_NONE) mIndexSelect = 0;
-
-		recalcIndexes();
-		updateSelectIndex(mIndexSelect);
-	}
-
-	void StaticImage::setImageTexture(const std::string& _texture)
-	{
-		mCurrentTextureName = _texture;
-		mSizeTexture = texture_utility::getTextureSize(mCurrentTextureName);
-
-		// если первый раз, то ставим во всю текстуру
-		if (mItems.empty())
-		{
-			_setUVSet(FloatRect(0, 0, 1, 1));
-			_setTextureName(mCurrentTextureName);
-		}
-		else
-		{
-			recalcIndexes();
-			updateSelectIndex(mIndexSelect);
-		}
-	}
-
-	void StaticImage::recalcIndexes()
-	{
-		mItems.clear();
-
-		if ((mRectImage.right <= mRectImage.left) || (mRectImage.bottom <= mRectImage.top)) return;
-		if ((mSizeTile.width <= 0) || (mSizeTile.height <= 0)) return;
-
-		size_t count_h = (size_t)(mRectImage.width() / mSizeTile.width);
-		size_t count_v = (size_t)(mRectImage.height() / mSizeTile.height);
-
-		if ((count_h * count_v) > IMAGE_MAX_INDEX)
-		{
-			MYGUI_LOG(Warning, "Tile count very mach, rect : " << mRectImage.print() << " tile : " << mSizeTile.print() << " texture : " << mTextureName << " indexes : " << (count_h * count_v) << " max : " << IMAGE_MAX_INDEX);
-			return;
-		}
-
-		int pos_h = mRectImage.left;
-		int pos_v = mRectImage.top;
-
-		for (size_t v=0; v<count_v; ++v)
-		{
-			for (size_t h=0; h<count_h; ++h)
-			{
-				addItem(IntCoord(pos_h, pos_v, mSizeTile.width, mSizeTile.height));
-				pos_h += mSizeTile.width;
-			}
-			pos_v += mSizeTile.height;
-			pos_h = mRectImage.left;
-		}
-	}
-
-	void StaticImage::updateSelectIndex(size_t _index)
-	{
-		mIndexSelect = _index;
-
-		if ((_index == ITEM_NONE) || (_index >= mItems.size()))
-		{
-			_setTextureName("");
-			return;
-		}
-		else
-		{
-			_setTextureName(mCurrentTextureName);
-		}
-
-		VectorImages::iterator iter = mItems.begin() + _index;
-
-		if (iter->images.size() < 2)
-		{
-			frameAdvise(false);
-		}
-		else
-		{
-			if ( ! mFrameAdvise)
-			{
-				mCurrentTime = 0;
-				mCurrentFrame = 0;
-			}
-			frameAdvise(true);
-		}
-
-		if ( ! iter->images.empty())
-		{
-			_setUVSet(iter->images.front());
-		}
-	}
-
-	void StaticImage::deleteItem(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItems.size(), "StaticImage::deleteItem");
-
-		mItems.erase(mItems.begin() + _index);
-
-		if (mIndexSelect != ITEM_NONE)
-		{
-			if (mItems.empty()) updateSelectIndex(ITEM_NONE);
-			else if ((_index < mIndexSelect) || (mIndexSelect == mItems.size())) updateSelectIndex(mIndexSelect--);
-		}
-	}
-
-	void StaticImage::deleteAllItems()
-	{
-		updateSelectIndex(ITEM_NONE);
-		mItems.clear();
-	}
-
-	void StaticImage::insertItem(size_t _index, const IntCoord& _item)
-	{
-		MYGUI_ASSERT_RANGE_INSERT(_index, mItems.size(), "StaticImage::insertItem");
-		if (_index == ITEM_NONE) _index = mItems.size();
-
-		VectorImages::iterator iter = mItems.insert(mItems.begin() + _index, ImageItem());
-
-		iter->images.push_back(CoordConverter::convertTextureCoord(_item, mSizeTexture));
-
-		if ((mIndexSelect != ITEM_NONE) && (_index <= mIndexSelect)) updateSelectIndex(mIndexSelect++);
-	}
-
-	void StaticImage::setItem(size_t _index, const IntCoord& _item)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItems.size(), "StaticImage::setItem");
-
-		VectorImages::iterator iter = mItems.begin() + _index;
-		iter->images.clear();
-		iter->images.push_back(CoordConverter::convertTextureCoord(_item, mSizeTexture));
-
-		if (_index == mIndexSelect) updateSelectIndex(mIndexSelect);
-	}
-
-	void StaticImage::frameEntered(float _frame)
-	{
-		if (mIndexSelect == ITEM_NONE) return;
-
-		if (mItems.empty()) return;
-		VectorImages::iterator iter = mItems.begin() + mIndexSelect;
-		if ((iter->images.size() < 2) || (iter->frame_rate == 0)) return;
-
-		mCurrentTime += _frame;
-
-		while (mCurrentTime >= iter->frame_rate)
-		{
-			mCurrentTime -= iter->frame_rate;
-			mCurrentFrame ++;
-			if (mCurrentFrame >= (iter->images.size())) mCurrentFrame = 0;
-		}
-
-		_setUVSet(iter->images[mCurrentFrame]);
-	}
-
-	void StaticImage::deleteAllItemFrames(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItems.size(), "StaticImage::clearItemFrame");
-		VectorImages::iterator iter = mItems.begin() + _index;
-		iter->images.clear();
-	}
-
-	void StaticImage::addItemFrame(size_t _index, const IntCoord& _item)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItems.size(), "StaticImage::addItemFrame");
-		VectorImages::iterator iter = mItems.begin() + _index;
-		iter->images.push_back(CoordConverter::convertTextureCoord(_item, mSizeTexture));
-	}
-
-	void StaticImage::setItemFrameRate(size_t _index, float _rate)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItems.size(), "StaticImage::setItemFrameRate");
-		VectorImages::iterator iter = mItems.begin() + _index;
-		iter->frame_rate = _rate;
-	}
-
-	float StaticImage::getItemFrameRate(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItems.size(), "StaticImage::getItemFrameRate");
-		VectorImages::iterator iter = mItems.begin() + _index;
-		return iter->frame_rate;
-	}
-
-	void StaticImage::addItemFrameDublicate(size_t _index, size_t _indexSourceFrame)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItems.size(), "StaticImage::addItemFrameDublicate");
-
-		VectorImages::iterator iter = mItems.begin() + _index;
-		MYGUI_ASSERT_RANGE(_indexSourceFrame, iter->images.size(), "StaticImage::addItemFrameDublicate");
-		iter->images.push_back(iter->images[_indexSourceFrame]);
-	}
-
-	void StaticImage::insertItemFrame(size_t _index, size_t _indexFrame, const IntCoord& _item)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItems.size(), "StaticImage::insertItemFrame");
-
-		VectorImages::iterator iter = mItems.begin() + _index;
-		MYGUI_ASSERT_RANGE_INSERT(_indexFrame, iter->images.size(), "StaticImage::insertItemFrame");
-		if (_indexFrame == ITEM_NONE) _indexFrame = iter->images.size() - 1;
-
-		iter->images.insert(iter->images.begin() + _indexFrame,
-			CoordConverter::convertTextureCoord(_item, mSizeTexture));
-	}
-
-	void StaticImage::insertItemFrameDublicate(size_t _index, size_t _indexFrame, size_t _indexSourceFrame)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItems.size(), "StaticImage::insertItemFrameDublicate");
-
-		VectorImages::iterator iter = mItems.begin() + _index;
-		MYGUI_ASSERT_RANGE_INSERT(_indexFrame, iter->images.size(), "StaticImage::insertItemFrameDublicate");
-		if (_indexFrame == ITEM_NONE) _indexFrame = iter->images.size() - 1;
-
-		MYGUI_ASSERT_RANGE(_indexSourceFrame, iter->images.size(), "StaticImage::insertItemFrameDublicate");
-
-		iter->images.insert(iter->images.begin() + _indexFrame, iter->images[_indexSourceFrame]);
-	}
-
-	void StaticImage::setItemFrame(size_t _index, size_t _indexFrame, const IntCoord& _item)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItems.size(), "StaticImage::setItemFrame");
-
-		VectorImages::iterator iter = mItems.begin() + _index;
-		MYGUI_ASSERT_RANGE(_indexFrame, iter->images.size(), "StaticImage::setItemFrame");
-
-		iter->images[_indexFrame] = CoordConverter::convertTextureCoord(_item, mSizeTexture);
-	}
-
-	void StaticImage::deleteItemFrame(size_t _index, size_t _indexFrame)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItems.size(), "StaticImage::deleteItemFrame");
-
-		VectorImages::iterator iter = mItems.begin() + _index;
-		MYGUI_ASSERT_RANGE_INSERT(_indexFrame, iter->images.size(), "StaticImage::deleteItemFrame");
-		if (_indexFrame == ITEM_NONE) _indexFrame = iter->images.size() - 1;
-
-		iter->images.erase(iter->images.begin() + _indexFrame);
-	}
-
-	void StaticImage::setItemResourceInfo(const ImageIndexInfo& _info)
-	{
-		mCurrentTextureName = _info.texture;
-		mSizeTexture = texture_utility::getTextureSize(mCurrentTextureName);
-
-		mItems.clear();
-
-		if (_info.frames.size() != 0)
-		{
-			std::vector<IntPoint>::const_iterator iter = _info.frames.begin();
-
-			addItem(IntCoord(*iter, _info.size));
-			setItemFrameRate(0, _info.rate);
-
-			for (++iter; iter!=_info.frames.end(); ++iter)
-			{
-				addItemFrame(0, MyGUI::IntCoord(*iter, _info.size));
-			}
-
-		}
-
-		mIndexSelect = 0;
-		updateSelectIndex(mIndexSelect);
-	}
-
-	bool StaticImage::setItemResource(const Guid& _id)
-	{
-		IResourcePtr resource = _id.empty() ? nullptr : ResourceManager::getInstance().getByID(_id, false);
-		setItemResourcePtr(resource ? resource->castType<ResourceImageSet>() : nullptr);
-		return resource != nullptr;
-	}
-
-	bool StaticImage::setItemResource(const std::string& _name)
-	{
-		IResourcePtr resource = ResourceManager::getInstance().getByName(_name, false);
-		setItemResourcePtr(resource ? resource->castType<ResourceImageSet>() : nullptr);
-		return resource != nullptr;
-	}
-
-	void StaticImage::setItemResourcePtr(ResourceImageSetPtr _resource)
-	{
-		if (mResource == _resource)
-			return;
-
-		// если первый раз то устанавливаем дефолтное
-		if (mResource == nullptr && _resource != nullptr)
-		{
-			if (mItemGroup.empty())
-			{
-				EnumeratorGroupImage iter_group = _resource->getEnumerator();
-				while (iter_group.next())
-				{
-					mItemGroup = iter_group.current().name;
-					if (mItemName.empty() && !iter_group.current().indexes.empty())
-					{
-						mItemName = iter_group.current().indexes[0].name;
-					}
-					break;
-				}
-			}
-			else if (mItemName.empty())
-			{
-				EnumeratorGroupImage iter_group = _resource->getEnumerator();
-				while (iter_group.next())
-				{
-					if (mItemGroup == iter_group.current().name)
-					{
-						if (!iter_group.current().indexes.empty())
-						{
-							mItemName = iter_group.current().indexes[0].name;
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		mResource = _resource;
-		if (!mResource || mItemGroup.empty() || mItemName.empty()) updateSelectIndex(ITEM_NONE);
-		else setItemResourceInfo(mResource->getIndexInfo(mItemGroup, mItemName));
-	}
-
-	void StaticImage::setItemGroup(const std::string& _group)
-	{
-		if (mItemGroup == _group)
-			return;
-
-		mItemGroup = _group;
-		if (!mResource || mItemGroup.empty() || mItemName.empty()) updateSelectIndex(ITEM_NONE);
-		else setItemResourceInfo(mResource->getIndexInfo(mItemGroup, mItemName));
-	}
-
-	void StaticImage::setItemName(const std::string& _name)
-	{
-		if (mItemName == _name)
-			return;
-
-		mItemName = _name;
-		if (!mResource || mItemGroup.empty() || mItemName.empty()) updateSelectIndex(ITEM_NONE);
-		else setItemResourceInfo(mResource->getIndexInfo(mItemGroup, mItemName));
-	}
-
-	void StaticImage::setItemResourceInfo(ResourceImageSetPtr _resource, const std::string& _group, const std::string& _name)
-	{
-		mResource = _resource;
-		mItemGroup = _group;
-		mItemName = _name;
-		if (!mResource || mItemGroup.empty() || mItemName.empty()) updateSelectIndex(ITEM_NONE);
-		else setItemResourceInfo(mResource->getIndexInfo(mItemGroup, mItemName));
-	}
-
-	void StaticImage::frameAdvise(bool _advise)
-	{
-		if ( _advise )
-		{
-			if ( ! mFrameAdvise )
-			{
-				MyGUI::Gui::getInstance().eventFrameStart += MyGUI::newDelegate( this, &StaticImage::frameEntered );
-				mFrameAdvise = true;
-			}
-		}
-		else
-		{
-			if ( mFrameAdvise )
-			{
-				MyGUI::Gui::getInstance().eventFrameStart -= MyGUI::newDelegate( this, &StaticImage::frameEntered );
-				mFrameAdvise = false;
-			}
-		}
-	}
-
-	void StaticImage::setImageIndex(size_t _index)
-	{
-		setItemSelect(_index);
-	}
-
-	size_t StaticImage::getImageIndex()
-	{
-		return getItemSelect();
-	}
-
-	void StaticImage::setItemSelect(size_t _index)
-	{
-		if (mIndexSelect != _index) updateSelectIndex(_index);
-	}
-
-	void StaticImage::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "Image_Texture") setImageTexture(_value);
-		else if (_key == "Image_Coord") setImageCoord(utility::parseValue<IntCoord>(_value));
-		else if (_key == "Image_Tile") setImageTile(utility::parseValue<IntSize>(_value));
-		else if (_key == "Image_Index") setItemSelect(utility::parseValue<size_t>(_value));
-		else if (_key == "Image_Resource") setItemResource(_value);
-		else if (_key == "Image_Group") setItemGroup(_value);
-		else if (_key == "Image_Name") setItemName(_value);
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_StaticText.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_StaticText.cpp
deleted file mode 100644
index 41c5f5a609..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_StaticText.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_StaticText.h"
-
-namespace MyGUI
-{
-
-	StaticText::StaticText()
-	{
-	}
-
-	void StaticText::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	StaticText::~StaticText()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void StaticText::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void StaticText::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// ������ ��������
-		const MapString& properties = _info->getProperties();
-		if (!properties.empty())
-		{
-			MapString::const_iterator iter = properties.end();
-			if ((iter = properties.find("FontName")) != properties.end()) setFontName(iter->second);
-			if ((iter = properties.find("FontHeight")) != properties.end()) setFontHeight(utility::parseInt(iter->second));
-			if ((iter = properties.find("TextAlign")) != properties.end()) setTextAlign(Align::parse(iter->second));
-			if ((iter = properties.find("TextColour")) != properties.end()) setTextColour(Colour::parse(iter->second));
-		}
-	}
-
-	void StaticText::shutdownWidgetSkin()
-	{
-	}
-
-	IntCoord StaticText::getTextRegion()
-	{
-		return (nullptr == mText) ? IntCoord() : mText->getCoord();
-	}
-
-	IntSize StaticText::getTextSize()
-	{
-		return (nullptr == mText) ? IntSize() : mText->getTextSize();
-	}
-
-	void StaticText::setTextAlign(Align _align)
-	{
-		if (mText != nullptr) mText->setTextAlign(_align);
-	}
-
-	Align StaticText::getTextAlign()
-	{
-		if (mText != nullptr) return mText->getTextAlign();
-		return Align::Default;
-	}
-
-	void StaticText::setTextColour(const Colour& _colour)
-	{
-		if (nullptr != mText) mText->setTextColour(_colour);
-	}
-
-	const Colour& StaticText::getTextColour()
-	{
-		return (nullptr == mText) ? Colour::Zero : mText->getTextColour();
-	}
-
-	void StaticText::setFontName(const std::string& _font)
-	{
-		if (nullptr != mText) mText->setFontName(_font);
-	}
-
-	const std::string& StaticText::getFontName()
-	{
-		if (nullptr == mText)
-		{
-			static std::string empty;
-			return empty;
-		}
-		return mText->getFontName();
-	}
-
-	void StaticText::setFontHeight(int _height)
-	{
-		if (nullptr != mText) mText->setFontHeight(_height);
-	}
-
-	int StaticText::getFontHeight()
-	{
-		return (nullptr == mText) ? 0 : mText->getFontHeight();
-	}
-
-	void StaticText::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "Text_TextColour") setTextColour(utility::parseValue<Colour>(_value));
-		else if (_key == "Text_TextAlign") setTextAlign(utility::parseValue<Align>(_value));
-		else if (_key == "Text_FontName") setFontName(_value);
-		else if (_key == "Text_FontHeight") setFontHeight(utility::parseValue<int>(_value));
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SubSkin.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SubSkin.cpp
deleted file mode 100644
index fa140e79d1..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SubSkin.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		02/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_SubSkin.h"
-#include "MyGUI_RenderItem.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_LanguageManager.h"
-#include "MyGUI_LayerNode.h"
-#include "MyGUI_CommonStateInfo.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_TextureUtility.h"
-
-namespace MyGUI
-{
-
-	SubSkin::SubSkin() :
-		ISubWidgetRect(),
-		mEmptyView(false),
-		mCurrentColour(0xFFFFFFFF),
-		mNode(nullptr),
-		mRenderItem(nullptr)
-	{
-	}
-
-	SubSkin::~SubSkin()
-	{
-	}
-
-	void SubSkin::setVisible(bool _visible)
-	{
-		if (mVisible == _visible) return;
-		mVisible = _visible;
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void SubSkin::setAlpha(float _alpha)
-	{
-		uint32 alpha = ((uint8)(_alpha*255) << 24);
-		mCurrentColour = (mCurrentColour & 0x00FFFFFF) | (alpha & 0xFF000000);
-
-		if (nullptr != mNode)
-			mNode->outOfDate(mRenderItem);
-	}
-
-	void SubSkin::_correctView()
-	{
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void SubSkin::_setAlign(const IntCoord& _oldcoord, bool _update)
-	{
-		_setAlign(_oldcoord.size(), _update);
-	}
-
-	void SubSkin::_setAlign(const IntSize& _oldsize, bool _update)
-	{
-		// необходимо разобраться
-		bool need_update = true;//_update;
-
-		// первоначальное выравнивание
-		if (mAlign.isHStretch())
-		{
-			// растягиваем
-			mCoord.width = mCoord.width + (mCroppedParent->getWidth() - _oldsize.width);
-			need_update = true;
-			mIsMargin = true; // при изменении размеров все пересчитывать
-		}
-		else if (mAlign.isRight())
-		{
-			// двигаем по правому краю
-			mCoord.left = mCoord.left + (mCroppedParent->getWidth() - _oldsize.width);
-			need_update = true;
-		}
-		else if (mAlign.isHCenter())
-		{
-			// выравнивание по горизонтали без растяжения
-			mCoord.left = (mCroppedParent->getWidth() - mCoord.width) / 2;
-			need_update = true;
-		}
-
-		if (mAlign.isVStretch())
-		{
-			// растягиваем
-			mCoord.height = mCoord.height + (mCroppedParent->getHeight() - _oldsize.height);
-			need_update = true;
-			mIsMargin = true; // при изменении размеров все пересчитывать
-		}
-		else if (mAlign.isBottom())
-		{
-			// двигаем по нижнему краю
-			mCoord.top = mCoord.top + (mCroppedParent->getHeight() - _oldsize.height);
-			need_update = true;
-		}
-		else if (mAlign.isVCenter())
-		{
-			// выравнивание по вертикали без растяжения
-			mCoord.top = (mCroppedParent->getHeight() - mCoord.height) / 2;
-			need_update = true;
-		}
-
-		if (need_update)
-		{
-			mCurrentCoord = mCoord;
-			_updateView();
-		}
-
-	}
-
-	void SubSkin::_updateView()
-	{
-		//mAbsolutePosition = mCroppedParent->getAbsolutePosition() + mCoord.point();
-		bool margin = _checkMargin();
-
-		mEmptyView = ((0 >= _getViewWidth()) || (0 >= _getViewHeight()));
-
-		mCurrentCoord.left = mCoord.left + mMargin.left;
-		mCurrentCoord.top = mCoord.top + mMargin.top;
-
-		// вьюпорт стал битым
-		if (margin)
-		{
-			// проверка на полный выход за границу
-			if (_checkOutside())
-			{
-
-				// запоминаем текущее состояние
-				mIsMargin = margin;
-
-				// обновить перед выходом
-				if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-				return;
-			}
-		}
-
-		// мы обрезаны или были обрезаны
-		if ( mIsMargin || margin )
-		{
-			mCurrentCoord.width = _getViewWidth();
-			mCurrentCoord.height = _getViewHeight();
-
-			if ( (mCurrentCoord.width > 0) && (mCurrentCoord.height > 0) )
-			{
-				// теперь смещаем текстуру
-				float UV_lft = mMargin.left / (float)mCoord.width;
-				float UV_top = mMargin.top / (float)mCoord.height;
-				float UV_rgt = (mCoord.width - mMargin.right) / (float)mCoord.width;
-				float UV_btm = (mCoord.height - mMargin.bottom) / (float)mCoord.height;
-
-				float UV_sizeX = mRectTexture.right - mRectTexture.left;
-				float UV_sizeY = mRectTexture.bottom - mRectTexture.top;
-
-				float UV_lft_total = mRectTexture.left + UV_lft * UV_sizeX;
-				float UV_top_total = mRectTexture.top + UV_top * UV_sizeY;
-				float UV_rgt_total = mRectTexture.right - (1-UV_rgt) * UV_sizeX;
-				float UV_btm_total = mRectTexture.bottom - (1-UV_btm) * UV_sizeY;
-
-				mCurrentTexture.set(UV_lft_total, UV_top_total, UV_rgt_total, UV_btm_total);
-			}
-		}
-
-		if (mIsMargin && !margin)
-		{
-			// мы не обрезаны, но были, ставим базовые координаты
-			mCurrentTexture = mRectTexture;
-		}
-
-		// запоминаем текущее состояние
-		mIsMargin = margin;
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void SubSkin::createDrawItem(ITexture* _texture, ILayerNode * _node)
-	{
-		MYGUI_ASSERT(!mRenderItem, "mRenderItem must be nullptr");
-
-		mNode = _node;
-		mRenderItem = mNode->addToRenderItem(_texture, this);
-		mRenderItem->addDrawItem(this, VertexQuad::VertexCount);
-	}
-
-	void SubSkin::destroyDrawItem()
-	{
-		MYGUI_ASSERT(mRenderItem, "mRenderItem must be not nullptr");
-
-		mNode = nullptr;
-		mRenderItem->removeDrawItem(this);
-		mRenderItem = nullptr;
-	}
-
-	void SubSkin::_setUVSet(const FloatRect& _rect)
-	{
-		if (mRectTexture == _rect) return;
-		mRectTexture = _rect;
-
-		// если обрезаны, то просчитываем с учето обрезки
-		if (mIsMargin)
-		{
-			float UV_lft = mMargin.left / (float)mCoord.width;
-			float UV_top = mMargin.top / (float)mCoord.height;
-			float UV_rgt = (mCoord.width - mMargin.right) / (float)mCoord.width;
-			float UV_btm = (mCoord.height - mMargin.bottom) / (float)mCoord.height;
-
-			float UV_sizeX = mRectTexture.right - mRectTexture.left;
-			float UV_sizeY = mRectTexture.bottom - mRectTexture.top;
-
-			float UV_lft_total = mRectTexture.left + UV_lft * UV_sizeX;
-			float UV_top_total = mRectTexture.top + UV_top * UV_sizeY;
-			float UV_rgt_total = mRectTexture.right - (1-UV_rgt) * UV_sizeX;
-			float UV_btm_total = mRectTexture.bottom - (1-UV_btm) * UV_sizeY;
-
-			mCurrentTexture.set(UV_lft_total, UV_top_total, UV_rgt_total, UV_btm_total);
-		}
-
-		// мы не обрезаны, базовые координаты
-		else
-		{
-			mCurrentTexture = mRectTexture;
-		}
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void SubSkin::doRender()
-	{
-		if (!mVisible || mEmptyView) return;
-
-		VertexQuad* quad = (VertexQuad*)mRenderItem->getCurrentVertextBuffer();
-
-		const RenderTargetInfo& info = mRenderItem->getRenderTarget()->getInfo();
-
-		float vertex_z = info.maximumDepth;
-
-		float vertex_left = ((info.pixScaleX * (float)(mCurrentCoord.left + mCroppedParent->getAbsoluteLeft() - info.leftOffset) + info.hOffset) * 2) - 1;
-		float vertex_right = vertex_left + (info.pixScaleX * (float)mCurrentCoord.width * 2);
-		float vertex_top = -(((info.pixScaleY * (float)(mCurrentCoord.top + mCroppedParent->getAbsoluteTop() - info.topOffset) + info.vOffset) * 2) - 1);
-		float vertex_bottom = vertex_top - (info.pixScaleY * (float)mCurrentCoord.height * 2);
-
-		quad->set(
-			vertex_left,
-			vertex_top,
-			vertex_right,
-			vertex_bottom,
-			vertex_z,
-			mCurrentTexture.left,
-			mCurrentTexture.top,
-			mCurrentTexture.right,
-			mCurrentTexture.bottom,
-			mCurrentColour
-			);
-
-		mRenderItem->setLastVertexCount(VertexQuad::VertexCount);
-	}
-
-	void SubSkin::_setColour(const Colour& _value)
-	{
-		uint32 colour = texture_utility::toColourARGB(_value);
-		texture_utility::convertColour(colour, RenderManager::getInstance().getVertexFormat());
-		mCurrentColour = (colour & 0x00FFFFFF) | (mCurrentColour & 0xFF000000);
-
-		if (nullptr != mNode)
-			mNode->outOfDate(mRenderItem);
-	}
-
-	void SubSkin::setStateData(IStateInfo* _data)
-	{
-		_setUVSet(_data->castType<SubSkinStateInfo>()->getRect());
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SubWidgetManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SubWidgetManager.cpp
deleted file mode 100644
index 2f942c6bb4..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_SubWidgetManager.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_SubWidgetManager.h"
-#include "MyGUI_FactoryManager.h"
-#include "MyGUI_CommonStateInfo.h"
-
-#include "MyGUI_SubSkin.h"
-#include "MyGUI_MainSkin.h"
-#include "MyGUI_RotatingSkin.h"
-#include "MyGUI_SimpleText.h"
-#include "MyGUI_EditText.h"
-#include "MyGUI_RawRect.h"
-#include "MyGUI_TileRect.h"
-
-namespace MyGUI
-{
-
-	MYGUI_INSTANCE_IMPLEMENT( SubWidgetManager )
-
-	void SubWidgetManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		FactoryManager& factory = FactoryManager::getInstance();
-
-		factory.registerFactory<SubSkinStateInfo>("BasisSkin/State", "SubSkin");
-		factory.registerFactory<SubSkinStateInfo>("BasisSkin/State", "MainSkin");
-		factory.registerFactory<SubSkinStateInfo>("BasisSkin/State", "RotatingSkin");
-		factory.registerFactory<SubSkinStateInfo>("BasisSkin/State", "RawRect");
-		factory.registerFactory<TileRectStateInfo>("BasisSkin/State", "TileRect");
-		factory.registerFactory<EditTextStateInfo>("BasisSkin/State", "EditText");
-		factory.registerFactory<EditTextStateInfo>("BasisSkin/State", "SimpleText");
-
-		factory.registerFactory<SubSkin>("BasisSkin");
-		factory.registerFactory<MainSkin>("BasisSkin");
-		factory.registerFactory<RotatingSkin>("BasisSkin");
-		factory.registerFactory<RawRect>("BasisSkin");
-		factory.registerFactory<TileRect>("BasisSkin");
-		factory.registerFactory<EditText>("BasisSkin");
-		factory.registerFactory<SimpleText>("BasisSkin");
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void SubWidgetManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		FactoryManager& factory = FactoryManager::getInstance();
-
-		factory.unregisterFactory("BasisSkin/State", "SubSkin");
-		factory.unregisterFactory("BasisSkin/State", "MainSkin");
-		factory.unregisterFactory("BasisSkin/State", "RotatingSkin");
-		factory.unregisterFactory("BasisSkin/State", "RawRect");
-		factory.unregisterFactory("BasisSkin/State", "TileRect");
-		factory.unregisterFactory("BasisSkin/State", "EditText");
-		factory.unregisterFactory("BasisSkin/State", "SimpleText");
-
-		factory.unregisterFactory<SubSkin>("BasisSkin");
-		factory.unregisterFactory<MainSkin>("BasisSkin");
-		factory.unregisterFactory<RotatingSkin>("BasisSkin");
-		factory.unregisterFactory<RawRect>("BasisSkin");
-		factory.unregisterFactory<TileRect>("BasisSkin");
-		factory.unregisterFactory<EditText>("BasisSkin");
-		factory.unregisterFactory<SimpleText>("BasisSkin");
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Tab.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Tab.cpp
deleted file mode 100644
index 892e346a51..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Tab.cpp
+++ /dev/null
@@ -1,730 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Tab.h"
-#include "MyGUI_ControllerManager.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_Button.h"
-#include "MyGUI_TabItem.h"
-#include "MyGUI_ResourceSkin.h"
-
-namespace MyGUI
-{
-
-	const float TAB_SPEED_FADE_COEF = 5.0f;
-
-	Tab::Tab() :
-		mOffsetTab(0),
-		mButtonShow(false),
-		mWidthBar(0),
-		mWidgetBar(nullptr),
-		mButtonLeft(nullptr),
-		mButtonRight(nullptr),
-		mButtonList(nullptr),
-		mButtonDecor(nullptr),
-		mEmptyBarWidget(nullptr),
-		mItemTemplate(nullptr),
-		mStartIndex(0),
-		mIndexSelect(ITEM_NONE),
-		mButtonDefaultWidth(1),
-		mSmoothShow(true),
-		mButtonAutoWidth(true),
-		mShutdown(false)
-	{
-	}
-
-	void Tab::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	Tab::~Tab()
-	{
-		mShutdown = true;
-		shutdownWidgetSkin();
-	}
-
-	void Tab::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void Tab::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// парсим свойства
-		const MapString& properties = _info->getProperties();
-		if (!properties.empty())
-		{
-			MapString::const_iterator iter = properties.find("OffsetBar");
-			if (iter != properties.end()) mOffsetTab = utility::parseInt(iter->second);
-
-			iter = properties.find("ButtonSkin");
-			if (iter != properties.end()) mButtonSkinName = iter->second;
-			iter = properties.find("EmptyBarSkin");
-			if (iter != properties.end()) mEmptySkinName = iter->second;
-		}
-
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "Bar")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetBar, "widget already assigned");
-				mWidgetBar = (*iter);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "Left")
-			{
-				MYGUI_DEBUG_ASSERT( ! mButtonLeft, "widget already assigned");
-				mButtonLeft = (*iter)->castType<Button>();
-				mButtonLeft->setVisible(false);
-				mButtonLeft->eventMouseButtonClick = newDelegate(this, &Tab::notifyPressedButtonEvent);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "Right")
-			{
-				MYGUI_DEBUG_ASSERT( ! mButtonRight, "widget already assigned");
-				mButtonRight = (*iter)->castType<Button>();
-				mButtonRight->setVisible(false);
-				mButtonRight->eventMouseButtonClick = newDelegate(this, &Tab::notifyPressedButtonEvent);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "List")
-			{
-				MYGUI_DEBUG_ASSERT( ! mButtonList, "widget already assigned");
-				mButtonList = (*iter)->castType<Button>();
-				mButtonList->setVisible(false);
-				mButtonList->eventMouseButtonClick = newDelegate(this, &Tab::notifyPressedButtonEvent);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "ButtonDecor")
-			{
-				MYGUI_DEBUG_ASSERT( ! mButtonDecor, "widget already assigned");
-				mButtonDecor = *iter;
-				mButtonDecor->setVisible(false);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "ShowPatch")
-			{
-				mWidgetsPatch.push_back((*iter));
-				(*iter)->setVisible(false);
-			}
-			else if ((*(*iter)->_getInternalData<std::string>() == "Sheet") || (*(*iter)->_getInternalData<std::string>() == "TabItem"))
-			{
-				MYGUI_DEBUG_ASSERT( ! mItemTemplate, "widget already assigned");
-				mItemTemplate = (*iter);
-				mItemTemplate->setVisible(false);
-			}
-		}
-		//MYGUI_ASSERT(nullptr != mWidgetBar, "Child Widget Bar not found in skin (Tab must have Bar)");
-		//MYGUI_ASSERT(nullptr != mItemTemplate, "Child Widget TabItem not found in skin (Tab must have TabItem (Sheet) )");
-
-		// создаем виджет, носитель скина пустоты бара
-		mEmptyBarWidget = _getWidgetBar()->createWidget<Widget>(mEmptySkinName, IntCoord(), Align::Left | Align::Top);
-
-		updateBar();
-	}
-
-	void Tab::shutdownWidgetSkin()
-	{
-		mWidgetsPatch.clear();
-		mWidgetBar = nullptr;
-		mButtonLeft = nullptr;
-		mButtonRight = nullptr;
-		mButtonList = nullptr;
-		mButtonDecor = nullptr;
-		mItemTemplate = nullptr;
-		mEmptyBarWidget = nullptr;
-	}
-
-
-	// переопределяем для особого обслуживания страниц
-	Widget* Tab::baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name)
-	{
-		if ((TabItem::getClassTypeName() == _type) || ("Sheet" == _type))
-		{
-			TabItem* sheet = static_cast<TabItem*>(Base::baseCreateWidget(_style, TabItem::getClassTypeName(), "Default", _getWidgetTemplate()->getCoord(), _getWidgetTemplate()->getAlign(), "", _name));
-			_insertItem(ITEM_NONE, _name, sheet, Any::Null);
-
-			return sheet;
-		}
-		return Base::baseCreateWidget(_style, _type, _skin, _coord, _align, _layer, _name);
-	}
-
-	TabItem* Tab::insertItemAt(size_t _index, const UString& _name, Any _data)
-	{
-		MYGUI_ASSERT_RANGE_INSERT(_index, mItemsInfo.size(), "Tab::insertItem");
-
-		TabItem* sheet = static_cast<TabItem*>(Base::baseCreateWidget(WidgetStyle::Child, TabItem::getClassTypeName(), "Default", _getWidgetTemplate()->getCoord(), _getWidgetTemplate()->getAlign(), "", ""));
-		_insertItem(_index, _name, sheet, _data);
-
-		return sheet;
-	}
-
-	void Tab::setPosition(const IntPoint& _point)
-	{
-		Base::setPosition(_point);
-
-		updateBar();
-	}
-
-	void Tab::setSize(const IntSize& _size)
-	{
-		Base::setSize(_size);
-
-		updateBar();
-	}
-
-	void Tab::setCoord(const IntCoord& _coord)
-	{
-		Base::setCoord(_coord);
-
-		updateBar();
-	}
-
-	void Tab::updateBar()
-	{
-		// подстраховка
-		if (_getWidgetBar()->getWidth() < 1) return;
-
-		if ((_getWidgetBar()->getWidth() < mWidthBar) && (1 < mItemsInfo.size()))
-		{
-			if (!mButtonShow)
-			{
-				mButtonShow = true;
-				if (nullptr != mButtonLeft) mButtonLeft->setVisible(true);
-				if (nullptr != mButtonRight) mButtonRight->setVisible(true);
-				if (nullptr != mButtonList) mButtonList->setVisible(true);
-				if (nullptr != mButtonDecor) mButtonDecor->setVisible(true);
-				for (VectorWidgetPtr::iterator iter=mWidgetsPatch.begin(); iter!=mWidgetsPatch.end(); ++iter) (*iter)->setVisible(true);
-				if (mWidgetBar != nullptr)
-					mWidgetBar->setSize(mWidgetBar->getWidth() - mOffsetTab, mWidgetBar->getHeight());
-			}
-		}
-		else
-		{
-			if (mButtonShow)
-			{
-				mButtonShow = false;
-				if (nullptr != mButtonLeft) mButtonLeft->setVisible(false);
-				if (nullptr != mButtonRight) mButtonRight->setVisible(false);
-				if (nullptr != mButtonList) mButtonList->setVisible(false);
-				if (nullptr != mButtonDecor) mButtonDecor->setVisible(false);
-				for (VectorWidgetPtr::iterator iter=mWidgetsPatch.begin(); iter!=mWidgetsPatch.end(); ++iter) (*iter)->setVisible(false);
-				if (mWidgetBar != nullptr)
-					mWidgetBar->setSize(mWidgetBar->getWidth() + mOffsetTab, mWidgetBar->getHeight());
-			}
-		}
-
-		// проверяем правильность стартового индекса
-		if (mStartIndex > 0)
-		{
-			// считаем длинну видимых кнопок
-			int width = 0;
-			for (size_t pos=mStartIndex; pos<mItemsInfo.size(); pos++) width += mItemsInfo[pos].width;
-
-			// уменьшаем индекс до тех пор пока кнопка до индекста полностью не влезет в бар
-			while ((mStartIndex > 0) && ((width + mItemsInfo[mStartIndex-1].width) <= _getWidgetBar()->getWidth()))
-			{
-				mStartIndex--;
-				width += mItemsInfo[mStartIndex].width;
-			}
-		}
-
-		// проверяем и обновляем бар
-		int width = 0;
-		size_t count = 0;
-		size_t pos=mStartIndex;
-		for (; pos<mItemsInfo.size(); pos++)
-		{
-			// текущая кнопка не влазиет
-			if (width > _getWidgetBar()->getWidth()) break;
-
-			// следующая не влазиет
-			TabItemInfo& info = mItemsInfo[pos];
-			if ((width + info.width) > _getWidgetBar()->getWidth())
-			{
-				break;
-			}
-
-			// проверяем физическое наличие кнопки
-			if (count >= mItemButton.size()) _createItemButton();
-
-			// если кнопка не соответствует, то изменяем ее
-			Button* button = mItemButton[count]->castType<Button>();
-			button->setVisible(true);
-
-			// корректируем нажатость кнопки
-			button->setButtonPressed(pos == mIndexSelect);
-
-			if (button->getCaption() != info.name)
-				button->setCaption(info.name);
-			// положение кнопки
-			IntCoord coord(width, 0, info.width, _getWidgetBar()->getHeight());
-			if (coord != button->getCoord())
-				button->setCoord(coord);
-
-			width += info.width;
-			count ++;
-		}
-
-		// скрываем кнопки что были созданны, но не видны
-		while (count < mItemButton.size())
-		{
-			mItemButton[count]->setVisible(false);
-			count ++;
-		}
-
-		bool right = true;
-		if (pos == mItemsInfo.size()) right = false;
-
-		// корректируем виджет для пустоты
-		if (width < _getWidgetBar()->getWidth())
-		{
-			mEmptyBarWidget->setVisible(true);
-			mEmptyBarWidget->setCoord(width, 0, _getWidgetBar()->getWidth() - width, _getWidgetBar()->getHeight());
-		}
-		else
-		{
-			mEmptyBarWidget->setVisible(false);
-		}
-
-		// корректируем доступность стрелок
-		if (mStartIndex == 0)
-		{
-			if (nullptr != mButtonLeft) mButtonLeft->setEnabled(false);
-		}
-		else
-		{
-			if (nullptr != mButtonLeft) mButtonLeft->setEnabled(true);
-		}
-
-		if (right)
-		{
-			if (nullptr != mButtonRight) mButtonRight->setEnabled(true);
-		}
-		else
-		{
-			if (nullptr != mButtonRight) mButtonRight->setEnabled(false);
-		}
-
-	}
-
-	void Tab::notifyPressedButtonEvent(MyGUI::Widget* _sender)
-	{
-		if (_sender == mButtonLeft)
-		{
-			if (mStartIndex > 0)
-			{
-				mStartIndex --;
-				updateBar();
-			}
-		}
-		else if (_sender == mButtonRight)
-		{
-			if ((mStartIndex+1) < mItemsInfo.size())
-			{
-				mStartIndex ++;
-				// в updateBar() будет подкорректированно если что
-				updateBar();
-			}
-		}
-		else if (_sender == mButtonList)
-		{
-		}
-	}
-
-	void Tab::notifyPressedBarButtonEvent(MyGUI::Widget* _sender)
-	{
-		size_t select = *_sender->_getInternalData<size_t>() + mStartIndex;
-		// щелкнули по той же кнопке
-		if (select == mIndexSelect)
-		{
-			// стараемся показать выделенную кнопку
-			beginToItemSelected();
-			return;
-		}
-		size_t old = mIndexSelect;
-		mIndexSelect = select;
-
-		size_t count = 0;
-		for (size_t pos=0; pos<mItemButton.size(); pos++)
-		{
-			Button* button = mItemButton[count]->castType<Button>();
-			if (button->isVisible())
-			{
-				// корректируем нажатость кнопки
-				button->setButtonPressed((pos + mStartIndex) == mIndexSelect);
-			}
-			count ++;
-		}
-
-		// стараемся показать выделенную кнопку
-		beginToItemSelected();
-
-		// поднимаем страницу для пикинга
-		_forcePeek(mItemsInfo[mIndexSelect].item);
-
-		_showItem(mItemsInfo[mIndexSelect].item, true, mSmoothShow);
-		_showItem(mItemsInfo[old].item, false, mSmoothShow);
-
-		eventTabChangeSelect(this, mIndexSelect);
-	}
-
-	void Tab::beginToItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "Tab::beginToItemAt");
-
-		// подстраховка
-		if (_getWidgetBar()->getWidth() < 1) return;
-
-		if (_index == mStartIndex) return;
-		else if (_index < mStartIndex)
-		{
-			mStartIndex = _index;
-			updateBar();
-		}
-		else
-		{
-			// длинна бара от старт индекса до нужной включительно
-			int width = 0;
-			for (size_t pos=mStartIndex; pos<=_index; pos++)
-			{
-				width += mItemsInfo[pos].width;
-			}
-
-			// уменьшем старт индекс пока не появиться нужная
-			bool change = false;
-			while ((mStartIndex < _index) && (width > _getWidgetBar()->getWidth()))
-			{
-				width -= mItemsInfo[mStartIndex].width;
-				mStartIndex ++;
-				change = true;
-			}
-			if (change) updateBar();
-
-		}
-	}
-
-	void Tab::setButtonDefaultWidth(int _width)
-	{
-		mButtonDefaultWidth = _width;
-		if (mButtonDefaultWidth < 1) mButtonDefaultWidth = 1;
-		setButtonAutoWidth(false);
-	}
-
-	void Tab::setButtonAutoWidth(bool _auto)
-	{
-		mButtonAutoWidth = _auto;
-
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			int width;
-			if (mButtonAutoWidth) width = _getTextWidth(mItemsInfo[pos].name);
-			else width = mButtonDefaultWidth;
-
-			mWidthBar += width - mItemsInfo[pos].width;
-			mItemsInfo[pos].width = width;
-		}
-
-		updateBar();
-	}
-
-	void Tab::setButtonWidthAt(size_t _index, int _width)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "Tab::setButtonWidthAt");
-
-		if (_width <= 0)
-		{
-			if (mButtonAutoWidth) _width = _getTextWidth(mItemsInfo[_index].name);
-			else _width = mButtonDefaultWidth;
-		}
-
-		mWidthBar += _width - mItemsInfo[_index].width;
-		mItemsInfo[_index].width = _width;
-
-		updateBar();
-	}
-
-	void Tab::setItemNameAt(size_t _index, const UString& _name)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "Tab::setItemNameAt");
-		mItemsInfo[_index].name = _name;
-
-		int width;
-		if (mButtonAutoWidth) width = _getTextWidth(_name);
-		else width = mButtonDefaultWidth;
-
-		mWidthBar += width - mItemsInfo[_index].width;
-		mItemsInfo[_index].width = width;
-
-		updateBar();
-	}
-
-	void Tab::setIndexSelected(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "Tab::setIndexSelected");
-		if (mIndexSelect == _index) return;
-		size_t old = mIndexSelect;
-		mIndexSelect = _index;
-		updateBar();
-
-		// поднимаем страницу для пикинга
-		if (mSmoothShow) _forcePeek(mItemsInfo[mIndexSelect].item);
-
-		_showItem(mItemsInfo[mIndexSelect].item, true, mSmoothShow);
-		_showItem(mItemsInfo[old].item, false, mSmoothShow);
-
-		beginToItemSelected();
-	}
-
-	void Tab::actionWidgetHide(Widget* _widget)
-	{
-		_widget->setVisible(false);
-		_widget->setEnabled(true);
-	}
-
-	void Tab::_showItem(TabItem* _item, bool _show, bool _smooth)
-	{
-		if (!_smooth)
-		{
-			ControllerManager::getInstance().removeItem(_item);
-			_item->setAlpha(ALPHA_MAX);
-
-			_item->setVisible(_show);
-
-			return;
-		}
-
-		if (_show)
-		{
-			ControllerFadeAlpha* controller = createControllerFadeAlpha(ALPHA_MAX, TAB_SPEED_FADE_COEF, true);
-			ControllerManager::getInstance().addItem(_item, controller);
-		}
-		else
-		{
-			ControllerFadeAlpha* controller = createControllerFadeAlpha(ALPHA_MIN, TAB_SPEED_FADE_COEF, false);
-			controller->eventPostAction = newDelegate(this, &Tab::actionWidgetHide);
-			ControllerManager::getInstance().addItem(_item, controller);
-		}
-	}
-
-	void Tab::_createItemButton()
-	{
-		Button* button = _getWidgetBar()->createWidget<Button>(mButtonSkinName, IntCoord(), Align::Left | Align::Top);
-		button->eventMouseButtonClick = newDelegate(this, &Tab::notifyPressedBarButtonEvent);
-		button->_setInternalData(mItemButton.size()); // порядковый номер
-		mItemButton.push_back(button);
-	}
-
-	int Tab::_getTextWidth(const UString& _text)
-	{
-		if (0 == mItemButton.size()) _createItemButton();
-
-		UString save = mItemButton[0]->getCaption();
-		mItemButton[0]->setCaption(_text);
-
-		ISubWidgetText* text = mItemButton[0]->getSubWidgetText();
-		const IntSize& size = text ? text->getTextSize() : IntSize();
-		const IntCoord& coord = text ? text->getCoord() : IntCoord();
-
-		mItemButton[0]->setCaption(save);
-
-		return size.width + mItemButton[0]->getWidth() - coord.width;
-	}
-
-	void Tab::_notifyDeleteItem(TabItem* _sheet)
-	{
-		// общий шутдаун виджета
-		if (mShutdown) return;
-
-		size_t index = getItemIndex(_sheet);
-
-		mWidthBar -= mItemsInfo[index].width;
-		mItemsInfo.erase(mItemsInfo.begin() + index);
-
-		if (0 == mItemsInfo.size()) mIndexSelect = ITEM_NONE;
-		else
-		{
-			if (index < mIndexSelect) mIndexSelect --;
-			else if (index == mIndexSelect)
-			{
-				if (mIndexSelect == mItemsInfo.size()) mIndexSelect --;
-				mItemsInfo[mIndexSelect].item->setVisible(true);
-				mItemsInfo[mIndexSelect].item->setAlpha(ALPHA_MAX);
-			}
-		}
-
-		updateBar();
-	}
-
-	void Tab::_insertItem(size_t _index, const UString& _name, TabItem* _sheet, Any _data)
-	{
-		if (_index == ITEM_NONE) _index = mItemsInfo.size();
-
-		// добавляем инфу о вкладке
-		int width = (mButtonAutoWidth ? _getTextWidth(_name) : mButtonDefaultWidth);
-		mWidthBar += width;
-
-		mItemsInfo.insert(mItemsInfo.begin() + _index, TabItemInfo(width, _name, _sheet, _data));
-
-		// первая вкладка
-		if (1 == mItemsInfo.size()) mIndexSelect = 0;
-		else
-		{
-			_sheet->setVisible(false);
-			if (_index <= mIndexSelect) mIndexSelect ++;
-		}
-
-		updateBar();
-	}
-
-	void Tab::setItemDataAt(size_t _index, Any _data)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "Tab::setItemDataAt");
-		mItemsInfo[_index].data = _data;
-	}
-
-	int Tab::getButtonWidthAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "Tab::getButtonWidthAt");
-		return mItemsInfo[_index].width;
-	}
-
-	const UString& Tab::getItemNameAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "Tab::getItemNameAt");
-		return mItemsInfo[_index].name;
-	}
-
-	TabItem* Tab::getItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "Tab::getItemAt");
-		return mItemsInfo[_index].item;
-	}
-
-	void Tab::removeItemAt(size_t _index)
-	{
-		MYGUI_ASSERT_RANGE(_index, mItemsInfo.size(), "Tab::removeItemAt");
-		this->_destroyChildWidget(mItemsInfo[_index].item);
-	}
-
-	void Tab::removeAllItems()
-	{
-		while (mItemsInfo.size() > 0)
-		{
-			this->_destroyChildWidget(mItemsInfo.back().item);
-		}
-	}
-
-	ControllerFadeAlpha* Tab::createControllerFadeAlpha(float _alpha, float _coef, bool _enable)
-	{
-		ControllerItem* item = ControllerManager::getInstance().createItem(ControllerFadeAlpha::getClassTypeName());
-		ControllerFadeAlpha* controller = item->castType<ControllerFadeAlpha>();
-
-		controller->setAlpha(_alpha);
-		controller->setCoef(_coef);
-		controller->setEnabled(_enable);
-
-		return controller;
-	}
-
-	size_t Tab::getItemIndex(TabItem* _item)
-	{
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			if (mItemsInfo[pos].item == _item) return pos;
-		}
-		MYGUI_EXCEPT("item (" << _item << ") not found, source 'Tab::getItemIndex'");
-	}
-
-	size_t Tab::findItemIndex(TabItem* _item)
-	{
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			if (mItemsInfo[pos].item == _item) return pos;
-		}
-		return ITEM_NONE;
-	}
-
-	size_t Tab::findItemIndexWith(const UString& _name)
-	{
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			if (mItemsInfo[pos].name == _name) return pos;
-		}
-		return ITEM_NONE;
-	}
-
-	TabItem* Tab::findItemWith(const UString& _name)
-	{
-		for (size_t pos=0; pos<mItemsInfo.size(); pos++)
-		{
-			if (mItemsInfo[pos].name == _name) return mItemsInfo[pos].item;
-		}
-		return nullptr;
-	}
-
-	TabItem* Tab::getItemSelected()
-	{
-		return getIndexSelected() != ITEM_NONE ? getItemAt(getIndexSelected()) : nullptr;
-	}
-
-	void Tab::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "Tab_ButtonWidth") setButtonDefaultWidth(utility::parseValue<int>(_value));
-		else if (_key == "Tab_ButtonAutoWidth") setButtonAutoWidth(utility::parseValue<bool>(_value));
-		else if (_key == "Tab_SmoothShow") setSmoothShow(utility::parseValue<bool>(_value));
-		else if (_key == "Tab_AddItem") addItem(_value);
-		else if (_key == "Tab_SelectItem") setIndexSelected(utility::parseValue<size_t>(_value));
-
-#ifndef MYGUI_DONT_USE_OBSOLETE
-		else if (_key == "Tab_AddSheet")
-		{
-			MYGUI_LOG(Warning, "Tab_AddSheet is obsolete, use Tab_AddItem");
-			addItem(_value);
-		}
-		else if (_key == "Tab_SelectSheet")
-		{
-			MYGUI_LOG(Warning, "Tab_SelectSheet is obsolete, use Tab_SelectItem");
-			setIndexSelected(utility::parseValue<size_t>(_value));
-		}
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-	Widget* Tab::_getWidgetTemplate()
-	{
-		return mItemTemplate == nullptr ? this : mItemTemplate;
-	}
-
-	Widget* Tab::_getWidgetBar()
-	{
-		return mWidgetBar == nullptr ? this : mWidgetBar;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_TabItem.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_TabItem.cpp
deleted file mode 100644
index fc0a37a7aa..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_TabItem.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		01/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_TabItem.h"
-
-namespace MyGUI
-{
-
-	TabItem::TabItem() :
-		mOwner(nullptr)
-	{
-	}
-
-	void TabItem::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		mOwner = getParent()->castType<Tab>();
-	}
-
-	TabItem::~TabItem()
-	{
-		mOwner->_notifyDeleteItem(this);
-	}
-
-	void TabItem::setSelected(bool _value)
-	{
-		if (_value) setItemSelected();
-	}
-
-	void TabItem::setCaption(const UString& _value)
-	{
-		mOwner->setItemName(this, _value);
-	}
-
-	const UString& TabItem::getCaption()
-	{
-		return mOwner->getItemName(this);
-	}
-
-	void TabItem::setButtonWidth(int _width)
-	{
-		mOwner->setButtonWidth(this, _width);
-	}
-
-	int TabItem::getButtonWidth()
-	{
-		return mOwner->getButtonWidth(this);
-	}
-
-	const UString& TabItem::getItemName()
-	{
-		return mOwner->getItemName(this);
-	}
-
-	void TabItem::setItemName(const UString& _name)
-	{
-		mOwner->setItemName(this, _name);
-	}
-
-	void TabItem::setItemData(Any _data)
-	{
-		mOwner->setItemData(this, _data);
-	}
-
-	void TabItem::setItemSelected()
-	{
-		mOwner->setItemSelected(this);
-	}
-
-	void TabItem::removeItem()
-	{
-		mOwner->removeItem(this);
-	}
-
-	void TabItem::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "TabItem_ButtonWidth") setButtonWidth(utility::parseValue<int>(_value));
-		else if (_key == "TabItem_Select") setSelected(utility::parseValue<bool>(_value));
-
-#ifndef MYGUI_DONT_USE_OBSOLETE
-		else if (_key == "Sheet_ButtonWidth")
-		{
-			MYGUI_LOG(Warning, "Sheet_ButtonWidth is obsolete, use TabItem_ButtonWidth");
-			setButtonWidth(utility::parseValue<int>(_value));
-		}
-		else if (_key == "Sheet_Select")
-		{
-			MYGUI_LOG(Warning, "Sheet_Select is obsolete, use TabItem_Select");
-			setSelected(utility::parseValue<bool>(_value));
-		}
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_TextIterator.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_TextIterator.cpp
deleted file mode 100644
index 74d1fa369a..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_TextIterator.cpp
+++ /dev/null
@@ -1,554 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		12/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_TextIterator.h"
-
-namespace MyGUI
-{
-
-	TextIterator::TextIterator() :
-		mPosition(0),
-		mSize(ITEM_NONE),
-		mFirst(true),
-		mHistory(nullptr)
-	{
-	}
-
-	TextIterator::TextIterator(const UString& _text, VectorChangeInfo * _history) :
-		mText(_text),
-		mCurrent(mText.begin()),
-		mEnd(mText.end()),
-		mSave(mEnd),
-		mPosition(0),
-		mSize(ITEM_NONE),
-		mFirst(true),
-		mHistory(_history)
-	{
-	}
-
-	bool TextIterator::moveNext()
-	{
-		if (mCurrent == mEnd) return false;
-		else if (mFirst)
-		{
-			mFirst = false;
-			return true;
-		}
-
-		// ставим на следующий символ проскакивая все тэги
-		for (UString::iterator iter=mCurrent; iter!=mEnd; ++iter)
-		{
-
-			if ((*iter) == L'#')
-			{
-
-				// следующий символ
-				++ iter;
-				if (iter == mEnd)
-				{
-					mCurrent = mEnd;
-					return false;
-				}
-
-				// две решетки подряд
-				if ((*iter) == L'#')
-				{
-
-					// следующий символ
-					mPosition ++;
-					iter++;
-					if (iter == mEnd)
-					{
-						mCurrent = mEnd;
-						return false;
-					}
-
-					// указатель на следующий символ
-					mCurrent = iter;
-					return true;
-				}
-
-				// остальные 5 символов цвета
-				for (size_t pos=0; pos<5; pos++)
-				{
-					// следующий символ
-					++ iter;
-					if (iter == mEnd)
-					{
-						mCurrent = mEnd;
-						return false;
-					}
-				}
-
-			}
-			else
-			{
-
-				// обыкновенный символ
-				mPosition ++;
-				iter++;
-				if (iter == mEnd)
-				{
-					mCurrent = mEnd;
-					return false;
-				}
-
-				// указатель на следующий символ
-				mCurrent = iter;
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	// возвращает цвет
-	UString TextIterator::getTagColour(bool _clear)
-	{
-		if (mCurrent == mEnd) return L"";
-
-		UString::iterator iter = mCurrent;
-		UString colour;
-		// нам нужен последний цвет
-		while (getTagColour(colour, iter))
-		{
-			if (_clear)
-			{
-				// обязательно обновляем итераторы
-				iter = mCurrent = erase(mCurrent, iter);
-				mEnd = mText.end();
-			}
-		}
-		return colour;
-	}
-
-	// возвращает цвет
-	bool TextIterator::getTagColour(UString& _colour)
-	{
-		if (mCurrent == mEnd) return false;
-
-		UString::iterator iter = mCurrent;
-
-		// нам нужен последний цвет
-		bool ret = false;
-		while (true)
-		{
-			if (!getTagColour(_colour, iter)) break;
-			ret = true;
-		}
-
-		return ret;
-	}
-
-	bool TextIterator::setTagColour(const Colour& _colour)
-	{
-		if (mCurrent == mEnd) return false;
-		// очищаем все цвета
-		clearTagColour();
-		// на всякий
-		if (mCurrent == mEnd) return false;
-
-		const size_t SIZE = 16;
-		wchar_t buff[SIZE];
-
-#ifdef __MINGW32__
-		swprintf(buff, L"#%.2X%.2X%.2X\0", (int)(_colour.red*255), (int)(_colour.green*255), (int)(_colour.blue*255));
-#else
-		swprintf(buff, SIZE, L"#%.2X%.2X%.2X\0", (int)(_colour.red*255), (int)(_colour.green*255), (int)(_colour.blue*255));
-#endif
-		// непосредственная вставка
-		UString tmpStr = UString(buff);
-		insert(mCurrent, tmpStr);
-
-		return true;
-	}
-
-	bool TextIterator::setTagColour(UString _colour)
-	{
-		if (mCurrent == mEnd) return false;
-		// очищаем все цвета
-		clearTagColour();
-		// на всякий
-		if (mCurrent == mEnd) return false;
-
-		// проверяем на цвет хоть чуть чуть
-		if ( (_colour.size() != 7) || (_colour.find(L'#', 1) != _colour.npos) ) return false;
-
-		// непосредственная вставка
-		insert(mCurrent, _colour);
-
-		return true;
-	}
-
-	// возвращает размер строки
-	size_t TextIterator::getSize() const
-	{
-		if (mSize != ITEM_NONE) return mSize;
-		mSize = mPosition;
-
-		for (UString::iterator iter=mCurrent; iter!=mEnd; ++iter)
-		{
-
-			if ((*iter) == L'#')
-			{
-				// следующий символ
-				++ iter;
-				if (iter == mEnd) break;
-
-				// тэг цвета
-				if ((*iter) != L'#')
-				{
-					// остальные 5 символов цвета
-					for (size_t pos=0; pos<5; pos++)
-					{
-						++ iter;
-						if (iter == mEnd)
-						{
-							--iter;
-							break;
-						}
-					}
-					continue;
-				}
-			}
-
-			// обыкновенный символ
-			mSize ++;
-		}
-
-		return mSize;
-	}
-
-	// возвращает текст без тегов
-	UString TextIterator::getOnlyText(const UString& _text)
-	{
-		UString ret;
-		ret.reserve(_text.size());
-
-		UString::const_iterator end = _text.end();
-		for (UString::const_iterator iter=_text.begin(); iter!=end; ++iter)
-		{
-
-			if ((*iter) == L'#')
-			{
-				// следующий символ
-				++ iter;
-				if (iter == end) break;
-
-				// тэг цвета
-				if ((*iter) != L'#')
-				{
-					// остальные 5 символов цвета
-					for (size_t pos=0; pos<5; pos++)
-					{
-						++ iter;
-						if (iter == end)
-						{
-							--iter;
-							break;
-						}
-					}
-					continue;
-				}
-			}
-
-			// обыкновенный символ
-			ret.push_back(*iter);
-		}
-
-		return ret;
-	}
-
-	// возвращает цвет
-	bool TextIterator::getTagColour(UString& _colour, UString::iterator& _iter)
-	{
-		if ( (_iter == mEnd) || ((*_iter) != L'#') ) return false;
-
-		// следующий символ
-		++_iter;
-		if ( (_iter == mEnd) || ((*_iter) == L'#') ) return false;
-
-		// берем цвет
-		wchar_t buff[16] = L"#FFFFFF\0";
-		buff[1] = (wchar_t)(*_iter);
-		for (size_t pos=2; pos<7; pos++)
-		{
-			++_iter;
-			if ( _iter == mEnd ) return false;
-			buff[pos] = (Char)(*_iter);
-		}
-
-		// ставим на следующий тег или символ
-		++_iter;
-
-		// возвращаем цвет
-		_colour = buff;
-		return true;
-	}
-
-	void TextIterator::clearNewLine(UString& _text)
-	{
-		for (UString::iterator iter=_text.begin(); iter!=_text.end(); ++iter)
-		{
-			if ( ((*iter) == FontCodeType::NEL) ||
-				((*iter) == FontCodeType::CR) ||
-				((*iter) == FontCodeType::LF) )
-			{
-				(*iter) = FontCodeType::Space;
-			}
-		}
-	}
-
-	bool TextIterator::saveStartPoint()
-	{
-		if (mCurrent == mEnd) return false;
-		mSave = mCurrent;
-		return true;
-	}
-
-	UString TextIterator::getFromStart()
-	{
-		if (mSave == mEnd) return L"";
-		size_t start = mSave-mText.begin();
-		return mText.substr(start, mCurrent-mText.begin()-start);
-	}
-
-	bool TextIterator::eraseFromStart()
-	{
-		if (mSave == mEnd) return false;
-		mCurrent = erase(mSave, mCurrent);
-		mSave = mEnd = mText.end();
-		return true;
-	}
-
-	void TextIterator::insertText(const UString& _insert, bool _multiLine)
-	{
-		UString text = _insert;
-		if (!_multiLine) clearNewLine(text);
-		insert(mCurrent, text);
-	}
-
-	void TextIterator::setText(const UString& _text, bool _multiLine)
-	{
-		// сначала все очищаем
-		clear();
-		// а теперь вставляем
-		UString text = _text;
-		if (!_multiLine) clearNewLine(text);
-		insert(mCurrent, text);
-	}
-
-	UString TextIterator::getTextCharInfo(Char _char)
-	{
-		if (_char == L'#') return L"##";
-		wchar_t buff[16] = L"_\0";
-		buff[0] = _char;
-		return buff;
-	}
-
-	UString TextIterator::convertTagColour(const Colour& _colour)
-	{
-		const size_t SIZE = 16;
-		wchar_t buff[SIZE];
-//FIXME
-#ifdef __MINGW32__
-        swprintf(buff, L"#%.2X%.2X%.2X\0", (int)(_colour.red*255), (int)(_colour.green*255), (int)(_colour.blue*255));
-#else
-        swprintf(buff, SIZE, L"#%.2X%.2X%.2X\0", (int)(_colour.red*255), (int)(_colour.green*255), (int)(_colour.blue*255));
-#endif
-		return buff;
-	}
-
-	UString TextIterator::toTagsString(const UString& _text)
-	{
-		// преобразуем в строку с тегами
-		UString text(_text);
-		for (UString::iterator iter=text.begin(); iter!=text.end(); ++iter)
-		{
-			// потом переделать через TextIterator чтобы отвязать понятие тег от эдита
-			if (L'#' == (*iter)) iter = text.insert(++iter, L'#');
-		}
-		return text;
-	}
-
-	void TextIterator::insert(UString::iterator& _start, UString& _insert)
-	{
-		// сбрасываем размер
-		mSize = ITEM_NONE;
-		// записываем в историю
-		if (mHistory) mHistory->push_back(TextCommandInfo(_insert, _start-mText.begin(), TextCommandInfo::COMMAND_INSERT));
-		// запоминаем позицию итератора
-		size_t pos = _start - mText.begin();
-		size_t pos_save = (mSave==mEnd) ? ITEM_NONE : _start - mText.begin();
-		// непосредственно вставляем
-		mText.insert(_start, _insert.begin(), _insert.end());
-		// возвращаем итераторы
-		_start = mText.begin() + pos;
-		mEnd = mText.end();
-		(pos_save==ITEM_NONE) ? mSave = mEnd : mSave = mText.begin() + pos_save;
-	}
-
-	UString::iterator TextIterator::erase(UString::iterator _start, UString::iterator _end)
-	{
-		// сбрасываем размер
-		mSize = ITEM_NONE;
-		// сохраняем в историю
-		size_t start = _start-mText.begin();
-		if (mHistory) mHistory->push_back(TextCommandInfo(mText.substr(start, _end-_start), start, TextCommandInfo::COMMAND_ERASE));
-		// возвращаем итератор
-		return mText.erase(_start, _end);
-	}
-
-	void TextIterator::clear()
-	{
-		if (mText.empty()) return;
-
-		// записываем в историю
-		if (mHistory) mHistory->push_back(TextCommandInfo(mText, 0, TextCommandInfo::COMMAND_ERASE));
-
-		// все сбрасываем
-		mText.clear();
-		mCurrent = mText.begin();
-		mEnd = mSave = mText.end();
-		mSize = ITEM_NONE;
-	}
-
-	void TextIterator::cutMaxLength(size_t _max)
-	{
-		if ( (mSize != ITEM_NONE) && (mSize <= _max) ) return;
-		if (mPosition > _max)
-		{
-			// придется считать сначала
-			mSize = mPosition = 0;
-			mCurrent = mText.begin();
-			mEnd = mSave = mText.end();
-		}
-
-		mSize = mPosition;
-
-		for (UString::iterator iter=mCurrent; iter!=mEnd; ++iter)
-		{
-
-			if ((*iter) == L'#')
-			{
-				// следующий символ
-				++ iter;
-				if (iter == mEnd) break;
-
-				// тэг цвета
-				if ((*iter) != L'#')
-				{
-					// остальные 5 символов цвета
-					for (size_t pos=0; pos<5; pos++)
-					{
-						++ iter;
-						if (iter == mEnd)
-						{
-							-- iter;
-							break;
-						}
-					}
-					continue;
-				}
-			}
-
-			// проверяем и обрезаем
-			if (mSize == _max)
-			{
-				mPosition = mSize; // сохраняем
-				mCurrent = erase(iter, mEnd);
-				mSave = mEnd = mText.end();
-				mSize = mPosition; // восстанавливаем
-				return;
-			}
-
-			// увеличиваем
-			mSize ++;
-		}
-	}
-
-	void TextIterator::cutMaxLengthFromBeginning(size_t _max)
-	{
-		// узнаем размер без тегов
-		size_t size = getSize();
-		if (size <= _max) return;
-
-		// разница
-		size_t diff = size - _max;
-
-		// последний цвет
-		UString::iterator iter_colour = mEnd;
-
-		// теперь пройдем от начала и узнаем реальную позицию разницы
-		UString::iterator iter=mText.begin();
-		for (; iter!=mEnd; ++iter)
-		{
-			if ((*iter) == L'#')
-			{
-				UString::iterator save = iter;
-
-				// следующий символ
-				++ iter;
-				if (iter == mEnd) break;
-
-				// тэг цвета
-				if ((*iter) != L'#')
-				{
-					// остальные 5 символов цвета
-					for (size_t pos=0; pos<5; pos++)
-					{
-						++ iter;
-						if (iter == mEnd)
-						{
-							-- iter;
-							break;
-						}
-					}
-					// сохраняем цвет
-					iter_colour = save;
-				}
-				continue;
-			}
-			// обычный символ был
-			if (diff == 0) break;
-			-- diff;
-		}
-
-		UString colour;
-		// если бы цвет, то вставляем назад
-		if (iter_colour != mEnd)
-		{
-			colour.append(iter_colour, iter_colour + size_t(7));
-		}
-
-		mCurrent = erase(mText.begin(), iter);
-		mEnd = mText.end();
-		mSave = mText.end(); //FIXME
-		mPosition = 0;
-		mSize = _max;
-
-		if ( ! colour.empty() ) setTagColour(colour);
-
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_TextureUtility.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_TextureUtility.cpp
deleted file mode 100644
index 0dfc1a4b2f..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_TextureUtility.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		09/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_TextureUtility.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_DataManager.h"
-#include "MyGUI_Bitwise.h"
-
-namespace MyGUI
-{
-
-	namespace texture_utility
-	{
-
-		const IntSize& getTextureSize(const std::string& _texture, bool _cache)
-		{
-			// ��������� ��������
-			static std::string old_texture;
-			static IntSize old_size;
-
-			if (old_texture == _texture && _cache)
-				return old_size;
-			old_texture = _texture;
-			old_size.clear();
-
-			if (_texture.empty())
-				return old_size;
-
-			RenderManager& render = RenderManager::getInstance();
-
-			if (nullptr == render.getTexture(_texture))
-			{
-				if (!DataManager::getInstance().isDataExist(_texture))
-				{
-					MYGUI_LOG(Error, "Texture '" + _texture + "' not found");
-					return old_size;
-				}
-				else
-				{
-					ITexture* texture = render.createTexture(_texture);
-					texture->loadFromFile(_texture);
-				}
-			}
-
-			ITexture* texture = render.getTexture(_texture);
-			if (texture == nullptr)
-			{
-				MYGUI_LOG(Error, "Texture '" + _texture + "' not found");
-				return old_size;
-			}
-
-			old_size.set(texture->getWidth(), texture->getHeight());
-
-	#if MYGUI_DEBUG_MODE == 1
-			if (!Bitwise::isPO2(old_size.width) || !Bitwise::isPO2(old_size.height))
-			{
-				MYGUI_LOG(Warning, "Texture '" + _texture + "' have non power of two size");
-			}
-	#endif
-
-			return old_size;
-		}
-
-		uint32 toColourARGB(const Colour& _colour)
-		{
-			uint32 val32 = uint8(_colour.alpha * 255);
-			val32 <<= 8;
-			val32 += uint8(_colour.red * 255);
-			val32 <<= 8;
-			val32 += uint8(_colour.green * 255);
-			val32 <<= 8;
-			val32 += uint8(_colour.blue * 255);
-			return val32;
-		}
-
-	} // namespace texture_utility
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_TileRect.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_TileRect.cpp
deleted file mode 100644
index 87348f5314..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_TileRect.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_TileRect.h"
-#include "MyGUI_RenderItem.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_LanguageManager.h"
-#include "MyGUI_LayerNode.h"
-#include "MyGUI_CommonStateInfo.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_TextureUtility.h"
-
-namespace MyGUI
-{
-
-	const size_t TILERECT_COUNT_VERTEX = 16 * VertexQuad::VertexCount;
-
-	TileRect::TileRect() :
-		mEmptyView(false),
-		mCurrentColour(0xFFFFFFFF),
-		mNode(nullptr),
-		mRenderItem(nullptr),
-		mCountVertex(TILERECT_COUNT_VERTEX),
-		mRealTileWidth(0),
-		mRealTileHeight(0),
-		mTextureHeightOne(0),
-		mTextureWidthOne(0),
-		mTileH(true),
-		mTileV(true)
-	{
-	}
-
-	TileRect::~TileRect()
-	{
-	}
-
-	void TileRect::setVisible(bool _visible)
-	{
-		if (mVisible == _visible) return;
-		mVisible = _visible;
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void TileRect::setAlpha(float _alpha)
-	{
-		uint32 alpha = ((uint8)(_alpha*255) << 24);
-		mCurrentColour = (mCurrentColour & 0x00FFFFFF) | (alpha & 0xFF000000);
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void TileRect::_correctView()
-	{
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void TileRect::_setAlign(const IntCoord& _oldcoord, bool _update)
-	{
-		_setAlign(_oldcoord.size(), _update);
-	}
-
-	void TileRect::_setAlign(const IntSize& _oldsize, bool _update)
-	{
-		// необходимо разобраться
-		bool need_update = true;//_update;
-
-		// первоначальное выравнивание
-		if (mAlign.isHStretch())
-		{
-			// растягиваем
-			mCoord.width = mCoord.width + (mCroppedParent->getWidth() - _oldsize.width);
-			need_update = true;
-			mIsMargin = true; // при изменении размеров все пересчитывать
-		}
-		else if (mAlign.isRight())
-		{
-			// двигаем по правому краю
-			mCoord.left = mCoord.left + (mCroppedParent->getWidth() - _oldsize.width);
-			need_update = true;
-		}
-		else if (mAlign.isHCenter())
-		{
-			// выравнивание по горизонтали без растяжения
-			mCoord.left = (mCroppedParent->getWidth() - mCoord.width) / 2;
-			need_update = true;
-		}
-
-		if (mAlign.isVStretch())
-		{
-			// растягиваем
-			mCoord.height = mCoord.height + (mCroppedParent->getHeight() - _oldsize.height);
-			need_update = true;
-			mIsMargin = true; // при изменении размеров все пересчитывать
-		}
-		else if (mAlign.isBottom())
-		{
-			// двигаем по нижнему краю
-			mCoord.top = mCoord.top + (mCroppedParent->getHeight() - _oldsize.height);
-			need_update = true;
-		}
-		else if (mAlign.isVCenter())
-		{
-			// выравнивание по вертикали без растяжения
-			mCoord.top = (mCroppedParent->getHeight() - mCoord.height) / 2;
-			need_update = true;
-		}
-
-		if (need_update)
-		{
-			mCurrentCoord = mCoord;
-			if (!mTileH) mTileSize.width = mCoord.width;
-			if (!mTileV) mTileSize.height = mCoord.height;
-			_updateView();
-		}
-
-	}
-
-	void TileRect::_updateView()
-	{
-		bool margin = _checkMargin();
-
-		mEmptyView = ((0 >= _getViewWidth()) || (0 >= _getViewHeight()));
-
-		mCurrentCoord.left = mCoord.left + mMargin.left;
-		mCurrentCoord.top = mCoord.top + mMargin.top;
-		mCurrentCoord.width = _getViewWidth();
-		mCurrentCoord.height = _getViewHeight();
-
-		// подсчитываем необходимое колличество тайлов
-		if (!mEmptyView)
-		{
-			size_t count = 0;
-			if (!mTileSize.empty())
-			{
-				size_t count_x = mCoord.width / mTileSize.width;
-				if ((mCoord.width % mTileSize.width) > 0) count_x ++;
-				size_t count_y = mCoord.height / mTileSize.height;
-				if ((mCoord.height % mTileSize.height) > 0) count_y ++;
-				count = count_y * count_x * VertexQuad::VertexCount;
-			}
-
-			// нужно больше вершин
-			if (count > mCountVertex)
-			{
-				mCountVertex = count + TILERECT_COUNT_VERTEX;
-				if (nullptr != mRenderItem) mRenderItem->reallockDrawItem(this, mCountVertex);
-			}
-		}
-
-		// вьюпорт стал битым
-		if (margin)
-		{
-			// проверка на полный выход за границу
-			if (_checkOutside())
-			{
-				// запоминаем текущее состояние
-				mIsMargin = margin;
-
-				// обновить перед выходом
-				if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-				return;
-			}
-		}
-
-		// запоминаем текущее состояние
-		mIsMargin = margin;
-
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void TileRect::_setUVSet(const FloatRect& _rect)
-	{
-		mCurrentTexture = _rect;
-		if (nullptr != mNode) mNode->outOfDate(mRenderItem);
-	}
-
-	void TileRect::doRender()
-	{
-		if (!mVisible || mEmptyView || mTileSize.empty()) return;
-
-		VertexQuad* quad = (VertexQuad*)mRenderItem->getCurrentVertextBuffer();
-
-		const RenderTargetInfo& info = mRenderItem->getRenderTarget()->getInfo();
-
-		// размер одного тайла
-		mRealTileWidth = info.pixScaleX * (float)(mTileSize.width) * 2;
-		mRealTileHeight = info.pixScaleY * (float)(mTileSize.height) * 2;
-
-		mTextureHeightOne = (mCurrentTexture.bottom - mCurrentTexture.top) / mRealTileHeight;
-		mTextureWidthOne = (mCurrentTexture.right - mCurrentTexture.left) / mRealTileWidth;
-
-		float vertex_z = info.maximumDepth;
-
-		// абсолютный размер окна
-		float window_left = ((info.pixScaleX * (float)(mCoord.left + mCroppedParent->getAbsoluteLeft() - info.leftOffset) + info.hOffset) * 2) - 1;
-		float window_top = -(((info.pixScaleY * (float)(mCoord.top + mCroppedParent->getAbsoluteTop() - info.topOffset) + info.vOffset) * 2) - 1);
-
-		// размер вьюпорта
-		float real_left = ((info.pixScaleX * (float)(mCurrentCoord.left + mCroppedParent->getAbsoluteLeft() - info.leftOffset) + info.hOffset) * 2) - 1;
-		float real_right = real_left + (info.pixScaleX * (float)mCurrentCoord.width * 2);
-		float real_top = -(((info.pixScaleY * (float)(mCurrentCoord.top + mCroppedParent->getAbsoluteTop() - info.topOffset) + info.vOffset) * 2) - 1);
-		float real_bottom = real_top - (info.pixScaleY * (float)mCurrentCoord.height * 2);
-
-		size_t count = 0;
-
-		float left = window_left;
-		float right = window_left;
-		float top = window_top;
-		float bottom = window_top;
-
-		for (int y=0; y<mCoord.height; y+=mTileSize.height)
-		{
-			top = bottom;
-			bottom -= mRealTileHeight;
-			right = window_left;
-
-			float vertex_top = top;
-			float vertex_bottom = bottom;
-			bool texture_crop_height  = false;
-
-			if (vertex_top > real_top)
-			{
-				// проверка на полный выход
-				if (vertex_bottom > real_top)
-				{
-					continue;
-				}
-				// обрезаем
-				vertex_top = real_top;
-				texture_crop_height = true;
-			}
-			if (vertex_bottom < real_bottom)
-			{
-				// вообще вниз ушли
-				if (vertex_top < real_bottom)
-				{
-					continue;
-				}
-				// обрезаем
-				vertex_bottom = real_bottom;
-				texture_crop_height = true;
-			}
-
-			for (int x=0; x<mCoord.width; x+=mTileSize.width)
-			{
-				left = right;
-				right += mRealTileWidth;
-
-				float vertex_left = left;
-				float vertex_right = right;
-				bool texture_crop_width  = false;
-
-
-				if (vertex_left < real_left)
-				{
-					// проверка на полный выход
-					if (vertex_right < real_left)
-					{
-						continue;
-					}
-					// обрезаем
-					vertex_left = real_left;
-					texture_crop_width = true;
-				}
-
-				if (vertex_right > real_right)
-				{
-					// вообще строку до конца не нуна
-					if (vertex_left > real_right)
-					{
-						continue;
-					}
-					// обрезаем
-					vertex_right = real_right;
-					texture_crop_width = true;
-				}
-
-				// текущие текстурные координаты
-				float texture_left = mCurrentTexture.left;
-				float texture_right = mCurrentTexture.right;
-				float texture_top = mCurrentTexture.top;
-				float texture_bottom = mCurrentTexture.bottom;
-
-				// смещение текстуры по вертикили
-				if (texture_crop_height)
-				{
-					// прибавляем размер смещения в текстурных координатах
-					texture_top += (top - vertex_top) * mTextureHeightOne;
-					// отнимаем размер смещения в текстурных координатах
-					texture_bottom -= (vertex_bottom - bottom) * mTextureHeightOne;
-				}
-
-				// смещение текстуры по горизонтали
-				if (texture_crop_width)
-				{
-					// прибавляем размер смещения в текстурных координатах
-					texture_left += (vertex_left - left) * mTextureWidthOne;
-					// отнимаем размер смещения в текстурных координатах
-					texture_right -= (right - vertex_right) * mTextureWidthOne;
-				}
-
-				quad[count].set(
-					vertex_left,
-					vertex_top,
-					vertex_right,
-					vertex_bottom,
-					vertex_z,
-					texture_left,
-					texture_top,
-					texture_right,
-					texture_bottom,
-					mCurrentColour
-					);
-
-				count ++;
-			}
-		}
-
-		mRenderItem->setLastVertexCount(VertexQuad::VertexCount * count);
-	}
-
-	void TileRect::createDrawItem(ITexture* _texture, ILayerNode * _node)
-	{
-		MYGUI_ASSERT(!mRenderItem, "mRenderItem must be nullptr");
-
-		mNode = _node;
-		mRenderItem = mNode->addToRenderItem(_texture, this);
-		mRenderItem->addDrawItem(this, mCountVertex);
-	}
-
-	void TileRect::destroyDrawItem()
-	{
-		MYGUI_ASSERT(mRenderItem, "mRenderItem must be not nullptr");
-
-		mNode = nullptr;
-		mRenderItem->removeDrawItem(this);
-		mRenderItem = nullptr;
-	}
-
-	void TileRect::setStateData(IStateInfo* _data)
-	{
-		TileRectStateInfo* data = _data->castType<TileRectStateInfo>();
-
-		mTileSize = data->getTileSize();
-		mTileH = data->getTileH();
-		mTileV = data->getTileV();
-		_setUVSet(data->getRect());
-	}
-
-	void TileRect::_setColour(const Colour& _value)
-	{
-		uint32 colour = texture_utility::toColourARGB(_value);
-		texture_utility::convertColour(colour, RenderManager::getInstance().getVertexFormat());
-		mCurrentColour = (colour & 0x00FFFFFF) | (mCurrentColour & 0xFF000000);
-
-		if (nullptr != mNode)
-			mNode->outOfDate(mRenderItem);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Timer.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Timer.cpp
deleted file mode 100644
index 0b5768d3d0..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Timer.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Timer.h"
-
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-#	include <windows.h>
-#	ifndef __MINGW32__
-#		pragma comment(lib, "winmm.lib")
-#	else
-#		pragma comment(lib, "libwinmm.a")
-#	endif
-#else
-#	include <sys/time.h>
-#endif
-
-namespace MyGUI
-{
-
-	Timer::Timer() :
-		mTimeStart(0)
-	{
-
-	}
-
-	void Timer::reset()
-	{
-		mTimeStart = getCurrentMilliseconds();
-	}
-
-	unsigned long Timer::getMilliseconds()
-	{
-		return getCurrentMilliseconds() - mTimeStart;
-	}
-
-	unsigned long Timer::getCurrentMilliseconds()
-	{
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
-		/*
-		We do this because clock() is not affected by timeBeginPeriod on Win32.
-		QueryPerformanceCounter is a little overkill for the amount of precision that
-		I consider acceptable. If someone submits a patch that replaces this code
-		with QueryPerformanceCounter, I wouldn't complain. Until then, timeGetTime
-		gets the results I'm after. -EMS
-
-		See: http://www.geisswerks.com/ryan/FAQS/timing.html
-		And: http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q274323&
-		*/
-		return timeGetTime();
-#else
-		struct timeval now;
-		gettimeofday(&now, NULL);
-		return (now.tv_sec)*1000+(now.tv_usec)/1000;
-		//return ( unsigned long )(( double )( clock() ) / (( double )CLOCKS_PER_SEC / 1000.0 ) );
-#endif
-	}
-
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_VScroll.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_VScroll.cpp
deleted file mode 100644
index 8726739214..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_VScroll.cpp
+++ /dev/null
@@ -1,403 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_VScroll.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_Button.h"
-#include "MyGUI_ResourceSkin.h"
-
-namespace MyGUI
-{
-
-	const int SCROLL_MOUSE_WHEEL = 50; // колличество пикселей для колеса мыши
-
-	VScroll::VScroll() :
-		mWidgetStart(nullptr),
-		mWidgetEnd(nullptr),
-		mWidgetTrack(nullptr),
-		mWidgetFirstPart(nullptr),
-		mWidgetSecondPart(nullptr),
-		mSkinRangeStart(0),
-		mSkinRangeEnd(0),
-		mScrollRange(0),
-		mScrollPosition(0),
-		mScrollPage(0),
-		mScrollViewPage(0),
-		mMinTrackSize(0),
-		mMoveToClick(false)
-	{
-	}
-
-	void VScroll::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	VScroll::~VScroll()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void VScroll::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void VScroll::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// при нуле, будет игнорировать кнопки
-		mScrollPage = 1;
-		mScrollViewPage = 1;
-
-		for (VectorWidgetPtr::iterator iter = mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "Start")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetStart, "widget already assigned");
-				mWidgetStart = (*iter)->castType<Button>();
-				mWidgetStart->eventMouseButtonPressed = newDelegate(this, &VScroll::notifyMousePressed);
-				mWidgetStart->eventMouseWheel = newDelegate(this, &VScroll::notifyMouseWheel);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "End")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetEnd, "widget already assigned");
-				mWidgetEnd = (*iter)->castType<Button>();
-				mWidgetEnd->eventMouseButtonPressed = newDelegate(this, &VScroll::notifyMousePressed);
-				mWidgetEnd->eventMouseWheel = newDelegate(this, &VScroll::notifyMouseWheel);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "Track")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetTrack, "widget already assigned");
-				mWidgetTrack = (*iter)->castType<Button>();
-				mWidgetTrack->eventMouseDrag = newDelegate(this, &VScroll::notifyMouseDrag);
-				mWidgetTrack->eventMouseButtonPressed = newDelegate(this, &VScroll::notifyMousePressed);
-				mWidgetTrack->eventMouseButtonReleased = newDelegate(this, &VScroll::notifyMouseReleased);
-				mWidgetTrack->eventMouseWheel = newDelegate(this, &VScroll::notifyMouseWheel);
-				mWidgetTrack->setVisible(false);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "FirstPart")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetFirstPart, "widget already assigned");
-				mWidgetFirstPart = (*iter)->castType<Button>();
-				mWidgetFirstPart->eventMouseButtonPressed = newDelegate(this, &VScroll::notifyMousePressed);
-				mWidgetFirstPart->eventMouseWheel = newDelegate(this, &VScroll::notifyMouseWheel);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "SecondPart")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetSecondPart, "widget already assigned");
-				mWidgetSecondPart = (*iter)->castType<Button>();
-				mWidgetSecondPart->eventMouseButtonPressed = newDelegate(this, &VScroll::notifyMousePressed);
-				mWidgetSecondPart->eventMouseWheel = newDelegate(this, &VScroll::notifyMouseWheel);
-			}
-		}
-
-		// slider don't have buttons
-		//MYGUI_ASSERT(nullptr != mWidgetTrack, "Child Button Track not found in skin (Scroll must have Track)");
-
-		// парсим свойства
-		const MapString& properties = _info->getProperties();
-		MapString::const_iterator iter = properties.find("TrackRangeMargins");
-		if (iter != properties.end())
-		{
-			IntSize range = IntSize::parse(iter->second);
-			mSkinRangeStart = range.width;
-			mSkinRangeEnd = range.height;
-		}
-		else
-		{
-			mSkinRangeStart = 0;
-			mSkinRangeEnd = 0;
-		}
-		iter = properties.find("MinTrackSize");
-		if (iter != properties.end()) mMinTrackSize = utility::parseInt(iter->second);
-		else mMinTrackSize = 0;
-
-		iter = properties.find("MoveToClick");
-		if (iter != properties.end()) mMoveToClick = utility::parseBool(iter->second);
-	}
-
-	void VScroll::shutdownWidgetSkin()
-	{
-		mWidgetStart = nullptr;
-		mWidgetEnd = nullptr;
-		mWidgetTrack = nullptr;
-		mWidgetFirstPart = nullptr;
-		mWidgetSecondPart = nullptr;
-	}
-
-	void VScroll::updateTrack()
-	{
-		if (mWidgetTrack == nullptr)
-			return;
-
-		_forcePeek(mWidgetTrack);
-		// размер диапазана в пикселях
-		int pos = getLineSize();
-
-		// скрываем если диапазан маленький или места мало
-		if ((mScrollRange < 2) || (pos <= mWidgetTrack->getHeight()))
-		{
-			mWidgetTrack->setVisible(false);
-			if ( nullptr != mWidgetFirstPart ) mWidgetFirstPart->setSize(mWidgetFirstPart->getWidth(), pos/2);
-			if ( nullptr != mWidgetSecondPart ) mWidgetSecondPart->setCoord(mWidgetSecondPart->getLeft(), pos/2 + (int)mSkinRangeStart, mWidgetSecondPart->getWidth(), pos - pos/2);
-			return;
-		}
-		// если скрыт то покажем
-		if (!mWidgetTrack->isVisible())
-		{
-			mWidgetTrack->setVisible(true);
-		}
-
-		// и обновляем позицию
-		pos = (int)(((size_t)(pos-getTrackSize()) * mScrollPosition) / (mScrollRange-1) + mSkinRangeStart);
-
-		mWidgetTrack->setPosition(mWidgetTrack->getLeft(), pos);
-		if ( nullptr != mWidgetFirstPart )
-		{
-			int height = pos + mWidgetTrack->getHeight()/2 - mWidgetFirstPart->getTop();
-			mWidgetFirstPart->setSize(mWidgetFirstPart->getWidth(), height);
-		}
-		if ( nullptr != mWidgetSecondPart )
-		{
-			int top = pos + mWidgetTrack->getHeight()/2;
-			int height = mWidgetSecondPart->getHeight() + mWidgetSecondPart->getTop() - top;
-			mWidgetSecondPart->setCoord(mWidgetSecondPart->getLeft(), top, mWidgetSecondPart->getWidth(), height);
-		}
-	}
-
-	void VScroll::TrackMove(int _left, int _top)
-	{
-		if (mWidgetTrack == nullptr)
-			return;
-
-		const IntPoint& point = InputManager::getInstance().getLastLeftPressed();
-
-		// расчитываем позицию виджета
-		int start = mPreActionOffset.top + (_top - point.top);
-		if (start < (int)mSkinRangeStart) start = (int)mSkinRangeStart;
-		else if (start > (mCoord.height - (int)mSkinRangeEnd - mWidgetTrack->getHeight())) start = (mCoord.height - (int)mSkinRangeEnd - mWidgetTrack->getHeight());
-		if (mWidgetTrack->getTop() != start) mWidgetTrack->setPosition(mWidgetTrack->getLeft(), start);
-
-		// расчитываем положение соответствующее позиции
-		// плюс пол позиции
-		int pos = start - (int)mSkinRangeStart + (getLineSize() - getTrackSize()) / (((int)mScrollRange-1) * 2);
-		// высчитываем ближайшее значение и обновляем
-		pos = pos * (int)(mScrollRange-1) / (getLineSize() - getTrackSize());
-
-		// проверяем на выходы и изменения
-		if (pos < 0) pos = 0;
-		else if (pos >= (int)mScrollRange) pos = (int)mScrollRange - 1;
-		if (pos == (int)mScrollPosition) return;
-
-		mScrollPosition = pos;
-		// отсылаем событие
-		eventScrollChangePosition(this, (int)mScrollPosition);
-	}
-
-	void VScroll::notifyMousePressed(Widget* _sender, int _left, int _top, MouseButton _id)
-	{
-		// диспечерезируем нажатие своих детей как свое
-		eventMouseButtonPressed(this, _left, _top, _id);
-
-		if (MouseButton::Left != _id) return;
-
-		if (mMoveToClick && mWidgetTrack != _sender)
-		{
-			mPreActionOffset = InputManager::getInstance().getLastLeftPressed();
-			const IntPoint& point = InputManager::getInstance().getMousePositionByLayer() - getAbsolutePosition();
-
-			TrackMove(point.left, point.top);
-
-		}
-		else if (_sender == mWidgetStart)
-		{
-			// минимальное значение
-			if (mScrollPosition == 0) return;
-
-			// расчитываем следующее положение
-			if (mScrollPosition > mScrollPage) mScrollPosition -= mScrollPage;
-			else mScrollPosition = 0;
-
-			// оповещаем
-			eventScrollChangePosition(this, (int)mScrollPosition);
-			updateTrack();
-
-		}
-		else if (_sender == mWidgetEnd)
-		{
-			// максимальное значение
-			if ( (mScrollRange < 2) || (mScrollPosition >= (mScrollRange-1)) ) return;
-
-			// расчитываем следующее положение
-			if ((mScrollPosition + mScrollPage) < (mScrollRange-1)) mScrollPosition += mScrollPage;
-			else mScrollPosition = mScrollRange - 1;
-
-			// оповещаем
-			eventScrollChangePosition(this, (int)mScrollPosition);
-			updateTrack();
-
-		}
-		else if (_sender == mWidgetFirstPart)
-		{
-			// минимальное значение
-			if (mScrollPosition == 0) return;
-
-			// расчитываем следующее положение
-			if (mScrollPosition > mScrollViewPage) mScrollPosition -= mScrollViewPage;
-			else mScrollPosition = 0;
-
-			// оповещаем
-			eventScrollChangePosition(this, (int)mScrollPosition);
-			updateTrack();
-
-		}
-		else if (_sender == mWidgetSecondPart)
-		{
-			// максимальное значение
-			if ( (mScrollRange < 2) || (mScrollPosition >= (mScrollRange-1)) ) return;
-
-			// расчитываем следующее положение
-			if ((mScrollPosition + mScrollViewPage) < (mScrollRange-1)) mScrollPosition += mScrollViewPage;
-			else mScrollPosition = mScrollRange - 1;
-
-			// оповещаем
-			eventScrollChangePosition(this, (int)mScrollPosition);
-			updateTrack();
-
-		}
-		else if (_sender == mWidgetTrack)
-		{
-			mPreActionOffset.left = _sender->getLeft();
-			mPreActionOffset.top = _sender->getTop();
-		}
-	}
-
-	void VScroll::notifyMouseReleased(Widget* _sender, int _left, int _top, MouseButton _id)
-	{
-		updateTrack();
-	}
-
-	void VScroll::notifyMouseDrag(Widget* _sender, int _left, int _top)
-	{
-		TrackMove(_left, _top);
-	}
-
-	void VScroll::setScrollRange(size_t _range)
-	{
-		if (_range == mScrollRange) return;
-		mScrollRange = _range;
-		mScrollPosition = (mScrollPosition < mScrollRange) ? mScrollPosition : 0;
-		updateTrack();
-	}
-
-	void VScroll::setScrollPosition(size_t _position)
-	{
-		if (_position == mScrollPosition) return;
-		if (_position >= mScrollRange) _position = 0;
-		mScrollPosition = _position;
-		updateTrack();
-	}
-
-	void VScroll::setPosition(const IntPoint& _point)
-	{
-		Base::setPosition(_point);
-	}
-
-	void VScroll::setSize(const IntSize& _size)
-	{
-		Base::setSize(_size);
-		// обновляем трек
-		updateTrack();
-	}
-
-	void VScroll::setCoord(const IntCoord& _coord)
-	{
-		Base::setCoord(_coord);
-		// обновляем трек
-		updateTrack();
-	}
-
-	void VScroll::setTrackSize(int _size)
-	{
-		if (mWidgetTrack != nullptr)
-			mWidgetTrack->setSize(mWidgetTrack->getWidth(), ((int)_size < (int)mMinTrackSize)? (int)mMinTrackSize : (int)_size);
-		updateTrack();
-	}
-
-	int VScroll::getTrackSize()
-	{
-		return mWidgetTrack == nullptr ? 1 : mWidgetTrack->getHeight();
-	}
-
-	int VScroll::getLineSize()
-	{
-		return mCoord.height - (int)(mSkinRangeStart + mSkinRangeEnd);
-	}
-
-	void VScroll::onMouseWheel(int _rel)
-	{
-		notifyMouseWheel(nullptr, _rel);
-
-		Base::onMouseWheel(_rel);
-	}
-
-	void VScroll::notifyMouseWheel(Widget* _sender, int _rel)
-	{
-		if (mScrollRange < 2) return;
-
-		int offset = mScrollPosition;
-		if (_rel < 0) offset += SCROLL_MOUSE_WHEEL;
-		else offset -= SCROLL_MOUSE_WHEEL;
-
-		if (offset < 0) offset = 0;
-		else if (offset > (int)(mScrollRange - 1)) offset = mScrollRange - 1;
-
-		if ((size_t)offset != mScrollPosition)
-		{
-			mScrollPosition = offset;
-			// оповещаем
-			eventScrollChangePosition(this, (int)mScrollPosition);
-			updateTrack();
-		}
-	}
-
-	void VScroll::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "Scroll_Range") setScrollRange(utility::parseValue<size_t>(_value));
-		else if (_key == "Scroll_Position") setScrollPosition(utility::parseValue<size_t>(_value));
-		else if (_key == "Scroll_Page") setScrollPage(utility::parseValue<size_t>(_value));
-		else if (_key == "Scroll_ViewPage") setScrollViewPage(utility::parseValue<size_t>(_value));
-		else if (_key == "Scroll_MoveToClick") setMoveToClick(utility::parseValue<bool>(_value));
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Widget.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Widget.cpp
deleted file mode 100644
index d23a69e184..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Widget.cpp
+++ /dev/null
@@ -1,1724 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_SubWidgetManager.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_ResourceSkin.h"
-#include "MyGUI_WidgetDefines.h"
-#include "MyGUI_LayerItem.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_RenderItem.h"
-#include "MyGUI_ISubWidget.h"
-#include "MyGUI_ISubWidgetText.h"
-#include "MyGUI_StaticText.h"
-#include "MyGUI_FactoryManager.h"
-#include "MyGUI_LanguageManager.h"
-#include "MyGUI_CoordConverter.h"
-#include "MyGUI_RenderManager.h"
-
-namespace MyGUI
-{
-
-	const float WIDGET_TOOLTIP_TIMEOUT = 0.5f;
-
-	Widget::Widget(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name) :
-		mMaskPickInfo(nullptr),
-		mText(nullptr),
-		mMainSkin(nullptr),
-		mEnabled(true),
-		mInheritsEnabled(true),
-		mSubSkinsVisible(true),
-		mInheritsVisible(true),
-		mAlpha(ALPHA_MIN),
-		mRealAlpha(ALPHA_MIN),
-		mInheritsAlpha(true),
-		mTexture(nullptr),
-		mParent(nullptr),
-		mIWidgetCreator(nullptr),
-		mNeedKeyFocus(false),
-		mNeedMouseFocus(true),
-		mInheritsPick(false),
-		mWidgetClient(nullptr),
-		mNeedToolTip(false),
-		mEnableToolTip(true),
-		mToolTipVisible(false),
-		mToolTipCurrentTime(0),
-		mToolTipOldIndex(ITEM_NONE),
-		mWidgetStyle(WidgetStyle::Child),
-		mDisableUpdateRelative(false)
-	{
-		_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-	}
-
-	Widget::Widget() :
-		mMaskPickInfo(nullptr),
-		mText(nullptr),
-		mMainSkin(nullptr),
-		mEnabled(true),
-		mInheritsEnabled(true),
-		mSubSkinsVisible(true),
-		mInheritsVisible(true),
-		mAlpha(ALPHA_MIN),
-		mRealAlpha(ALPHA_MIN),
-		mInheritsAlpha(true),
-		mTexture(nullptr),
-		mParent(nullptr),
-		mIWidgetCreator(nullptr),
-		mNeedKeyFocus(false),
-		mNeedMouseFocus(true),
-		mInheritsPick(false),
-		mWidgetClient(nullptr),
-		mNeedToolTip(false),
-		mEnableToolTip(true),
-		mToolTipVisible(false),
-		mToolTipCurrentTime(0),
-		mToolTipOldIndex(ITEM_NONE),
-		mWidgetStyle(WidgetStyle::Child),
-		mDisableUpdateRelative(false)
-	{
-	}
-
-	void Widget::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		mCoord = IntCoord(_coord.point(), _info->getSize());
-		mStateInfo = _info->getStateInfo();
-		mMaskPickInfo = _info->getMask();
-
-		mTextureName = _info->getTextureName();
-		mTexture = RenderManager::getInstance().getTexture(mTextureName);
-
-		mAlign = _align;
-		mCroppedParent = _croppedParent;
-
-		mName = _name;
-		mParent = _parent;
-		mIWidgetCreator = _creator;
-
-		mWidgetStyle = _style;
-
-		// имя отсылателя сообщений
-		mWidgetEventSender = this;
-
-#if MYGUI_DEBUG_MODE == 1
-		// проверяем соответсвие входных данных
-		if (mWidgetStyle == WidgetStyle::Child)
-		{
-			MYGUI_ASSERT(mCroppedParent, "must be cropped");
-			MYGUI_ASSERT(mParent, "must be parent");
-		}
-		else if (mWidgetStyle == WidgetStyle::Overlapped)
-		{
-			MYGUI_ASSERT((mParent == nullptr) == (mCroppedParent == nullptr), "error cropped");
-		}
-		else if (mWidgetStyle == WidgetStyle::Popup)
-		{
-			MYGUI_ASSERT(!mCroppedParent, "cropped must be nullptr");
-			MYGUI_ASSERT(mParent, "must be parent");
-		}
-#endif
-
-		// корректируем абсолютные координаты
-		mAbsolutePosition = _coord.point();
-
-		if (nullptr != mCroppedParent)
-		{
-			mAbsolutePosition += mCroppedParent->getAbsolutePosition();
-		}
-
-		const IntSize& parent_size = mCroppedParent ? mCroppedParent->getSize() : Gui::getInstance().getViewSize();
-
-		if (parent_size.width)
-		{
-			mRelativeCoord.left = (float)_coord.left / (float)parent_size.width;
-			mRelativeCoord.width = (float)_coord.width / (float)parent_size.width;
-		}
-		else
-		{
-			mRelativeCoord.left = 0;
-			mRelativeCoord.width = 0;
-		}
-
-		if (parent_size.height)
-		{
-			mRelativeCoord.top = (float)_coord.top / (float)parent_size.height;
-			mRelativeCoord.height = (float)_coord.height / (float)parent_size.height;
-		}
-		else
-		{
-			mRelativeCoord.top = 0;
-			mRelativeCoord.height = 0;
-		}
-
-		initialiseWidgetSkin(_info, _coord.size());
-
-		// дочернее окно обыкновенное
-		if (mWidgetStyle == WidgetStyle::Child)
-		{
-			if (mParent) mParent->addChildItem(this);
-		}
-		// дочернее нуно перекрывающееся
-		else if (mWidgetStyle == WidgetStyle::Overlapped)
-		{
-			// дочернее перекрывающееся
-			if (mParent) mParent->addChildNode(this);
-		}
-	}
-
-	Widget::~Widget()
-	{
-		Gui::getInstance().eventFrameStart -= newDelegate(this, &Widget::frameEntered);
-
-		if (mToolTipVisible) eventToolTip(this, ToolTipInfo(ToolTipInfo::Hide));
-
-		shutdownWidgetSkin(true);
-
-		_destroyAllChildWidget();
-
-		// дочернее окно обыкновенное
-		if (mWidgetStyle == WidgetStyle::Child)
-		{
-			if (mParent) mParent->removeChildItem(this);
-		}
-		// дочернее нуно перекрывающееся
-		else if (mWidgetStyle == WidgetStyle::Overlapped)
-		{
-			// дочернее перекрывающееся
-			if (mParent) mParent->removeChildNode(this);
-		}
-	}
-
-	void Widget::changeWidgetSkin(const std::string& _skinname)
-	{
-		ResourceSkin* skin_info = SkinManager::getInstance().getByName(_skinname);
-		baseChangeWidgetSkin(skin_info);
-	}
-
-	void Widget::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		IntSize size = mCoord.size();
-
-		saveLayerItem();
-
-		shutdownWidgetSkin();
-		initialiseWidgetSkin(_info, size);
-
-		restoreLayerItem();
-	}
-
-	void Widget::initialiseWidgetSkin(ResourceSkin* _info, const IntSize& _size)
-	{
-		FactoryManager& factory = FactoryManager::getInstance();
-
-		mTextureName = _info->getTextureName();
-		mTexture = RenderManager::getInstance().getTexture(mTextureName);
-
-		setRenderItemTexture(mTexture);
-		mStateInfo = _info->getStateInfo();
-		Widget::setSize(_info->getSize());
-
-		// загружаем кирпичики виджета
-		for (VectorSubWidgetInfo::const_iterator iter=_info->getBasisInfo().begin(); iter!=_info->getBasisInfo().end(); ++iter)
-		{
-			IObject* object = factory.createObject("BasisSkin", (*iter).type);
-			if (object == nullptr) continue;
-
-			ISubWidget* sub = object->castType<ISubWidget>();
-			sub->_setCroppedParent(this);
-			sub->setCoord((*iter).coord);
-			sub->setAlign((*iter).align);
-
-			mSubSkinChild.push_back(sub);
-			addRenderItem(sub);
-
-			// ищем дефолтные сабвиджеты
-			if (mMainSkin == nullptr) mMainSkin = sub->castType<ISubWidgetRect>(false);
-			if (mText == nullptr) mText = sub->castType<ISubWidgetText>(false);
-		}
-
-		if (!isRootWidget())
-		{
-			// проверяем наследуемую скрытость
-			if ((!mParent->isVisible()) || (!mParent->_isInheritsVisible()))
-			{
-				bool value = false;
-				mInheritsVisible = value;
-				for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin)
-					(*skin)->setVisible(value);
-				for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget)
-					(*widget)->_setInheritsVisible(value);
-				for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget)
-					(*widget)->_setInheritsVisible(value);
-			}
-			// проверяем наследуемый дизейбл
-			if ((!mParent->isEnabled()) || (!mParent->_isInheritsEnable()))
-			{
-				bool value = false;
-				mInheritsEnabled = false;
-				for (VectorWidgetPtr::iterator iter = mWidgetChild.begin(); iter != mWidgetChild.end(); ++iter)
-					(*iter)->_setInheritsEnable(value);
-				for (VectorWidgetPtr::iterator iter = mWidgetChildSkin.begin(); iter != mWidgetChildSkin.end(); ++iter)
-					(*iter)->_setInheritsEnable(value);
-			}
-		}
-
-		Widget::setState("normal");//FIXME - явный вызов
-
-		// парсим свойства
-		const MapString& properties = _info->getProperties();
-		if (!properties.empty())
-		{
-			MapString::const_iterator iter = properties.end();
-			if ((iter = properties.find("NeedKey")) != properties.end()) setNeedKeyFocus(utility::parseBool(iter->second));
-			if ((iter = properties.find("NeedMouse")) != properties.end()) setNeedMouseFocus(utility::parseBool(iter->second));
-			if ((iter = properties.find("Pointer")) != properties.end()) mPointer = iter->second;
-			if ((iter = properties.find("Visible")) != properties.end()) { setVisible(utility::parseBool(iter->second)); }
-
-			// OBSOLETE
-			if ((iter = properties.find("AlignText")) != properties.end()) _setTextAlign(Align::parse(iter->second));
-			if ((iter = properties.find("Colour")) != properties.end()) _setTextColour(Colour::parse(iter->second));
-			if ((iter = properties.find("Show")) != properties.end()) { setVisible(utility::parseBool(iter->second)); }
-			if ((iter = properties.find("TextAlign")) != properties.end()) _setTextAlign(Align::parse(iter->second));
-			if ((iter = properties.find("TextColour")) != properties.end()) _setTextColour(Colour::parse(iter->second));
-			if ((iter = properties.find("FontName")) != properties.end()) _setFontName(iter->second);
-			if ((iter = properties.find("FontHeight")) != properties.end()) _setFontHeight(utility::parseInt(iter->second));
-		}
-
-		// выставляем альфу, корректировка по отцу автоматически
-		Widget::setAlpha(ALPHA_MAX);//FIXME - явный вызов
-
-		// создаем детей скина
-		const VectorChildSkinInfo& child = _info->getChild();
-		for (VectorChildSkinInfo::const_iterator iter=child.begin(); iter!=child.end(); ++iter)
-		{
-			//FIXME - явный вызов
-			Widget* widget = Widget::baseCreateWidget(iter->style, iter->type, iter->skin, iter->coord, iter->align, iter->layer, "");
-			widget->_setInternalData(iter->name);
-			// заполняем UserString пропертями
-			for (MapString::const_iterator prop=iter->params.begin(); prop!=iter->params.end(); ++prop)
-			{
-				widget->setUserString(prop->first, prop->second);
-			}
-			// для детей скина свой список
-			mWidgetChildSkin.push_back(widget);
-			mWidgetChild.pop_back();
-		}
-
-		Widget::setSize(_size);//FIXME - явный вызов
-	}
-
-	void Widget::shutdownWidgetSkin(bool _deep)
-	{
-		// удаляем все сабскины
-		mMainSkin = nullptr;
-		mText = nullptr;
-
-		removeAllRenderItems();
-
-		for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin)
-		{
-			delete (*skin);
-		}
-		mSubSkinChild.clear();
-
-		mStateInfo.clear();
-
-		// удаляем виджеты чтобы ли в скине
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			// Добавляем себя чтобы удалилось
-			mWidgetChild.push_back(*iter);
-			_destroyChildWidget(*iter);
-		}
-		mWidgetChildSkin.clear();
-	}
-
-	Widget* Widget::baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name)
-	{
-		Widget* widget = WidgetManager::getInstance().createWidget(_style, _type, _skin, _coord, _align, this,
-			_style == WidgetStyle::Popup ? nullptr : this, this, _name);
-
-		mWidgetChild.push_back(widget);
-
-		// присоединяем виджет с уровню
-		if (!_layer.empty() && widget->isRootWidget()) LayerManager::getInstance().attachToLayerNode(_layer, widget);
-
-		return widget;
-	}
-
-	Widget* Widget::createWidgetRealT(const std::string& _type, const std::string& _skin, const FloatCoord& _coord, Align _align, const std::string& _name)
-	{
-		return createWidgetT(_type, _skin, CoordConverter::convertFromRelative(_coord, getSize()), _align, _name);
-	}
-
-	void Widget::_updateView()
-	{
-
-		bool margin = mCroppedParent ? _checkMargin() : false;
-
-		// вьюпорт стал битым
-		if (margin)
-		{
-			// проверка на полный выход за границу
-			if (_checkOutside())
-			{
-				// запоминаем текущее состояние
-				mIsMargin = margin;
-
-				// скрываем
-				_setSubSkinVisible(false);
-
-				// для тех кому нужно подправить себя при движении
-				//for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin) (*skin)->_updateView();
-
-				// вся иерархия должна быть проверенна
-				for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateView();
-				for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateView();
-
-				return;
-			}
-
-		}
-		// мы не обрезаны и были нормальные
-		else if (!mIsMargin)
-		{
-			// запоминаем текущее состояние
-			//mIsMargin = margin;
-
-			//_setSubSkinVisible(true);
-			// для тех кому нужно подправить себя при движении
-			for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin) (*skin)->_updateView();
-
-			return;
-		}
-
-		// запоминаем текущее состояние
-		mIsMargin = margin;
-
-		// если скин был скрыт, то покажем
-		_setSubSkinVisible(true);
-
-		// обновляем наших детей, а они уже решат обновлять ли своих детей
-		for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateView();
-		for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateView();
-		for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin) (*skin)->_updateView();
-
-	}
-
-	void Widget::setCaption(const UString& _caption)
-	{
-		if (nullptr != mText) mText->setCaption(_caption);
-	}
-
-	const UString& Widget::getCaption()
-	{
-		if (nullptr == mText)
-		{
-			static UString empty;
-			return empty;
-		}
-		return mText->getCaption();
-	}
-
-	bool Widget::setState(const std::string& _state)
-	{
-		MapWidgetStateInfo::const_iterator iter = mStateInfo.find(_state);
-		if (iter == mStateInfo.end()) return false;
-		size_t index=0;
-		for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin, ++index)
-		{
-			IStateInfo* data = (*iter).second[index];
-			if (data != nullptr)
-			{
-				(*skin)->setStateData(data);
-			}
-		}
-		return true;
-	}
-
-	void Widget::_destroyChildWidget(Widget* _widget)
-	{
-		MYGUI_ASSERT(nullptr != _widget, "invalid widget pointer");
-
-		VectorWidgetPtr::iterator iter = std::find(mWidgetChild.begin(), mWidgetChild.end(), _widget);
-		if (iter != mWidgetChild.end())
-		{
-
-			// сохраняем указатель
-			MyGUI::Widget* widget = *iter;
-
-			// удаляем из списка
-			*iter = mWidgetChild.back();
-			mWidgetChild.pop_back();
-
-			// отписываем от всех
-			WidgetManager::getInstance().unlinkFromUnlinkers(_widget);
-
-			// непосредственное удаление
-			_deleteWidget(widget);
-		}
-		else
-		{
-			MYGUI_EXCEPT("Widget '" << _widget->getName() << "' not found");
-		}
-	}
-
-	// удаляет всех детей
-	void Widget::_destroyAllChildWidget()
-	{
-		WidgetManager& manager = WidgetManager::getInstance();
-		while (!mWidgetChild.empty())
-		{
-
-			// сразу себя отписывем, иначе вложенной удаление убивает все
-			Widget* widget = mWidgetChild.back();
-			mWidgetChild.pop_back();
-
-			//if (widget->isRootWidget()) widget->detachWidget();
-
-			// отписываем от всех
-			manager.unlinkFromUnlinkers(widget);
-
-			// и сами удалим, так как его больше в списке нет
-			delete widget;
-		}
-	}
-
-	IntCoord Widget::getClientCoord()
-	{
-		MYGUI_ASSERT(mWidgetClient != this, "mWidgetClient can not be this widget");
-		if (mWidgetClient != nullptr) return mWidgetClient->getCoord();
-		return IntCoord(0, 0, mCoord.width, mCoord.height);
-	}
-
-	void Widget::setAlpha(float _alpha)
-	{
-		if (mAlpha == _alpha) return;
-		mAlpha = _alpha;
-		if (nullptr != mParent) mRealAlpha = mAlpha * (mInheritsAlpha ? mParent->_getRealAlpha() : ALPHA_MAX);
-		else mRealAlpha = mAlpha;
-
-		for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateAlpha();
-		for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateAlpha();
-		for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin) (*skin)->setAlpha(mRealAlpha);
-	}
-
-	void Widget::_updateAlpha()
-	{
-		MYGUI_DEBUG_ASSERT(nullptr != mParent, "Widget must have parent");
-		mRealAlpha = mAlpha * (mInheritsAlpha ? mParent->_getRealAlpha() : ALPHA_MAX);
-
-		for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateAlpha();
-		for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateAlpha();
-		for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin) (*skin)->setAlpha(mRealAlpha);
-	}
-
-	void Widget::setInheritsAlpha(bool _inherits)
-	{
-		mInheritsAlpha = _inherits;
-		// принудительно обновляем
-		float alpha = mAlpha;
-		mAlpha = 101;
-		setAlpha(alpha);
-	}
-
-	ILayerItem * Widget::getLayerItemByPoint(int _left, int _top)
-	{
-		// проверяем попадание
-		if (!mSubSkinsVisible
-			|| !mEnabled
-			|| !mVisible
-			|| (!mNeedMouseFocus && !mInheritsPick)
-			|| !_checkPoint(_left, _top)
-			// если есть маска, проверяем еще и по маске
-			|| ((!mMaskPickInfo->empty()) && (!mMaskPickInfo->pick(IntPoint(_left - mCoord.left, _top - mCoord.top), mCoord))))
-				return nullptr;
-		// спрашиваем у детишек
-		for (VectorWidgetPtr::reverse_iterator widget= mWidgetChild.rbegin(); widget != mWidgetChild.rend(); ++widget)
-		{
-			// общаемся только с послушными детьми
-			if ((*widget)->mWidgetStyle == WidgetStyle::Popup) continue;
-
-			ILayerItem * item = (*widget)->getLayerItemByPoint(_left - mCoord.left, _top - mCoord.top);
-			if (item != nullptr) return item;
-		}
-		// спрашиваем у детишек скна
-		for (VectorWidgetPtr::reverse_iterator widget= mWidgetChildSkin.rbegin(); widget != mWidgetChildSkin.rend(); ++widget)
-		{
-			ILayerItem * item = (*widget)->getLayerItemByPoint(_left - mCoord.left, _top - mCoord.top);
-			if (item != nullptr) return item;
-		}
-		// непослушные дети
-		return mInheritsPick ? nullptr : this;
-	}
-
-	void Widget::_updateAbsolutePoint()
-	{
-		// мы рут, нам не надо
-		if (!mCroppedParent) return;
-
-		mAbsolutePosition = mCroppedParent->getAbsolutePosition() + mCoord.point();
-
-		for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateAbsolutePoint();
-		for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateAbsolutePoint();
-		for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin) (*skin)->_correctView();
-	}
-
-	void Widget::_setUVSet(const FloatRect& _rect)
-	{
-		if (nullptr != mMainSkin) mMainSkin->_setUVSet(_rect);
-	}
-
-	void Widget::_setTextureName(const std::string& _texture)
-	{
-		//if (_texture == mTextureName) return;
-
-		mTextureName = _texture;
-		mTexture = RenderManager::getInstance().getTexture(mTextureName);
-
-		setRenderItemTexture(mTexture);
-	}
-
-	const std::string& Widget::_getTextureName()
-	{
-		return mTextureName;
-	}
-
-	void Widget::_setSubSkinVisible(bool _visible)
-	{
-		if (mSubSkinsVisible == _visible) return;
-		mSubSkinsVisible = _visible;
-
-		// просто обновляем
-		for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin)
-		{
-			(*skin)->_updateView();
-		}
-	}
-
-	void Widget::_forcePeek(Widget* _widget)
-	{
-		MYGUI_ASSERT(mWidgetClient != this, "mWidgetClient can not be this widget");
-		if (mWidgetClient != nullptr) mWidgetClient->_forcePeek(_widget);
-
-		size_t size = mWidgetChild.size();
-		if ( (size < 2) || (mWidgetChild[size-1] == _widget) ) return;
-		for (size_t pos=0; pos<size; pos++)
-		{
-			if (mWidgetChild[pos] == _widget)
-			{
-				mWidgetChild[pos] = mWidgetChild[size-1];
-				mWidgetChild[size-1] = _widget;
-				return;
-			}
-		}
-	}
-
-	const std::string& Widget::getLayerName()
-	{
-		ILayer* layer = getLayer();
-		if (nullptr == layer)
-		{
-			static std::string empty;
-			return empty;
-		}
-		return layer->getName();
-	}
-
-	void Widget::_getContainer(Widget*& _list, size_t& _index)
-	{
-		_list = nullptr;
-		_index = ITEM_NONE;
-		_requestGetContainer(this, _list, _index);
-	}
-
-	Widget* Widget::findWidget(const std::string& _name)
-	{
-		if (_name == mName) return this;
-		MYGUI_ASSERT(mWidgetClient != this, "mWidgetClient can not be this widget");
-		if (mWidgetClient != nullptr) return mWidgetClient->findWidget(_name);
-		for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget)
-		{
-			Widget* find = (*widget)->findWidget(_name);
-			if (nullptr != find) return find;
-		}
-		return nullptr;
-	}
-
-	void Widget::setNeedToolTip(bool _need)
-	{
-		if (mNeedToolTip == _need) return;
-		mNeedToolTip = _need;
-
-		if (mNeedToolTip)
-		{
-			Gui::getInstance().eventFrameStart += newDelegate(this, &Widget::frameEntered);
-			mToolTipCurrentTime = 0;
-		}
-		else
-		{
-			Gui::getInstance().eventFrameStart -= newDelegate(this, &Widget::frameEntered);
-		}
-	}
-
-	void Widget::frameEntered(float _frame)
-	{
-		if ( ! mEnableToolTip ) return;
-
-		IntPoint point = InputManager::getInstance().getMousePositionByLayer();
-
-		if (mToolTipOldPoint != point)
-		{
-
-			mToolTipCurrentTime = 0;
-
-			bool inside = getAbsoluteRect().inside(point);
-			if (inside)
-			{
-				inside = false;
-				// проверяем не перекрывают ли нас
-				Widget* widget = InputManager::getInstance().getMouseFocusWidget();
-				while (widget != 0)
-				{
-					if (widget/*->getName()*/ == this/*mName*/)
-					{
-						inside = true;
-						break;
-					}
-					// если виджет берет тултип, значит сбрасываем
-					if (widget->getNeedToolTip())
-						widget = 0;//widget->getParent();
-					else
-						widget = widget->getParent();
-				}
-
-				if (inside)
-				{
-					// теперь смотрим, не поменялся ли индекс внутри окна
-					size_t index = _getContainerIndex(point);
-					if (mToolTipOldIndex != index)
-					{
-						if (mToolTipVisible)
-						{
-							mToolTipCurrentTime = 0;
-							mToolTipVisible = false;
-							eventToolTip(this, ToolTipInfo(ToolTipInfo::Hide));
-						}
-						mToolTipOldIndex = index;
-					}
-
-				}
-				else
-				{
-					if (mToolTipVisible)
-					{
-						mToolTipCurrentTime = 0;
-						mToolTipVisible = false;
-						eventToolTip(this, ToolTipInfo(ToolTipInfo::Hide));
-					}
-				}
-
-			}
-			else
-			{
-				if (mToolTipVisible)
-				{
-					mToolTipCurrentTime = 0;
-					mToolTipVisible = false;
-					eventToolTip(this, ToolTipInfo(ToolTipInfo::Hide));
-				}
-			}
-
-			mToolTipOldPoint = point;
-		}
-		else
-		{
-			bool inside = getAbsoluteRect().inside(point);
-			if (inside)
-			{
-				inside = false;
-				// проверяем не перекрывают ли нас
-				Widget* widget = InputManager::getInstance().getMouseFocusWidget();
-				while (widget != 0)
-				{
-					if (widget/*->getName()*/ == this/*mName*/)
-					{
-						inside = true;
-						break;
-					}
-					// если виджет берет тултип, значит сбрасываем
-					if (widget->getNeedToolTip())
-						widget = 0;//widget->getParent();
-					else
-						widget = widget->getParent();
-				}
-
-				if (inside)
-				{
-					if ( ! mToolTipVisible)
-					{
-						mToolTipCurrentTime += _frame;
-						if (mToolTipCurrentTime > WIDGET_TOOLTIP_TIMEOUT)
-						{
-							mToolTipVisible = true;
-							eventToolTip(this, ToolTipInfo(ToolTipInfo::Show, mToolTipOldIndex, point));
-						}
-					}
-				}
-			}
-		}
-	}
-
-	void Widget::setEnableToolTip(bool _enable)
-	{
-		if (_enable == mEnableToolTip) return;
-		mEnableToolTip = _enable;
-
-		if ( ! mEnableToolTip)
-		{
-			if (mToolTipVisible)
-			{
-				mToolTipCurrentTime = 0;
-				mToolTipVisible = false;
-				eventToolTip(this, ToolTipInfo(ToolTipInfo::Hide));
-			}
-		}
-		else
-		{
-			mToolTipCurrentTime = 0;
-		}
-	}
-
-	void Widget::_resetContainer(bool _updateOnly)
-	{
-		if ( mEnableToolTip)
-		{
-			if (mToolTipVisible)
-			{
-				mToolTipVisible = false;
-				eventToolTip(this, ToolTipInfo(ToolTipInfo::Hide));
-			}
-			mToolTipCurrentTime = 0;
-			mToolTipOldIndex = ITEM_NONE;
-		}
-	}
-
-	void Widget::setMaskPick(const std::string& _filename)
-	{
-		if (mOwnMaskPickInfo.load(_filename))
-		{
-			mMaskPickInfo = &mOwnMaskPickInfo;
-		}
-		else
-		{
-			MYGUI_LOG(Error, "mask not load '" << _filename << "'");
-		}
-	}
-
-	void Widget::setRealPosition(const FloatPoint& _point)
-	{
-		setPosition(CoordConverter::convertFromRelative(_point, mCroppedParent == nullptr ? Gui::getInstance().getViewSize() : mCroppedParent->getSize()));
-	}
-
-	void Widget::setRealSize(const FloatSize& _size)
-	{
-		setSize(CoordConverter::convertFromRelative(_size, mCroppedParent == nullptr ? Gui::getInstance().getViewSize() : mCroppedParent->getSize()));
-	}
-
-	void Widget::setRealCoord(const FloatCoord& _coord)
-	{
-		setCoord(CoordConverter::convertFromRelative(_coord, mCroppedParent == nullptr ? Gui::getInstance().getViewSize() : mCroppedParent->getSize()));
-	}
-
-	void Widget::_linkChildWidget(Widget* _widget)
-	{
-		VectorWidgetPtr::iterator iter = std::find(mWidgetChild.begin(), mWidgetChild.end(), _widget);
-		MYGUI_ASSERT(iter == mWidgetChild.end(), "widget already exist");
-		mWidgetChild.push_back(_widget);
-	}
-
-	void Widget::_unlinkChildWidget(Widget* _widget)
-	{
-		VectorWidgetPtr::iterator iter = std::remove(mWidgetChild.begin(), mWidgetChild.end(), _widget);
-		MYGUI_ASSERT(iter != mWidgetChild.end(), "widget not found");
-		mWidgetChild.erase(iter);
-	}
-
-	void Widget::_setTextAlign(Align _align)
-	{
-		StaticText* text = this->castType<StaticText>(false);
-		if (text) text->setTextAlign(_align);
-
-		if (mText != nullptr) mText->setTextAlign(_align);
-	}
-
-	Align Widget::_getTextAlign()
-	{
-		StaticText* text = this->castType<StaticText>(false);
-		if (text) return text->getTextAlign();
-
-		if (mText != nullptr) return mText->getTextAlign();
-		return Align::Default;
-	}
-
-	void Widget::_setTextColour(const Colour& _colour)
-	{
-		StaticText* text = this->castType<StaticText>(false);
-		if (text) return text->setTextColour(_colour);
-
-		if (nullptr != mText) mText->setTextColour(_colour);
-	}
-
-	const Colour& Widget::_getTextColour()
-	{
-		StaticText* text = this->castType<StaticText>(false);
-		if (text) return text->getTextColour();
-
-		return (nullptr == mText) ? Colour::Zero : mText->getTextColour();
-	}
-
-	void Widget::_setFontName(const std::string& _font)
-	{
-		StaticText* text = this->castType<StaticText>(false);
-		if (text) text->setFontName(_font);
-
-		if (nullptr != mText) mText->setFontName(_font);
-	}
-
-	const std::string& Widget::_getFontName()
-	{
-		StaticText* text = this->castType<StaticText>(false);
-		if (text) return text->getFontName();
-
-		if (nullptr == mText)
-		{
-			static std::string empty;
-			return empty;
-		}
-		return mText->getFontName();
-	}
-
-	void Widget::_setFontHeight(int _height)
-	{
-		StaticText* text = this->castType<StaticText>(false);
-		if (text) text->setFontHeight(_height);
-
-		if (nullptr != mText) mText->setFontHeight(_height);
-	}
-
-	int Widget::_getFontHeight()
-	{
-		StaticText* text = this->castType<StaticText>(false);
-		if (text) return text->getFontHeight();
-
-		return (nullptr == mText) ? 0 : mText->getFontHeight();
-	}
-
-	IntSize Widget::_getTextSize()
-	{
-		StaticText* text = this->castType<StaticText>(false);
-		if (text) return text->getTextSize();
-
-		return (nullptr == mText) ? IntSize() : mText->getTextSize();
-	}
-
-	IntCoord Widget::_getTextRegion()
-	{
-		StaticText* text = this->castType<StaticText>(false);
-		if (text) return text->getTextRegion();
-
-		return (nullptr == mText) ? IntCoord() : mText->getCoord();
-	}
-
-	void Widget::_setAlign(const IntCoord& _oldcoord, bool _update)
-	{
-		// для виджета изменение х у  не меняються
-		_setAlign(_oldcoord.size(), _update);
-	}
-
-	void Widget::_setAlign(const IntSize& _oldsize, bool _update)
-	{
-		const IntSize& size = mCroppedParent ? mCroppedParent->getSize() : Gui::getInstance().getViewSize();
-
-		bool need_move = false;
-		bool need_size = false;
-		IntCoord coord = mCoord;
-
-		// первоначальное выравнивание
-		if (mAlign.isHRelative())
-		{
-			coord.left = int((float)size.width * mRelativeCoord.left);
-			coord.width = int((float)size.width * mRelativeCoord.width);
-		}
-		else if (mAlign.isHStretch())
-		{
-			// растягиваем
-			coord.width = mCoord.width + (size.width - _oldsize.width);
-			need_size = true;
-		}
-		else if (mAlign.isRight())
-		{
-			// двигаем по правому краю
-			coord.left = mCoord.left + (size.width - _oldsize.width);
-			need_move = true;
-		}
-		else if (mAlign.isHCenter())
-		{
-			// выравнивание по горизонтали без растяжения
-			coord.left = (size.width - mCoord.width) / 2;
-			need_move = true;
-		}
-
-		if (mAlign.isVRelative())
-		{
-			coord.top = int((float)size.height * mRelativeCoord.top);
-			coord.height = int((float)size.height * mRelativeCoord.height);
-		}
-		else if (mAlign.isVStretch())
-		{
-			// растягиваем
-			coord.height = mCoord.height + (size.height - _oldsize.height);
-			need_size = true;
-		}
-		else if (mAlign.isBottom())
-		{
-			// двигаем по нижнему краю
-			coord.top = mCoord.top + (size.height - _oldsize.height);
-			need_move = true;
-		}
-		else if (mAlign.isVCenter())
-		{
-			// выравнивание по вертикали без растяжения
-			coord.top = (size.height - mCoord.height) / 2;
-			need_move = true;
-		}
-
-		if (mAlign.isHRelative() || mAlign.isVRelative())
-		{
-			mDisableUpdateRelative = true;
-			setCoord(coord);
-			mDisableUpdateRelative = false;
-		}
-		else if (need_move)
-		{
-			if (need_size) setCoord(coord);
-			else setPosition(coord.point());
-		}
-		else if (need_size)
-		{
-			setSize(coord.size());
-		}
-		else
-		{
-			_updateView(); // только если не вызвано передвижение и сайз
-		}
-
-	}
-
-	void Widget::setPosition(const IntPoint& _point)
-	{
-		if (mAlign.isHRelative() || mAlign.isVRelative())
-		{
-
-			const IntSize& parent_size = mCroppedParent ? mCroppedParent->getSize() : Gui::getInstance().getViewSize();
-
-			if (parent_size.width)
-			{
-				mRelativeCoord.left = (float)_point.left / (float)parent_size.width;
-			}
-			else
-			{
-				mRelativeCoord.left = 0;
-			}
-
-			if (parent_size.height)
-			{
-				mRelativeCoord.top = (float)_point.top / (float)parent_size.height;
-			}
-			else
-			{
-				mRelativeCoord.top = 0;
-			}
-
-		}
-
-		// обновляем абсолютные координаты
-		mAbsolutePosition += _point - mCoord.point();
-
-		for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateAbsolutePoint();
-		for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateAbsolutePoint();
-
-		mCoord = _point;
-
-		_updateView();
-	}
-
-	void Widget::setSize(const IntSize& _size)
-	{
-		if (mAlign.isHRelative() || mAlign.isVRelative())
-		{
-
-			const IntSize& parent_size = mCroppedParent ? mCroppedParent->getSize() : Gui::getInstance().getViewSize();
-
-			if (parent_size.width)
-			{
-				mRelativeCoord.width = (float)_size.width / (float)parent_size.width;
-			}
-			else
-			{
-				mRelativeCoord.width = 0;
-			}
-
-			if (parent_size.height)
-			{
-				mRelativeCoord.height = (float)_size.height / (float)parent_size.height;
-			}
-			else
-			{
-				mRelativeCoord.height = 0;
-			}
-
-		}
-
-		// устанавливаем новую координату а старую пускаем в расчеты
-		IntSize old = mCoord.size();
-		mCoord = _size;
-
-		bool visible = true;
-
-		// обновляем выравнивание
-		bool margin = mCroppedParent ? _checkMargin() : false;
-
-		if (margin)
-		{
-			// проверка на полный выход за границу
-			if (_checkOutside())
-			{
-				// скрываем
-				visible = false;
-			}
-		}
-
-		_setSubSkinVisible(visible);
-
-		// передаем старую координату , до вызова, текущая координата отца должна быть новой
-		for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_setAlign(old, mIsMargin || margin);
-		for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_setAlign(old, mIsMargin || margin);
-		for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin) (*skin)->_setAlign(old, mIsMargin || margin);
-
-		// запоминаем текущее состояние
-		mIsMargin = margin;
-
-	}
-
-	void Widget::setCoord(const IntCoord& _coord)
-	{
-		if (!mDisableUpdateRelative && (mAlign.isHRelative() || mAlign.isVRelative()))
-		{
-
-			const IntSize& parent_size = mCroppedParent ? mCroppedParent->getSize() : Gui::getInstance().getViewSize();
-
-			if (parent_size.width)
-			{
-				mRelativeCoord.left = (float)_coord.left / (float)parent_size.width;
-				mRelativeCoord.width = (float)_coord.width / (float)parent_size.width;
-			}
-			else
-			{
-				mRelativeCoord.left = 0;
-				mRelativeCoord.width = 0;
-			}
-
-			if (parent_size.height)
-			{
-				mRelativeCoord.top = (float)_coord.top / (float)parent_size.height;
-				mRelativeCoord.height = (float)_coord.height / (float)parent_size.height;
-			}
-			else
-			{
-				mRelativeCoord.top = 0;
-				mRelativeCoord.height = 0;
-			}
-
-		}
-
-		// обновляем абсолютные координаты
-		mAbsolutePosition += _coord.point() - mCoord.point();
-
-		for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateAbsolutePoint();
-		for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateAbsolutePoint();
-
-		// устанавливаем новую координату а старую пускаем в расчеты
-		IntCoord old = mCoord;
-		mCoord = _coord;
-
-		bool visible = true;
-
-		// обновляем выравнивание
-		bool margin = mCroppedParent ? _checkMargin() : false;
-
-		if (margin)
-		{
-			// проверка на полный выход за границу
-			if (_checkOutside())
-			{
-				// скрываем
-				visible = false;
-			}
-		}
-
-		_setSubSkinVisible(visible);
-
-		// передаем старую координату , до вызова, текущая координата отца должна быть новой
-		for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_setAlign(old, mIsMargin || margin);
-		for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_setAlign(old, mIsMargin || margin);
-		for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin) (*skin)->_setAlign(old, mIsMargin || margin);
-
-		// запоминаем текущее состояние
-		mIsMargin = margin;
-
-	}
-
-	void Widget::setAlign(Align _align)
-	{
-		ICroppedRectangle::setAlign(_align);
-
-		if (mAlign.isHRelative() || mAlign.isVRelative())
-		{
-			const IntSize& parent_size = mCroppedParent ? mCroppedParent->getSize() : Gui::getInstance().getViewSize();
-
-			if (parent_size.width)
-			{
-				mRelativeCoord.left = (float)mCoord.left / (float)parent_size.width;
-				mRelativeCoord.width = (float)mCoord.width / (float)parent_size.width;
-			}
-			else
-			{
-				mRelativeCoord.left = 0;
-				mRelativeCoord.width = 0;
-			}
-
-			if (parent_size.height)
-			{
-				mRelativeCoord.top = (float)mCoord.top / (float)parent_size.height;
-				mRelativeCoord.height = (float)mCoord.height / (float)parent_size.height;
-			}
-			else
-			{
-				mRelativeCoord.top = 0;
-				mRelativeCoord.height = 0;
-			}
-
-		}
-
-	}
-
-	void Widget::detachFromWidget(const std::string& _layer)
-	{
-		std::string oldlayer = getLayerName();
-
-		Widget* parent = getParent();
-		if (parent)
-		{
-			// отдетачиваемся от лееров
-			if ( ! isRootWidget() )
-			{
-				detachFromLayerItemNode(true);
-
-				if (mWidgetStyle == WidgetStyle::Child)
-				{
-					mParent->removeChildItem(this);
-				}
-				else if (mWidgetStyle == WidgetStyle::Overlapped)
-				{
-					mParent->removeChildNode(this);
-				}
-
-				mWidgetStyle = WidgetStyle::Overlapped;
-
-				mCroppedParent = nullptr;
-
-				// обновляем координаты
-				mAbsolutePosition = mCoord.point();
-
-				for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateAbsolutePoint();
-				for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateAbsolutePoint();
-
-				// сбрасываем обрезку
-				mMargin.clear();
-
-				_updateView();
-			}
-
-			// нам нужен самый рутовый парент
-			while (parent->getParent()) { parent = parent->getParent(); }
-
-			mIWidgetCreator = parent->mIWidgetCreator;
-			mIWidgetCreator->_linkChildWidget(this);
-			mParent->_unlinkChildWidget(this);
-			mParent = nullptr;
-		}
-
-		if (!_layer.empty())
-		{
-			LayerManager::getInstance().attachToLayerNode(_layer, this);
-		}
-		else if (!oldlayer.empty())
-		{
-			LayerManager::getInstance().attachToLayerNode(oldlayer, this);
-		}
-
-		// корректируем параметры
-		float alpha = mAlpha;
-		mAlpha = -1;
-		setAlpha(alpha);
-
-	}
-
-	void Widget::attachToWidget(Widget* _parent, WidgetStyle _style, const std::string& _layer)
-	{
-		MYGUI_ASSERT(_parent, "parent must be valid");
-		MYGUI_ASSERT(_parent != this, "cyclic attach (attaching to self)");
-
-		// attach to client if widget have it
-		if (_parent->getClientWidget()) _parent = _parent->getClientWidget();
-
-		// проверяем на цикличность атача
-		Widget* parent = _parent;
-		while (parent->getParent())
-		{
-			MYGUI_ASSERT(parent != this, "cyclic attach");
-			parent = parent->getParent();
-		}
-
-		// отдетачиваемся от всего
-		detachFromWidget();
-
-		mWidgetStyle = _style;
-
-		if (_style == WidgetStyle::Popup)
-		{
-			mIWidgetCreator->_unlinkChildWidget(this);
-			mIWidgetCreator = _parent;
-			mParent = _parent;
-			mParent->_linkChildWidget(this);
-
-			mCroppedParent = nullptr;
-
-			if (!_layer.empty())
-			{
-				LayerManager::getInstance().attachToLayerNode(_layer, this);
-			}
-		}
-		else if (_style == WidgetStyle::Child)
-		{
-			LayerManager::getInstance().detachFromLayer(this);
-
-			mIWidgetCreator->_unlinkChildWidget(this);
-			mIWidgetCreator = _parent;
-			mParent = _parent;
-			mParent->_linkChildWidget(this);
-
-			mCroppedParent = _parent;
-			mAbsolutePosition = _parent->getAbsolutePosition() + mCoord.point();
-
-			for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateAbsolutePoint();
-			for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateAbsolutePoint();
-
-			mParent->addChildItem(this);
-
-			_updateView();
-		}
-		else if (_style == WidgetStyle::Overlapped)
-		{
-			LayerManager::getInstance().detachFromLayer(this);
-
-			mIWidgetCreator->_unlinkChildWidget(this);
-			mIWidgetCreator = _parent;
-			mParent = _parent;
-			mParent->_linkChildWidget(this);
-
-			mCroppedParent = _parent;
-			mAbsolutePosition = _parent->getAbsolutePosition() + mCoord.point();
-
-			for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateAbsolutePoint();
-			for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateAbsolutePoint();
-
-			mParent->addChildNode(this);
-
-			_updateView();
-		}
-
-		// корректируем параметры
-		float alpha = mAlpha;
-		mAlpha = -1;
-		setAlpha(alpha);
-
-	}
-
-	void Widget::setWidgetStyle(WidgetStyle _style, const std::string& _layer)
-	{
-		if (_style == mWidgetStyle) return;
-		if (nullptr == getParent()) return;
-
-		Widget* parent = mParent;
-
-		detachFromWidget();
-		attachToWidget(parent, _style, _layer);
-		// ищем леер к которому мы присоедененны
-		/*Widget* root = this;
-		while (!root->isRootWidget())
-		{
-			root = root->getParent();
-		}
-
-		// отсоединяем рут
-		std::string layername;
-		ILayer* layer = root->getLayer();
-		if (layer)
-		{
-			layername = layer->getName();
-			LayerManager::getInstance().detachFromLayer(root);
-
-			// если мы рут, то придется отцеплят более высокого рута
-			if (root == this)
-			{
-				layername.clear();
-
-				if (getParent())
-				{
-					// ищем леер к которому мы присоедененны
-					root = getParent();
-					while (!root->isRootWidget())
-					{
-						root = root->getParent();
-					}
-
-					layer = root->getLayer();
-					if (layer)
-					{
-						layername = layer->getName();
-						LayerManager::getInstance().detachFromLayer(root);
-					}
-
-				}
-			}
-		}
-
-		// корректируем
-		mWidgetStyle = _style;
-		if (_style == WidgetStyle::Child)
-		{
-
-			Widget* parent = getParent();
-			if (parent)
-			{
-				mAbsolutePosition = parent->getAbsolutePosition() + mCoord.point();
-				mCroppedParent = parent;
-				for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateAbsolutePoint();
-				for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateAbsolutePoint();
-			}
-
-		}
-		else if (_style == WidgetStyle::Popup)
-		{
-
-			mCroppedParent = nullptr;
-			// обновляем координаты
-			mAbsolutePosition = mCoord.point();
-			// сбрасываем обрезку
-			mMargin.clear();
-
-			for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateAbsolutePoint();
-			for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateAbsolutePoint();
-
-		}
-		else if (_style == WidgetStyle::Overlapped)
-		{
-
-			Widget* parent = getParent();
-			if (parent)
-			{
-				mAbsolutePosition = parent->getAbsolutePosition() + mCoord.point();
-				mCroppedParent = parent;
-				for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget) (*widget)->_updateAbsolutePoint();
-				for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget) (*widget)->_updateAbsolutePoint();
-			}
-
-		}
-
-		// присоединяем обратно
-		if (!layername.empty())
-		{
-			LayerManager::getInstance().attachToLayerNode(layername, root);
-		}*/
-
-	}
-
-	void Widget::setCaptionWithNewLine(const std::string& _value)
-	{
-		// change '\n' on char 10
-		size_t pos = _value.find("\\n");
-		if (pos == std::string::npos)
-		{
-			setCaption(LanguageManager::getInstance().replaceTags(_value));
-		}
-		else
-		{
-			std::string value(_value);
-			while (pos != std::string::npos)
-			{
-				value[pos++] = '\n';
-				value.erase(pos, 1);
-				pos = value.find("\\n");
-			}
-			setCaption(LanguageManager::getInstance().replaceTags(value));
-		}
-	}
-
-	Widget* Widget::createWidgetT(const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _name)
-	{
-		return baseCreateWidget(WidgetStyle::Child, _type, _skin, _coord, _align, "", _name);
-	}
-
-	Widget* Widget::createWidgetT(const std::string& _type, const std::string& _skin, int _left, int _top, int _width, int _height, Align _align, const std::string& _name)
-	{
-		return createWidgetT(_type, _skin, IntCoord(_left, _top, _width, _height), _align, _name);
-	}
-
-	Widget* Widget::createWidgetRealT(const std::string& _type, const std::string& _skin, float _left, float _top, float _width, float _height, Align _align, const std::string& _name)
-	{
-		return createWidgetRealT(_type, _skin, FloatCoord(_left, _top, _width, _height), _align, _name);
-	}
-
-	Widget* Widget::createWidgetT(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name)
-	{
-		return baseCreateWidget(_style, _type, _skin, _coord, _align, _layer, _name);
-	}
-
-	EnumeratorWidgetPtr Widget::getEnumerator()
-	{
-		MYGUI_ASSERT(mWidgetClient != this, "mWidgetClient can not be this widget");
-		if (mWidgetClient != nullptr) return mWidgetClient->getEnumerator();
-		return Enumerator<VectorWidgetPtr>(mWidgetChild.begin(), mWidgetChild.end());
-	}
-
-	size_t Widget::getChildCount()
-	{
-		MYGUI_ASSERT(mWidgetClient != this, "mWidgetClient can not be this widget");
-		if (mWidgetClient != nullptr) return mWidgetClient->getChildCount();
-		return mWidgetChild.size();
-	}
-
-	Widget* Widget::getChildAt(size_t _index)
-	{
-		MYGUI_ASSERT(mWidgetClient != this, "mWidgetClient can not be this widget");
-		if (mWidgetClient != nullptr) return mWidgetClient->getChildAt(_index);
-		MYGUI_ASSERT_RANGE(_index, mWidgetChild.size(), "Widget::getChildAt");
-		return mWidgetChild[_index];
-	}
-
-	const std::string& Widget::getPointer()
-	{
-		if (!mEnabled)
-		{
-			static std::string empty;
-			return empty;
-		}
-		return mPointer;
-	}
-
-	void Widget::setProperty(const std::string& _key, const std::string& _value)
-	{
-		/// @wproperty{Widget, Widget_Caption, string} Sets caption
-		if (_key == "Widget_Caption") setCaptionWithNewLine(_value);
-		/// @wproperty{Widget, Widget_Position, IntPoint} Sets position
-		else if (_key == "Widget_Position") setPosition(utility::parseValue<IntPoint>(_value));
-		else if (_key == "Widget_Size") setSize(utility::parseValue<IntSize>(_value));
-		else if (_key == "Widget_Coord") setCoord(utility::parseValue<IntCoord>(_value));
-		else if (_key == "Widget_Visible") setVisible(utility::parseValue<bool>(_value));
-		else if (_key == "Widget_Alpha") setAlpha(utility::parseValue<float>(_value));
-		else if (_key == "Widget_Colour") setColour(utility::parseValue<Colour>(_value));
-		else if (_key == "Widget_InheritsAlpha") setInheritsAlpha(utility::parseValue<bool>(_value));
-		else if (_key == "Widget_InheritsPick") setInheritsPick(utility::parseValue<bool>(_value));
-		else if (_key == "Widget_MaskPick") setMaskPick(_value);
-		else if (_key == "Widget_State") setState(_value);
-		else if (_key == "Widget_NeedKey") setNeedKeyFocus(utility::parseValue<bool>(_value));
-		else if (_key == "Widget_NeedMouse") setNeedMouseFocus(utility::parseValue<bool>(_value));
-		else if (_key == "Widget_Enabled") setEnabled(utility::parseValue<bool>(_value));
-		else if (_key == "Widget_NeedToolTip") setNeedToolTip(utility::parseValue<bool>(_value));
-		else if (_key == "Widget_Pointer") setPointer(_value);
-
-#ifndef MYGUI_DONT_USE_OBSOLETE
-		else if (_key == "Widget_TextColour")
-		{
-			MYGUI_LOG(Warning, "Widget_TextColour is obsolete, use Text_TextColour");
-			_setTextColour(Colour::parse(_value));
-		}
-		else if (_key == "Widget_FontName")
-		{
-			MYGUI_LOG(Warning, "Widget_FontName is obsolete, use Text_FontName");
-			_setFontName(_value);
-		}
-		else if (_key == "Widget_FontHeight")
-		{
-			MYGUI_LOG(Warning, "Widget_FontHeight is obsolete, use Text_FontHeight");
-			this->_setFontHeight(utility::parseValue<int>(_value));
-		}
-		else if (_key == "Widget_TextAlign")
-		{
-			MYGUI_LOG(Warning, "Widget_TextAlign is obsolete, use Text_TextAlign");
-			_setTextAlign(Align::parse(_value));
-		}
-		else if (_key == "Widget_AlignText")
-		{
-			MYGUI_LOG(Warning, "Widget_AlignText is obsolete, use Text_TextAlign");
-			_setTextAlign(Align::parse(_value));
-		}
-		else if (_key == "Widget_Show")
-		{
-			MYGUI_LOG(Warning, "Widget_Show is obsolete, use Widget_Visible");
-			setVisible(utility::parseValue<bool>(_value));
-		}
-		else if (_key == "Widget_InheritsPeek")
-		{
-			MYGUI_LOG(Warning, "Widget_InheritsPeek is obsolete, use Widget_InheritsPick");
-			setInheritsPick(utility::parseValue<bool>(_value));
-		}
-		else if (_key == "Widget_MaskPeek")
-		{
-			MYGUI_LOG(Warning, "Widget_MaskPeek is obsolete, use Widget_MaskPick");
-			setMaskPick(_value);
-		}
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-		else
-		{
-			MYGUI_LOG(Warning, "Property " << _key << " not found");
-			return;
-		}
-
-		eventChangeProperty(this, _key, _value);
-	}
-
-	void Widget::baseUpdateEnable()
-	{
-		if (mEnabled)
-		{
-			setState("normal");
-		}
-		else
-		{
-			setState("disabled");
-		}
-	}
-
-	void Widget::setVisible(bool _value)
-	{
-		if (mVisible == _value) return;
-		mVisible = _value;
-
-		if (mInheritsVisible)
-		{
-			for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin)
-				(*skin)->setVisible(_value);
-			for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget)
-				(*widget)->_setInheritsVisible(_value);
-			for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget)
-				(*widget)->_setInheritsVisible(_value);
-		}
-
-	}
-
-	void Widget::_setInheritsVisible(bool _value)
-	{
-		if (mInheritsVisible == _value) return;
-		mInheritsVisible = _value;
-
-		if (mVisible)
-		{
-			for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin)
-				(*skin)->setVisible(_value);
-			for (VectorWidgetPtr::iterator widget = mWidgetChild.begin(); widget != mWidgetChild.end(); ++widget)
-				(*widget)->_setInheritsVisible(_value);
-			for (VectorWidgetPtr::iterator widget = mWidgetChildSkin.begin(); widget != mWidgetChildSkin.end(); ++widget)
-				(*widget)->_setInheritsVisible(_value);
-		}
-	}
-
-	void Widget::setEnabled(bool _value)
-	{
-		if (mEnabled == _value) return;
-		mEnabled = _value;
-
-		if (mInheritsEnabled)
-		{
-			for (VectorWidgetPtr::iterator iter = mWidgetChild.begin(); iter != mWidgetChild.end(); ++iter)
-				(*iter)->_setInheritsEnable(_value);
-			for (VectorWidgetPtr::iterator iter = mWidgetChildSkin.begin(); iter != mWidgetChildSkin.end(); ++iter)
-				(*iter)->_setInheritsEnable(_value);
-
-			baseUpdateEnable();
-		}
-
-		if (!mEnabled)
-		{
-			InputManager::getInstance().unlinkWidget(this);
-		}
-	}
-
-	void Widget::_setInheritsEnable(bool _value)
-	{
-		if (mInheritsEnabled == _value) return;
-		mInheritsEnabled = _value;
-
-		if (mEnabled)
-		{
-			for (VectorWidgetPtr::iterator iter = mWidgetChild.begin(); iter != mWidgetChild.end(); ++iter)
-				(*iter)->_setInheritsEnable(_value);
-			for (VectorWidgetPtr::iterator iter = mWidgetChildSkin.begin(); iter != mWidgetChildSkin.end(); ++iter)
-				(*iter)->_setInheritsEnable(_value);
-
-			baseUpdateEnable();
-		}
-
-		if (!mEnabled)
-		{
-			InputManager::getInstance().unlinkWidget(this);
-		}
-	}
-
-	void Widget::setColour(const Colour& _value)
-	{
-		for (VectorSubWidget::iterator skin = mSubSkinChild.begin(); skin != mSubSkinChild.end(); ++skin)
-		{
-			ISubWidgetRect* rect = (*skin)->castType<ISubWidgetRect>(false);
-			if (rect)
-				rect->_setColour(_value);
-		}
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_WidgetManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_WidgetManager.cpp
deleted file mode 100644
index 6bcf61363a..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_WidgetManager.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_IWidgetCreator.h"
-#include "MyGUI_IWidgetFactory.h"
-#include "MyGUI_FactoryManager.h"
-
-#include "MyGUI_Button.h"
-#include "MyGUI_Canvas.h"
-#include "MyGUI_ComboBox.h"
-#include "MyGUI_DDContainer.h"
-#include "MyGUI_Edit.h"
-#include "MyGUI_HScroll.h"
-#include "MyGUI_ItemBox.h"
-#include "MyGUI_List.h"
-#include "MyGUI_ListBox.h"
-#include "MyGUI_ListCtrl.h"
-#include "MyGUI_MenuBar.h"
-#include "MyGUI_MenuCtrl.h"
-#include "MyGUI_MenuItem.h"
-#include "MyGUI_Message.h"
-#include "MyGUI_MultiList.h"
-#include "MyGUI_PopupMenu.h"
-#include "MyGUI_Progress.h"
-#include "MyGUI_ScrollView.h"
-#include "MyGUI_StaticImage.h"
-#include "MyGUI_StaticText.h"
-#include "MyGUI_Tab.h"
-#include "MyGUI_TabItem.h"
-#include "MyGUI_VScroll.h"
-#include "MyGUI_Widget.h"
-#include "MyGUI_Window.h"
-
-namespace MyGUI
-{
-
-	MYGUI_INSTANCE_IMPLEMENT( WidgetManager )
-
-	void WidgetManager::initialise()
-	{
-		MYGUI_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		//registerUnlinker(this);
-
-		FactoryManager& factory = FactoryManager::getInstance();
-
-		factory.registerFactory<Button>("Widget");
-		factory.registerFactory<Canvas>("Widget");
-		factory.registerFactory<ComboBox>("Widget");
-		factory.registerFactory<DDContainer>("Widget");
-		factory.registerFactory<Edit>("Widget");
-		factory.registerFactory<HScroll>("Widget");
-		factory.registerFactory<ItemBox>("Widget");
-		factory.registerFactory<List>("Widget");
-		factory.registerFactory<ListBox>("Widget");
-		factory.registerFactory<ListCtrl>("Widget");
-		factory.registerFactory<MenuBar>("Widget");
-		factory.registerFactory<MenuCtrl>("Widget");
-		factory.registerFactory<MenuItem>("Widget");
-		factory.registerFactory<Message>("Widget");
-		factory.registerFactory<MultiList>("Widget");
-		factory.registerFactory<PopupMenu>("Widget");
-		factory.registerFactory<Progress>("Widget");
-		factory.registerFactory<ScrollView>("Widget");
-		factory.registerFactory<StaticImage>("Widget");
-		factory.registerFactory<StaticText>("Widget");
-		factory.registerFactory<Tab>("Widget");
-		factory.registerFactory<TabItem>("Widget");
-		factory.registerFactory<VScroll>("Widget");
-		factory.registerFactory<Widget>("Widget");
-		factory.registerFactory<Window>("Widget");
-
-#ifndef MYGUI_DONT_USE_OBSOLETE
-
-		factory.registerFactory<RenderBox>("Widget");
-		factory.registerFactory<Sheet>("Widget");
-
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void WidgetManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		//unregisterUnlinker(this);
-
-		mFactoryList.clear();
-		mDelegates.clear();
-		mVectorIUnlinkWidget.clear();
-
-		FactoryManager::getInstance().unregisterFactory("Widget");
-
-		MYGUI_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	Widget* WidgetManager::createWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, Widget* _parent, ICroppedRectangle * _cropeedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		IObject* object = FactoryManager::getInstance().createObject("Widget", _type);
-		if (object != nullptr)
-		{
-			Widget* widget = object->castType<Widget>();
-			ResourceSkin* skin = SkinManager::getInstance().getByName(_skin);
-			widget->_initialise(_style, _coord, _align, skin, _parent, _cropeedParent, _creator, _name);
-
-			return widget;
-		}
-
-		// старый вариант создания
-		for (SetWidgetFactory::iterator factory = mFactoryList.begin(); factory != mFactoryList.end(); ++factory)
-		{
-			if ((*factory)->getTypeName() == _type)
-			{
-				Widget* widget = (*factory)->createWidget(_style, _skin, _coord, _align, _parent, _cropeedParent, _creator, _name);
-				return widget;
-			}
-		}
-
-		MYGUI_EXCEPT("factory '" << _type << "' not found");
-		return nullptr;
-	}
-
-	void WidgetManager::destroyWidget(Widget* _widget)
-	{
-		// иначе возможен бесконечный цикл
-		MYGUI_ASSERT(_widget != nullptr, "widget is deleted");
-
-		// делегирует удаление отцу виджета
-		IWidgetCreator * creator = _widget->_getIWidgetCreator();
-		creator->_destroyChildWidget(_widget);
-	}
-
-	void WidgetManager::destroyWidgets(const VectorWidgetPtr& _widgets)
-	{
-		for (VectorWidgetPtr::const_iterator iter = _widgets.begin(); iter != _widgets.end(); ++iter)
-		{
-			destroyWidget(*iter);
-		}
-	}
-
-	void WidgetManager::destroyWidgets(EnumeratorWidgetPtr _widgets)
-	{
-		VectorWidgetPtr widgets;
-		while (_widgets.next())
-		{
-			widgets.push_back(_widgets.current());
-		}
-		destroyWidgets(widgets);
-	}
-
-	void WidgetManager::registerUnlinker(IUnlinkWidget * _unlink)
-	{
-		unregisterUnlinker(_unlink);
-		mVectorIUnlinkWidget.push_back(_unlink);
-	}
-
-	void WidgetManager::unregisterUnlinker(IUnlinkWidget * _unlink)
-	{
-		for (size_t pos=0; pos<mVectorIUnlinkWidget.size(); pos++)
-		{
-			if (mVectorIUnlinkWidget[pos] == _unlink)
-			{
-				mVectorIUnlinkWidget[pos] = mVectorIUnlinkWidget[mVectorIUnlinkWidget.size()-1];
-				mVectorIUnlinkWidget.pop_back();
-				break;
-			}
-		}
-	}
-
-	void WidgetManager::unlinkFromUnlinkers(Widget* _widget)
-	{
-		for (VectorIUnlinkWidget::iterator iter = mVectorIUnlinkWidget.begin(); iter!=mVectorIUnlinkWidget.end(); ++iter)
-		{
-			(*iter)->_unlinkWidget(_widget);
-		}
-		// вызывать последним, обнулится
-		removeWidgetFromUnlink(_widget);
-	}
-
-	void WidgetManager::addWidgetToUnlink(Widget* _widget)
-	{
-		if (_widget) mUnlinkWidgets.push_back(_widget);
-	}
-
-	void WidgetManager::removeWidgetFromUnlink(Widget*& _widget)
-	{
-		VectorWidgetPtr::iterator iter = std::find(mUnlinkWidgets.begin(), mUnlinkWidgets.end(), _widget);
-		if (iter != mUnlinkWidgets.end())
-		{
-			(*iter) = mUnlinkWidgets.back();
-			mUnlinkWidgets.pop_back();
-		}
-		else
-		{
-			_widget = nullptr;
-		}
-	}
-
-	bool WidgetManager::isFactoryExist(const std::string& _type)
-	{
-		if (FactoryManager::getInstance().isFactoryExist("Widget", _type))
-		{
-			return true;
-		}
-
-		// старый вариант
-		for (SetWidgetFactory::iterator factory = mFactoryList.begin(); factory != mFactoryList.end(); ++factory)
-		{
-			if ((*factory)->getTypeName() == _type)
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-#ifndef MYGUI_DONT_USE_OBSOLETE
-	Widget* WidgetManager::findWidgetT(const std::string& _name, bool _throw)
-	{
-		return Gui::getInstance().findWidgetT(_name, _throw);
-	}
-
-	Widget* WidgetManager::findWidgetT(const std::string& _name, const std::string& _prefix, bool _throw)
-	{
-		return Gui::getInstance().findWidgetT(_name, _prefix, _throw);
-	}
-
-	void WidgetManager::registerFactory(IWidgetFactory * _factory)
-	{
-		mFactoryList.insert(_factory);
-		MYGUI_LOG(Info, "* Register widget factory '" << _factory->getTypeName() << "'");
-	}
-
-	void WidgetManager::unregisterFactory(IWidgetFactory * _factory)
-	{
-		SetWidgetFactory::iterator iter = mFactoryList.find(_factory);
-		if (iter != mFactoryList.end()) mFactoryList.erase(iter);
-		MYGUI_LOG(Info, "* Unregister widget factory '" << _factory->getTypeName() << "'");
-	}
-
-	void WidgetManager::parse(Widget* _widget, const std::string &_key, const std::string &_value)
-	{
-		MapDelegate::iterator iter = mDelegates.find(_key);
-		if (iter == mDelegates.end())
-		{
-			//MYGUI_LOG(Error, "Unknown key '" << _key << "' with value '" << _value << "'");
-			_widget->setProperty(_key, _value);
-			return;
-		}
-		iter->second(_widget, _key, _value);
-	}
-
-	ParseDelegate& WidgetManager::registerDelegate(const std::string& _key)
-	{
-		MapDelegate::iterator iter = mDelegates.find(_key);
-		MYGUI_ASSERT(iter == mDelegates.end(), "delegate with name '" << _key << "' already exist");
-		return (mDelegates[_key] = ParseDelegate());
-	}
-
-	void WidgetManager::unregisterDelegate(const std::string& _key)
-	{
-		MapDelegate::iterator iter = mDelegates.find(_key);
-		if (iter != mDelegates.end()) mDelegates.erase(iter);
-	}
-#endif // MYGUI_DONT_USE_OBSOLETE
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Window.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Window.cpp
deleted file mode 100644
index 73df00f0bd..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_Window.cpp
+++ /dev/null
@@ -1,462 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_Window.h"
-#include "MyGUI_Macros.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_ControllerManager.h"
-#include "MyGUI_InputManager.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_ResourceSkin.h"
-
-namespace MyGUI
-{
-
-	const float WINDOW_ALPHA_ACTIVE = ALPHA_MAX;
-	const float WINDOW_ALPHA_FOCUS = 0.7f;
-	const float WINDOW_ALPHA_DEACTIVE = 0.3f;
-	const float WINDOW_SPEED_COEF = 3.0f;
-
-	const int WINDOW_SNAP_DISTANSE = 10;
-
-	Window::Window() :
-		mWidgetCaption(nullptr),
-		mMouseRootFocus(false),
-		mKeyRootFocus(false),
-		mIsAutoAlpha(false),
-		mSnap(false),
-		mAnimateSmooth(false)
-	{
-	}
-
-	void Window::_initialise(WidgetStyle _style, const IntCoord& _coord, Align _align, ResourceSkin* _info, Widget* _parent, ICroppedRectangle * _croppedParent, IWidgetCreator * _creator, const std::string& _name)
-	{
-		Base::_initialise(_style, _coord, _align, _info, _parent, _croppedParent, _creator, _name);
-
-		initialiseWidgetSkin(_info);
-	}
-
-	Window::~Window()
-	{
-		shutdownWidgetSkin();
-	}
-
-	void Window::baseChangeWidgetSkin(ResourceSkin* _info)
-	{
-		shutdownWidgetSkin();
-		Base::baseChangeWidgetSkin(_info);
-		initialiseWidgetSkin(_info);
-	}
-
-	void Window::initialiseWidgetSkin(ResourceSkin* _info)
-	{
-		// нам нужен фокус клавы
-		mNeedKeyFocus = true;
-
-		// дефолтные размеры
-		mMinmax.set(0, 0, 3000, 3000);
-
-		bool main_move = false;
-		// парсим свойства
-		const MapString& properties = _info->getProperties();
-		if (!properties.empty())
-		{
-			MapString::const_iterator iter = properties.find("Snap");
-			if (iter != properties.end()) mSnap = utility::parseBool(iter->second);
-			iter = properties.find("MainMove");
-			if (iter != properties.end())
-			{
-				setUserString("Scale", "1 1 0 0");
-				main_move = true;
-			}
-		}
-
-		for (VectorWidgetPtr::iterator iter=mWidgetChildSkin.begin(); iter!=mWidgetChildSkin.end(); ++iter)
-		{
-			if (*(*iter)->_getInternalData<std::string>() == "Client")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetClient, "widget already assigned");
-				mWidgetClient = (*iter);
-				if (main_move)
-				{
-					(*iter)->setUserString("Scale", "1 1 0 0");
-					(*iter)->eventMouseButtonPressed = newDelegate(this, &Window::notifyMousePressed);
-					(*iter)->eventMouseDrag = newDelegate(this, &Window::notifyMouseDrag);
-				}
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "Caption")
-			{
-				MYGUI_DEBUG_ASSERT( ! mWidgetCaption, "widget already assigned");
-				mWidgetCaption = (*iter);
-				mWidgetCaption->eventMouseButtonPressed = newDelegate(this, &Window::notifyMousePressed);
-				mWidgetCaption->eventMouseDrag = newDelegate(this, &Window::notifyMouseDrag);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "Button")
-			{
-				(*iter)->eventMouseButtonClick = newDelegate(this, &Window::notifyPressedButtonEvent);
-			}
-			else if (*(*iter)->_getInternalData<std::string>() == "Action")
-			{
-				(*iter)->eventMouseButtonPressed = newDelegate(this, &Window::notifyMousePressed);
-				(*iter)->eventMouseDrag = newDelegate(this, &Window::notifyMouseDrag);
-			}
-		}
-
-	}
-
-	void Window::shutdownWidgetSkin()
-	{
-		mWidgetClient = nullptr;
-		mWidgetCaption = nullptr;
-	}
-
-	// переопределяем для присвоению клиенту
-	Widget* Window::baseCreateWidget(WidgetStyle _style, const std::string& _type, const std::string& _skin, const IntCoord& _coord, Align _align, const std::string& _layer, const std::string& _name)
-	{
-		MYGUI_ASSERT(mWidgetClient != this, "mWidgetClient can not be this widget");
-		if (mWidgetClient != nullptr) return mWidgetClient->createWidgetT(_style, _type, _skin, _coord, _align, _layer, _name);
-		return Base::baseCreateWidget(_style, _type, _skin, _coord, _align, _layer, _name);
-	}
-
-	void Window::onMouseChangeRootFocus(bool _focus)
-	{
-		mMouseRootFocus = _focus;
-		updateAlpha();
-
-		Base::onMouseChangeRootFocus(_focus);
-	}
-
-	void Window::onKeyChangeRootFocus(bool _focus)
-	{
-		mKeyRootFocus = _focus;
-		updateAlpha();
-
-		Base::onKeyChangeRootFocus(_focus);
-	}
-
-	void Window::onMouseDrag(int _left, int _top)
-	{
-		// на тот случай, если двигать окно, можно за любое место виджета
-		notifyMouseDrag(this, _left, _top);
-
-		Base::onMouseDrag(_left, _top);
-	}
-
-	void Window::onMouseButtonPressed(int _left, int _top, MouseButton _id)
-	{
-		notifyMousePressed(this, _left, _top, _id);
-
-		Base::onMouseButtonPressed(_left, _top, _id);
-	}
-
-	void Window::notifyMousePressed(MyGUI::Widget* _sender, int _left, int _top, MouseButton _id)
-	{
-		if (MouseButton::Left == _id)
-		{
-			mPreActionCoord = mCoord;
-			mCurrentActionScale = IntCoord::parse(_sender->getUserString("Scale"));
-		}
-	}
-
-	void Window::notifyPressedButtonEvent(MyGUI::Widget* _sender)
-	{
-		eventWindowButtonPressed(this, _sender->getUserString("Event"));
-	}
-
-	void Window::notifyMouseDrag(MyGUI::Widget* _sender, int _left, int _top)
-	{
-		const IntPoint& point = InputManager::getInstance().getLastLeftPressed();
-
-		IntCoord coord = mCurrentActionScale;
-		coord.left *= (_left - point.left);
-		coord.top *= (_top - point.top);
-		coord.width *= (_left - point.left);
-		coord.height *= (_top - point.top);
-
-		if (coord.left == 0 && coord.top == 0)
-			setSize((mPreActionCoord + coord).size());
-		else if (coord.width == 0 && coord.height == 0)
-			setPosition((mPreActionCoord + coord).point());
-		else
-			setCoord(mPreActionCoord + coord);
-
-		// посылаем событие о изменении позиции и размере
-		eventWindowChangeCoord(this);
-	}
-
-	void Window::updateAlpha()
-	{
-		if (!mIsAutoAlpha) return;
-
-		float alpha;
-		if (mKeyRootFocus) alpha = WINDOW_ALPHA_ACTIVE;
-		else if (mMouseRootFocus) alpha = WINDOW_ALPHA_FOCUS;
-		else alpha = WINDOW_ALPHA_DEACTIVE;
-
-		ControllerFadeAlpha * controller = createControllerFadeAlpha(alpha, WINDOW_SPEED_COEF, true);
-		ControllerManager::getInstance().addItem(this, controller);
-	}
-
-	void Window::setAutoAlpha(bool _auto)
-	{
-		mIsAutoAlpha = _auto;
-		if (!_auto) setAlpha(ALPHA_MAX);
-		else
-		{
-			if (mKeyRootFocus) setAlpha(WINDOW_ALPHA_ACTIVE);
-			else if (mMouseRootFocus) setAlpha(WINDOW_ALPHA_FOCUS);
-			else setAlpha(WINDOW_ALPHA_DEACTIVE);
-		}
-	}
-
-	void Window::setPosition(const IntPoint& _point)
-	{
-		IntPoint point = _point;
-		// прилепляем к краям
-		if (mSnap)
-		{
-			IntCoord coord(point, mCoord.size());
-			getSnappedCoord(coord);
-			point = coord.point();
-		}
-
-		Base::setPosition(point);
-	}
-
-	void Window::setSize(const IntSize& _size)
-	{
-		IntSize size = _size;
-		// прилепляем к краям
-
-		if (size.width < mMinmax.left) size.width = mMinmax.left;
-		else if (size.width > mMinmax.right) size.width = mMinmax.right;
-		if (size.height < mMinmax.top) size.height = mMinmax.top;
-		else if (size.height > mMinmax.bottom) size.height = mMinmax.bottom;
-		if ((size.width == mCoord.width) && (size.height == mCoord.height) ) return;
-
-		if (mSnap)
-		{
-			IntCoord coord(mCoord.point(), size);
-			getSnappedCoord(coord);
-			size = coord.size();
-		}
-
-		Base::setSize(size);
-	}
-
-	void Window::setCoord(const IntCoord& _coord)
-	{
-		IntPoint pos = _coord.point();
-		IntSize size = _coord.size();
-
-		if (size.width < mMinmax.left)
-		{
-			int offset = mMinmax.left - size.width;
-			size.width = mMinmax.left;
-			if ((pos.left - mCoord.left) > offset) pos.left -= offset;
-			else pos.left = mCoord.left;
-		}
-		else if (size.width > mMinmax.right)
-		{
-			int offset = mMinmax.right - size.width;
-			size.width = mMinmax.right;
-			if ((pos.left - mCoord.left) < offset) pos.left -= offset;
-			else pos.left = mCoord.left;
-		}
-		if (size.height < mMinmax.top)
-		{
-			int offset = mMinmax.top - size.height;
-			size.height = mMinmax.top;
-			if ((pos.top - mCoord.top) > offset) pos.top -= offset;
-			else pos.top = mCoord.top;
-		}
-		else if (size.height > mMinmax.bottom)
-		{
-			int offset = mMinmax.bottom - size.height;
-			size.height = mMinmax.bottom;
-			if ((pos.top - mCoord.top) < offset) pos.top -= offset;
-			else pos.top = mCoord.top;
-		}
-
-		// прилепляем к краям
-		if (mSnap)
-		{
-			IntCoord coord(pos, size);
-			getSnappedCoord(coord);
-			size = coord.size();
-		}
-
-		IntCoord coord(pos, size);
-		if (coord == mCoord) return;
-
-		Base::setCoord(coord);
-	}
-
-	void Window::setCaption(const UString& _caption)
-	{
-		if (mWidgetCaption != nullptr) mWidgetCaption->setCaption(_caption);
-		else Base::setCaption(_caption);
-	}
-
-	const UString& Window::getCaption()
-	{
-		if (mWidgetCaption != nullptr) return mWidgetCaption->getCaption();
-		return Base::getCaption();
-	}
-
-	void Window::destroySmooth()
-	{
-		ControllerFadeAlpha * controller = createControllerFadeAlpha(ALPHA_MIN, WINDOW_SPEED_COEF, false);
-		controller->eventPostAction = newDelegate(action::actionWidgetDestroy);
-		ControllerManager::getInstance().addItem(this, controller);
-	}
-
-	void Window::animateStop(Widget* _widget)
-	{
-		if (mAnimateSmooth)
-		{
-			ControllerManager::getInstance().removeItem(this);
-			mAnimateSmooth = false;
-		}
-	}
-
-	void Window::setVisible(bool _visible)
-	{
-
-		if (mAnimateSmooth)
-		{
-			ControllerManager::getInstance().removeItem(this);
-			setAlpha(getAlphaVisible());
-			setEnabledSilent(true);
-			mAnimateSmooth = false;
-		}
-
-		Base::setVisible(_visible);
-	}
-
-	float Window::getAlphaVisible()
-	{
-		return (mIsAutoAlpha && !mKeyRootFocus) ? WINDOW_ALPHA_DEACTIVE : ALPHA_MAX;
-	}
-
-	void Window::getSnappedCoord(IntCoord& _coord)
-	{
-		if (abs(_coord.left) <= WINDOW_SNAP_DISTANSE) _coord.left = 0;
-		if (abs(_coord.top) <= WINDOW_SNAP_DISTANSE) _coord.top = 0;
-
-		IntSize view_size;
-		if (getCroppedParent() == nullptr)
-			view_size = this->getLayer()->getSize();
-		else
-			view_size = ((Widget*)getCroppedParent())->getSize();
-
-		if ( abs(_coord.left + _coord.width - view_size.width) < WINDOW_SNAP_DISTANSE) _coord.left = view_size.width - _coord.width;
-		if ( abs(_coord.top + _coord.height - view_size.height) < WINDOW_SNAP_DISTANSE) _coord.top = view_size.height - _coord.height;
-	}
-
-	void Window::setVisibleSmooth(bool _visible)
-	{
-		mAnimateSmooth = true;
-		ControllerManager::getInstance().removeItem(this);
-
-		if (_visible)
-		{
-			setEnabledSilent(true);
-			if ( ! isVisible() )
-			{
-				setAlpha(ALPHA_MIN);
-				Base::setVisible(true);
-			}
-			ControllerFadeAlpha * controller = createControllerFadeAlpha(getAlphaVisible(), WINDOW_SPEED_COEF, true);
-			controller->eventPostAction = newDelegate(this, &Window::animateStop);
-			ControllerManager::getInstance().addItem(this, controller);
-		}
-		else
-		{
-			setEnabledSilent(false);
-			ControllerFadeAlpha * controller = createControllerFadeAlpha(ALPHA_MIN, WINDOW_SPEED_COEF, false);
-			controller->eventPostAction = newDelegate(action::actionWidgetHide);
-			ControllerManager::getInstance().addItem(this, controller);
-		}
-	}
-
-	ControllerFadeAlpha* Window::createControllerFadeAlpha(float _alpha, float _coef, bool _enable)
-	{
-		ControllerItem* item = ControllerManager::getInstance().createItem(ControllerFadeAlpha::getClassTypeName());
-		ControllerFadeAlpha* controller = item->castType<ControllerFadeAlpha>();
-
-		controller->setAlpha(_alpha);
-		controller->setCoef(_coef);
-		controller->setEnabled(_enable);
-
-		return controller;
-	}
-
-	void Window::setMinSize(const IntSize& _value)
-	{
-		mMinmax.left = _value.width;
-		mMinmax.top = _value.height;
-	}
-
-	IntSize Window::getMinSize()
-	{
-		return IntSize(mMinmax.left, mMinmax.top);
-	}
-
-	void Window::setMaxSize(const IntSize& _value)
-	{
-		mMinmax.right = _value.width;
-		mMinmax.bottom = _value.height;
-	}
-
-	IntSize Window::getMaxSize()
-	{
-		return IntSize(mMinmax.right, mMinmax.bottom);
-	}
-
-	void Window::setProperty(const std::string& _key, const std::string& _value)
-	{
-		if (_key == "Window_AutoAlpha") setAutoAlpha(utility::parseValue<bool>(_value));
-		else if (_key == "Window_Snap") setSnap(utility::parseValue<bool>(_value));
-		else if (_key == "Window_MinSize") setMinSize(utility::parseValue<IntSize>(_value));
-		else if (_key == "Window_MaxSize") setMaxSize(utility::parseValue<IntSize>(_value));
-
-#ifndef MYGUI_DONT_USE_OBSOLETE
-		else if (_key == "Window_MinMax")
-		{
-			IntRect rect = IntRect::parse(_value);
-			setMinSize(rect.left, rect.top);
-			setMaxSize(rect.right, rect.bottom);
-			MYGUI_LOG(Warning, "Window_MinMax is obsolete, use Window_MinSize or Window_MaxSize");
-		}
-#endif // MYGUI_DONT_USE_OBSOLETE
-
-		else
-		{
-			Base::setProperty(_key, _value);
-			return;
-		}
-		eventChangeProperty(this, _key, _value);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_XmlDocument.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_XmlDocument.cpp
deleted file mode 100644
index dfb5a4645b..0000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_XmlDocument.cpp
+++ /dev/null
@@ -1,835 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		11/2007
-	@module
-*/
-/*
-	This file is part of MyGUI.
-
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	MyGUI 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "MyGUI_Precompiled.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_DataManager.h"
-
-namespace MyGUI
-{
-	namespace xml
-	{
-
-		namespace utility
-		{
-			std::string convert_from_xml(const std::string& _string, bool& _ok)
-			{
-				std::string ret;
-				_ok = true;
-
-				size_t pos = _string.find("&");
-				if (pos == std::string::npos) return _string;
-
-				ret.reserve(_string.size());
-				size_t old = 0;
-				while (pos != std::string::npos)
-				{
-					ret += _string.substr(old, pos - old);
-
-					size_t end = _string.find(";", pos + 1);
-					if (end == std::string::npos)
-					{
-						_ok = false;
-						return ret;
-					}
-					else
-					{
-						std::string tag = _string.substr(pos, end - pos + 1);
-						if (tag == "&amp;") ret += '&';
-						else if (tag == "&lt;") ret += '<';
-						else if (tag == "&gt;") ret += '>';
-						else if (tag == "&apos;") ret += '\'';
-						else if (tag == "&quot;") ret += '\"';
-						else
-						{
-							_ok = false;
-							return ret;
-						}
-					}
-
-					old = end + 1;
-					pos = _string.find("&", old);
-				}
-				ret += _string.substr(old, std::string::npos);
-
-				return ret;
-			}
-
-			std::string convert_to_xml(const std::string& _string)
-			{
-				std::string ret;
-
-				size_t pos = _string.find_first_of("&<>'\"");
-				if (pos == std::string::npos) return _string;
-
-				ret.reserve(_string.size() * 2);
-				size_t old = 0;
-				while (pos != std::string::npos)
-				{
-					ret += _string.substr(old, pos - old);
-
-					if (_string[pos] == '&') ret += "&amp;";
-					else if (_string[pos] == '<') ret += "&lt;";
-					else if (_string[pos] == '>') ret += "&gt;";
-					else if (_string[pos] == '\'') ret += "&apos;";
-					else if (_string[pos] == '\"') ret += "&quot;";
-
-					old = pos + 1;
-					pos = _string.find_first_of("&<>'\"", old);
-				}
-				ret += _string.substr(old, std::string::npos);
-
-				return ret;
-			}
-
-		}
-
-		//----------------------------------------------------------------------//
-		// class ElementEnumerator
-		//----------------------------------------------------------------------//
-		ElementEnumerator::ElementEnumerator(VectorElement::iterator _begin, VectorElement::iterator _end) :
-			m_first(true),
-			m_current(_begin),
-			m_end(_end)
-		{
-		}
-
-		bool ElementEnumerator::next()
-		{
-			if (m_current == m_end) return false;
-			else if (m_first)
-			{
-				m_first = false;
-				return true;
-			}
-			++ m_current;
-			if (m_current == m_end) return false;
-			return true;
-		}
-
-		bool ElementEnumerator::next(const std::string& _name)
-		{
-			while (next())
-			{
-				if ((*m_current)->getName() == _name) return true;
-			}
-			return false;
-		}
-
-		//----------------------------------------------------------------------//
-		// class Element
-		//----------------------------------------------------------------------//
-		Element::Element(const std::string &_name, ElementPtr _parent, ElementType _type, const std::string& _content) :
-			mName(_name),
-			mContent(_content),
-			mParent(_parent),
-			mType(_type)
-		{
-		}
-
-		Element::~Element()
-		{
-			for (VectorElement::iterator iter=mChilds.begin(); iter!=mChilds.end(); ++iter)
-			{
-				delete *iter;
-			}
-			mChilds.clear();
-		}
-
-		void Element::save(std::ostream& _stream, size_t _level)
-		{
-			// сначала табуляции намутим
-			for (size_t tab=0; tab<_level; ++tab) _stream  << "    ";
-
-			// теперь заголовок тега
-			if (mType == ElementType::Declaration) _stream << "<?";
-			else _stream << "<";
-			_stream << mName;
-
-			for (VectorAttributes::iterator iter = mAttributes.begin(); iter != mAttributes.end(); ++iter)
-			{
-				_stream << " " << iter->first << "=\"" << utility::convert_to_xml(iter->second) << "\"";
-			}
-
-			bool empty = mChilds.empty();
-			// если детей нет то закрываем
-			if (empty && mContent.empty())
-			{
-				if (mType == ElementType::Declaration) _stream << "?>\n";
-				else _stream << "/>\n";
-			}
-			else
-			{
-				_stream << ">";
-				if (!empty) _stream << "\n";
-				// если есть тело то сначало оно
-				if (!mContent.empty())
-				{
-					if (!empty)
-					{
-						for (size_t tab=0; tab<=_level; ++tab) _stream  << "    ";
-					}
-					_stream << utility::convert_to_xml(mContent);
-
-					if (!empty) _stream << "\n";
-				}
-				// если есть детишки путь сохранятся
-				for (size_t child=0; child<mChilds.size(); child++)
-				{
-					mChilds[child]->save(_stream, _level + 1);
-				}
-
-				if (!empty)
-				{
-					for (size_t tab=0; tab<_level; ++tab)
-						_stream  << "    ";
-				}
-				_stream << "</" << mName << ">\n";
-			}
-
-		}
-
-		ElementPtr Element::createChild(const std::string& _name, const std::string& _content)
-		{
-			ElementPtr node = new Element(_name, this, ElementType::Normal, _content);
-			mChilds.push_back(node);
-			return node;
-		}
-
-		void Element::clear()
-		{
-			for (VectorElement::iterator iter = mChilds.begin(); iter != mChilds.end(); ++iter) delete *iter;
-			mChilds.clear();
-			mContent.clear();
-			mAttributes.clear();
-		}
-
-		bool Element::findAttribute(const std::string& _name, std::string& _value)
-		{
-			for (VectorAttributes::iterator iter=mAttributes.begin(); iter!=mAttributes.end(); ++iter)
-			{
-				if ( (*iter).first == _name)
-				{
-					_value = (*iter).second;
-					return true;
-				}
-			}
-			return false;
-		}
-
-		std::string Element::findAttribute(const std::string& _name)
-		{
-			for (VectorAttributes::iterator iter=mAttributes.begin(); iter!=mAttributes.end(); ++iter)
-			{
-				if ( (*iter).first == _name) return (*iter).second;
-			}
-			return "";
-		}
-
-		void Element::addAttribute(const std::string& _key, const std::string& _value)
-		{
-			mAttributes.push_back(PairAttribute(_key, _value));
-		}
-
-		void Element::removeAttribute(const std::string& _key)
-		{
-			for (size_t index=0; index<mAttributes.size(); ++index)
-			{
-				if (mAttributes[index].first == _key)
-				{
-					mAttributes.erase(mAttributes.begin() + index);
-					return;
-				}
-			}
-		}
-
-		ElementPtr Element::createCopy()
-		{
-			Element* elem = new Element(mName, nullptr, mType, mContent);
-			elem->mAttributes = mAttributes;
-
-			for (VectorElement::iterator iter=mChilds.begin(); iter!=mChilds.end(); ++iter)
-			{
-				Element* child = (*iter)->createCopy();
-				child->mParent = elem;
-				elem->mChilds.push_back(child);
-			}
-
-			return elem;
-		}
-
-		void Element::setAttribute(const std::string& _key, const std::string& _value)
-		{
-			for (size_t index=0; index<mAttributes.size(); ++index)
-			{
-				if (mAttributes[index].first == _key)
-				{
-					mAttributes[index].second = _value;
-					return;
-				}
-			}
-			mAttributes.push_back(PairAttribute(_key, _value));
-		}
-
-		void Element::addContent(const std::string& _content)
-		{
-			if (mContent.empty()) mContent = _content;
-			else
-			{
-				mContent += " ";
-				mContent += _content;
-			}
-		}
-
-#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC && !defined(STLPORT)
-		inline void open_stream(std::ofstream& _stream, const std::wstring& _wide) { _stream.open(_wide.c_str()); }
-		inline void open_stream(std::ifstream& _stream, const std::wstring& _wide) { _stream.open(_wide.c_str()); }
-#else
-		inline void open_stream(std::ofstream& _stream, const std::wstring& _wide) { _stream.open(UString(_wide).asUTF8_c_str()); }
-		inline void open_stream(std::ifstream& _stream, const std::wstring& _wide) { _stream.open(UString(_wide).asUTF8_c_str()); }
-#endif
-
-		//----------------------------------------------------------------------//
-		// class Document
-		//----------------------------------------------------------------------//
-		Document::Document():
-			mRoot(0),
-			mDeclaration(0),
-			mLastErrorFile(""),
-			mLine(0),
-			mCol(0)
-		{
-		}
-
-		Document::~Document()
-		{
-			clear();
-		}
-
-		// открывает обычным файлом, имя файла в utf8
-		bool Document::open(const std::string& _filename)
-		{
-			std::ifstream stream;
-			stream.open(_filename.c_str());
-
-			if (!stream.is_open())
-			{
-				mLastError = ErrorType::OpenFileFail;
-				setLastFileError(_filename);
-				return false;
-			}
-
-			bool result = open(stream);
-
-			stream.close();
-			return result;
-		}
-
-		// открывает обычным файлом, имя файла в utf16 или utf32
-		bool Document::open(const std::wstring& _filename)
-		{
-			std::ifstream stream;
-			open_stream(stream, _filename);
-
-			if (!stream.is_open())
-			{
-				mLastError = ErrorType::OpenFileFail;
-				setLastFileError(_filename);
-				return false;
-			}
-
-			bool result = open(stream);
-
-			stream.close();
-			return result;
-		}
-
-		bool Document::open(std::istream& _stream)
-		{
-			DataStream* data = new DataStream(&_stream);
-
-			bool result = open(data);
-			delete data;
-
-			return result;
-		}
-
-		// сохраняет файл, имя файла в кодировке utf8
-		bool Document::save(const std::string& _filename)
-		{
-			std::ofstream stream;
-			stream.open(_filename.c_str());
-
-			if (!stream.is_open())
-			{
-				mLastError = ErrorType::CreateFileFail;
-				setLastFileError(_filename);
-				return false;
-			}
-
-			bool result = save(stream);
-
-			if (!result)
-			{
-				setLastFileError(_filename);
-			}
-
-			stream.close();
-			return result;
-		}
-
-		// сохраняет файл, имя файла в кодировке utf16 или utf32
-		bool Document::save(const std::wstring& _filename)
-		{
-			std::ofstream stream;
-			open_stream(stream, _filename);
-
-			if (!stream.is_open())
-			{
-				mLastError = ErrorType::CreateFileFail;
-				setLastFileError(_filename);
-				return false;
-			}
-
-			bool result = save(stream);
-
-			if (!result)
-			{
-				setLastFileError(_filename);
-			}
-
-			stream.close();
-			return result;
-		}
-
-		// открывает обычным потоком
-		bool Document::open(IDataStream* _stream)
-		{
-			clear();
-
-			// это текущая строка для разбора
-			std::string line;
-			// это строка из файла
-			std::string read;
-			// текущий узел для разбора
-			ElementPtr currentNode = 0;
-
-			while (!_stream->eof())
-			{
-				// берем новую строку
-				_stream->readline(read, '\n');
-				if (read.empty()) continue;
-				if (read[read.size()-1] == '\r') read.erase(read.size()-1, 1);
-				if (read.empty()) continue;
-
-				mLine ++;
-				mCol = 0; // потом проверить на многострочных тэгах
-				if (read.empty()) continue;
-				// текущая строка для разбора и то что еще прочитали
-				line += read;
-
-				if (!parseLine(line, currentNode))
-				{
-					return false;
-				}
-
-			} // while (!stream.eof())
-
-			if (currentNode)
-			{
-				mLastError = ErrorType::NotClosedElements;
-				return false;
-			}
-
-			return true;
-		}
-
-		bool Document::save(std::ostream& _stream)
-		{
-			if (!mDeclaration)
-			{
-				mLastError = ErrorType::NoXMLDeclaration;
-				return false;
-			}
-
-			// заголовок utf8
-			_stream << (char)0xEFu;
-			_stream << (char)0xBBu;
-			_stream << (char)0xBFu;
-
-			mDeclaration->save(_stream, 0);
-			if (mRoot) mRoot->save(_stream, 0);
-
-			return true;
-		}
-
-		void Document::clear()
-		{
-			clearDeclaration();
-			clearRoot();
-			mLine = 0;
-			mCol = 0;
-		}
-
-		bool Document::parseTag(ElementPtr &_currentNode, std::string _content)
-		{
-
-			// убераем лишнее
-			MyGUI::utility::trim(_content);
-
-			if (_content.empty())
-			{
-				// создаем пустой тег
-				if (_currentNode) _currentNode = _currentNode->createChild("");
-				else
-				{
-					_currentNode = new Element("", 0);
-					// если это первый то запоминаем
-					if (!mRoot) mRoot = _currentNode;
-				}
-				return true;
-			}
-
-			char simbol = _content[0];
-			bool tag_info = false;
-
-			if (simbol == '!') return true; // проверяем на коментарии
-
-			// проверяем на информационный тег
-			if (simbol == '?')
-			{
-				tag_info = true;
-				_content.erase(0, 1); // удаляем первый символ
-			}
-
-			size_t start, end;
-			// проверяем на закрытие тега
-			if (simbol == '/')
-			{
-				if (_currentNode == 0)
-				{
-					// чета мы закрывам а ниче даже и не открыто
-					if (!mRoot)
-					{
-						mLastError = ErrorType::CloseNotOpenedElement;
-						return false;
-					}
-				}
-				// обрезаем имя тэга
-				start = _content.find_first_not_of(" \t", 1);
-				if (start == _content.npos)
-				{
-					// тег пустой
-					_content.clear();
-				}
-				else
-				{
-					end = _content.find_last_not_of(" \t");
-					_content = _content.substr(start, end - start+1);
-				}
-				// проверяем соответствие открывающего и закрывающего тегов
-				if (_currentNode->getName() != _content)
-				{
-					mLastError = ErrorType::InconsistentOpenCloseElements;
-					return false;
-				}
-				// а теперь снижаем текущий узел вниз
-				_currentNode = _currentNode->getParent();
-			}
-			else
-			{
-				// выделяем имя до первого пробела или закрывающего тега
-				std::string cut = _content;
-				start = _content.find_first_of(" \t/?", 1); // << превед
-				if (start != _content.npos)
-				{
-					cut = _content.substr(0, start);
-					_content = _content.substr(start);
-				}
-				else
-				{
-					_content.clear();
-				}
-
-				if (_currentNode) _currentNode = _currentNode->createChild(cut);
-				else
-				{
-					if (tag_info)
-					{
-						// информационный тег
-						if (mDeclaration)
-						{
-							mLastError = ErrorType::MoreThanOneXMLDeclaration;
-							return false;
-						}
-						_currentNode = new Element(cut, 0, ElementType::Comment);
-						mDeclaration = _currentNode;
-					}
-					else
-					{
-						// рутовый тег
-						if (mRoot)
-						{
-							mLastError = ErrorType::MoreThanOneRootElement;
-							return false;
-						}
-						_currentNode = new Element(cut, 0, ElementType::Normal);
-						mRoot = _currentNode;
-					}
-				}
-
-				// проверим на пустоту
-				start = _content.find_last_not_of(" \t");
-				if (start == _content.npos) return true;
-
-				// сразу отделим закрывающийся тэг
-				bool close = false;
-				if ((_content[start] == '/') || (_content[start] == '?'))
-				{
-					close = true;
-					// не будем резать строку, просто поставим пробел
-					_content[start] = ' ';
-					// проверим на пустоту
-					start = _content.find_last_not_of(" \t");
-					if (start == _content.npos)
-					{
-						// возвращаем все назад и уходим
-						_currentNode = _currentNode->getParent();
-						return true;
-					}
-				}
-
-				// а вот здесь уже в цикле разбиваем на атрибуты
-				while (true)
-				{
-					// ищем равно
-					start = _content.find('=');
-					if (start == _content.npos)
-					{
-						mLastError = ErrorType::IncorrectAttribute;
-						return false;
-					}
-					// ищем вторые ковычки
-					end = _content.find_first_of("\"\'", start+1);
-					if (end == _content.npos)
-					{
-						mLastError = ErrorType::IncorrectAttribute;
-						return false;
-					}
-					end = _content.find_first_of("\"\'", end+1);
-					if (end == _content.npos)
-					{
-						mLastError = ErrorType::IncorrectAttribute;
-						return false;
-					}
-
-					std::string key = _content.substr(0, start);
-					std::string value = _content.substr(start+1, end-start);
-
-					// проверка на валидность
-					if (! checkPair(key, value))
-					{
-						mLastError = ErrorType::IncorrectAttribute;
-						return false;
-					}
-
-					// добавляем пару в узел
-					_currentNode->addAttribute(key, value);
-
-					// следующий кусок
-					_content = _content.substr(end+1);
-
-					// в строке не осталось символов
-					start = _content.find_first_not_of(" \t");
-					if (start == _content.npos) break;
-
-					mCol += start;
-				}
-
-				// был закрывающий тег для текущего тега
-				if (close)
-				{
-					// не проверяем имена, потому что это наш тэг
-					_currentNode = _currentNode->getParent();
-				}
-
-			}
-			return true;
-		}
-
-		bool Document::checkPair(std::string &_key, std::string &_value)
-		{
-			// в ключе не должно быть ковычек и пробелов
-			MyGUI::utility::trim(_key);
-			if (_key.empty()) return false;
-			size_t start = _key.find_first_of(" \t\"\'&");
-			if (start != _key.npos) return false;
-
-			// в значении, ковычки по бокам
-			MyGUI::utility::trim(_value);
-			if (_value.size() < 2) return false;
-			if (((_value[0] != '"') || (_value[_value.length()-1] != '"')) &&
-				((_value[0] != '\'') || (_value[_value.length()-1] != '\''))) return false;
-			bool ok = true;
-			_value = utility::convert_from_xml(_value.substr(1, _value.length() - 2), ok);
-			return ok;
-		}
-
-		// ищет символ без учета ковычек
-		size_t Document::find(const std::string& _text, char _char, size_t _start)
-		{
-			// ковычки
-			bool kov = false;
-
-			// буфер для поиска
-			char buff[16] = "\"_\0";
-			buff[1] = _char;
-
-			size_t pos = _start;
-
-			while (true)
-			{
-				pos = _text.find_first_of(buff, pos);
-
-				// если уже конец, то досвидания
-				if (pos == _text.npos) break;
-
-				// нашли ковычку
-				else if (_text[pos] == '"')
-				{
-					kov = !kov;
-					pos ++;
-				}
-				// если мы в ковычках, то идем дальше
-				else if (kov) pos ++;
-
-				// мы не в ковычках
-				else break;
-
-			}
-
-			return pos;
-		}
-
-		void Document::clearDeclaration()
-		{
-			if (mDeclaration)
-			{
-				delete mDeclaration;
-				mDeclaration = 0;
-			}
-		}
-
-		void Document::clearRoot()
-		{
-			if (mRoot)
-			{
-				delete mRoot;
-				mRoot = 0;
-			}
-		}
-
-		ElementPtr Document::createDeclaration(const std::string& _version, const std::string& _encoding)
-		{
-			clearDeclaration();
-			mDeclaration = new Element("xml", 0, ElementType::Declaration);
-			mDeclaration->addAttribute("version", _version);
-			mDeclaration->addAttribute("encoding", _encoding);
-			return mDeclaration;
-		}
-
-		ElementPtr Document::createRoot(const std::string& _name)
-		{
-			clearRoot();
-			mRoot = new Element(_name, 0, ElementType::Normal);
-			return mRoot;
-		}
-
-		bool Document::parseLine(std::string& _line, ElementPtr& _element)
-		{
-			// крутимся пока в строке есть теги
-			while (true)
-			{
-				// сначала ищем по угловым скобкам
-				size_t start = find(_line, '<');
-				if (start == _line.npos) break;
-				size_t end = _line.npos;
-
-				// пытаемся вырезать многострочный коментарий
-				if ((start + 3 < _line.size()) && (_line[start + 1] == '!') && (_line[start + 2] == '-') && (_line[start + 3] == '-'))
-				{
-					end = _line.find("-->", start + 4);
-					if (end == _line.npos) break;
-					end += 2;
-				}
-				else
-				{
-					end = find(_line, '>', start+1);
-					if (end == _line.npos) break;
-				}
-				// проверяем на наличее тела
-				size_t body = _line.find_first_not_of(" \t<");
-				if (body < start)
-				{
-					std::string body_str = _line.substr(0, start);
-					// текущий символ
-					mCol = 0;
-
-					if (_element != 0)
-					{
-						bool ok = true;
-						_element->setContent(utility::convert_from_xml(body_str, ok));
-						if (!ok)
-						{
-							mLastError = ErrorType::IncorrectContent;
-							return false;
-						}
-					}
-				}
-				// вырезаем наш тэг и парсим
-				if (!parseTag(_element, _line.substr(start+1, end-start-1)))
-				{
-					return false;
-				}
-				// и обрезаем текущую строку разбора
-				_line = _line.substr(end+1);
-			}
-			return true;
-		}
-
-		std::string Document::getLastError()
-		{
-			const std::string& error = mLastError.print();
-			if (error.empty()) return error;
-			return MyGUI::utility::toString("'", error, "' ,  file='", mLastErrorFile, "' ,  line=", mLine, " ,  col=", mCol);
-		}
-
-		/*Document Document::createCopyFromElement(ElementPtr _node)
-		{
-			Document doc;
-			doc.mRoot = _node->createCopy();
-			return doc;
-		}*/
-
-	} // namespace xml
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/OgrePlatform/CMakeLists.txt b/extern/mygui_3.0.1/OgrePlatform/CMakeLists.txt
deleted file mode 100644
index 2fa38a242d..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-include_directories(
- include
- ${MYGUI_SOURCE_DIR}/MyGUIEngine/include
- ${OGRE_INCLUDE_DIR}
-)
-include(MyGUI.OgrePlatform.list)
-add_library(MyGUIOgrePlatform ${HEADER_FILES} ${SOURCE_FILES})
-target_link_libraries(MyGUIOgrePlatform ${OGRE_LIBRARIES})
-link_directories(${OGRE_LIB_DIR})
diff --git a/extern/mygui_3.0.1/OgrePlatform/MyGUI.OgrePlatform.list b/extern/mygui_3.0.1/OgrePlatform/MyGUI.OgrePlatform.list
deleted file mode 100644
index 93ea058d65..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/MyGUI.OgrePlatform.list
+++ /dev/null
@@ -1,41 +0,0 @@
-set (HEADER_FILES
-  include/MyGUI_LastHeader.h
-  include/MyGUI_OgreDataManager.h
-  include/MyGUI_OgreDataStream.h
-  include/MyGUI_OgreDiagnostic.h
-  include/MyGUI_OgrePlatform.h
-  include/MyGUI_OgreRenderManager.h
-  include/MyGUI_OgreTexture.h
-  include/MyGUI_OgreRTTexture.h
-  include/MyGUI_OgreVertexBuffer.h
-)
-set (SOURCE_FILES
-  src/MyGUI_OgreDataManager.cpp
-  src/MyGUI_OgreDataStream.cpp
-  src/MyGUI_OgreRenderManager.cpp
-  src/MyGUI_OgreTexture.cpp
-  src/MyGUI_OgreRTTexture.cpp
-  src/MyGUI_OgreVertexBuffer.cpp
-)
-SOURCE_GROUP("Source Files" FILES
-  src/MyGUI_OgreDataManager.cpp
-  src/MyGUI_OgreDataStream.cpp
-  src/MyGUI_OgreRenderManager.cpp
-  src/MyGUI_OgreTexture.cpp
-  src/MyGUI_OgreRTTexture.cpp
-  src/MyGUI_OgreVertexBuffer.cpp
-)
-SOURCE_GROUP("Header Files" FILES
-  include/MyGUI_LastHeader.h
-  include/MyGUI_OgreDataManager.h
-  include/MyGUI_OgreDataStream.h
-  include/MyGUI_OgreDiagnostic.h
-  include/MyGUI_OgrePlatform.h
-  include/MyGUI_OgreRenderManager.h
-  include/MyGUI_OgreTexture.h
-  include/MyGUI_OgreRTTexture.h
-  include/MyGUI_OgreVertexBuffer.h
-)
-SOURCE_GROUP("" FILES
-  CMakeLists.txt
-)
diff --git a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_LastHeader.h b/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_LastHeader.h
deleted file mode 100644
index 98e8f66171..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_LastHeader.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		10/2008
-	@module
-*/
-/*
-	This file is part of MyGUI.
-	
-	MyGUI is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	MyGUI 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 Lesser General Public License for more details.
-	
-	You should have received a copy of the GNU Lesser General Public License
-	along with MyGUI.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __MYGUI_LAST_HEADER_H__
-#define __MYGUI_LAST_HEADER_H__
-
-// used to enable deprecated warningd, disabled by Ogre
-#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
-
-#	pragma warning( default: 4996)
-
-#endif
-
-#endif // __MYGUI_LAST_HEADER_H__
diff --git a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreDataManager.h b/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreDataManager.h
deleted file mode 100644
index 054333c969..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreDataManager.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2008
-	@module
-*/
-
-#ifndef __MYGUI_OGRE_DATA_MANAGER_H__
-#define __MYGUI_OGRE_DATA_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_DataManager.h"
-
-namespace MyGUI
-{
-
-	class OgreDataManager :
-		public DataManager
-	{
-		MYGUI_INSTANCE_HEADER(OgreDataManager)
-
-	public:
-		void initialise(const std::string& _group);
-		void shutdown();
-
-		const std::string& getGroup() { return mGroup; }
-
-		virtual IDataStream* getData(const std::string& _name);
-
-		typedef std::vector<std::string> VectorString;
-
-		virtual bool isDataExist(const std::string& _name);
-
-		virtual const VectorString& getDataListNames(const std::string& _pattern);
-
-		virtual const std::string& getDataPath(const std::string& _name);
-
-	private:
-		const VectorString& getDataListNames(const std::string& _pattern, bool _fullpath);
-
-	private:
-		std::string mGroup;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_OGRE_DATA_MANAGER_H__
diff --git a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreDataStream.h b/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreDataStream.h
deleted file mode 100644
index 56fe8fcf0a..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreDataStream.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		08/2009
-	@module
-*/
-
-#ifndef __MYGUI_OGRE_DATA_STREAM_H__
-#define __MYGUI_OGRE_DATA_STREAM_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_IDataStream.h"
-
-#include <OgreDataStream.h>
-
-#include "MyGUI_LastHeader.h"
-
-namespace MyGUI
-{
-
-	class OgreDataStream : public IDataStream
-	{
-	public:
-		OgreDataStream(Ogre::DataStreamPtr _stream);
-		~OgreDataStream();
-
-		virtual bool eof();
-		virtual size_t size();
-		virtual void readline(std::string& _source, Char _delim);
-		virtual size_t read(void* _buf, size_t _count);
-
-	private:
-		Ogre::DataStreamPtr mStream;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_OGRE_DATA_STREAM_H__
diff --git a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreDiagnostic.h b/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreDiagnostic.h
deleted file mode 100644
index 111d1f6670..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreDiagnostic.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		06/2009
-	@module
-*/
-
-#ifndef __MYGUI_OGRE_DIAGNOSTIC_H__
-#define __MYGUI_OGRE_DIAGNOSTIC_H__
-
-#include "MyGUI_Prerequest.h"
-
-#define MYGUI_PLATFORM_LOG_SECTION "Platform"
-#define MYGUI_PLATFORM_LOG_FILENAME "MyGUI.log"
-#define MYGUI_PLATFORM_LOG(level, text) MYGUI_LOGGING(MYGUI_PLATFORM_LOG_SECTION, level, text)
-
-#define MYGUI_PLATFORM_EXCEPT(dest) \
-{ \
-	MYGUI_PLATFORM_LOG(Critical, dest); \
-	MYGUI_DBG_BREAK;\
-	std::ostringstream stream; \
-	stream << dest << "\n"; \
-	MYGUI_BASE_EXCEPT(stream.str().c_str(), "MyGUI"); \
-}
-
-#define MYGUI_PLATFORM_ASSERT(exp, dest) \
-{ \
-	if ( ! (exp) ) \
-	{ \
-		MYGUI_PLATFORM_LOG(Critical, dest); \
-		MYGUI_DBG_BREAK;\
-		std::ostringstream stream; \
-		stream << dest << "\n"; \
-		MYGUI_BASE_EXCEPT(stream.str().c_str(), "MyGUI"); \
-	} \
-}
-
-#endif // __MYGUI_OGRE_DIAGNOSTIC_H__
diff --git a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgrePlatform.h b/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgrePlatform.h
deleted file mode 100644
index 90674b5ba0..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgrePlatform.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-
-#ifndef __MYGUI_OGRE_PLATFORM_H__
-#define __MYGUI_OGRE_PLATFORM_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_OgreTexture.h"
-#include "MyGUI_OgreVertexBuffer.h"
-#include "MyGUI_OgreRenderManager.h"
-#include "MyGUI_OgreDataManager.h"
-#include "MyGUI_OgreDiagnostic.h"
-#include "MyGUI_OgreTexture.h"
-
-namespace MyGUI
-{
-
-	class OgrePlatform
-	{
-	public:
-		OgrePlatform() :
-			mIsInitialise(false)
-		{
-			mRenderManager = new OgreRenderManager();
-			mDataManager = new OgreDataManager();
-		}
-
-		~OgrePlatform()
-		{
-			assert(!mIsInitialise);
-			delete mRenderManager;
-			delete mDataManager;
-		}
-
-		void initialise(Ogre::RenderWindow* _window, Ogre::SceneManager* _scene, const std::string& _group = "General", const std::string& _logname = MYGUI_PLATFORM_LOG_FILENAME)
-		{
-			assert(!mIsInitialise);
-			mIsInitialise = true;
-
-			LogManager::registerSection(MYGUI_PLATFORM_LOG_SECTION, _logname);
-
-			mRenderManager->initialise(_window, _scene);
-			mDataManager->initialise(_group);
-		}
-
-		void shutdown()
-		{
-			assert(mIsInitialise);
-			mIsInitialise = false;
-
-			mRenderManager->shutdown();
-			mDataManager->shutdown();
-
-			// last platform log
-			LogManager::unregisterSection(MYGUI_PLATFORM_LOG_SECTION);
-		}
-
-		OgreRenderManager* getRenderManagerPtr()
-		{
-			assert(mIsInitialise);
-			return mRenderManager;
-		}
-
-		OgreDataManager* getDataManagerPtr()
-		{
-			assert(mIsInitialise);
-			return mDataManager;
-		}
-
-	private:
-		bool mIsInitialise;
-		OgreRenderManager* mRenderManager;
-		OgreDataManager* mDataManager;
-
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_OGRE_PLATFORM_H__
diff --git a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreRTTexture.h b/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreRTTexture.h
deleted file mode 100644
index a391b0ca9b..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreRTTexture.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		10/2009
-	@module
-*/
-
-#ifndef __MYGUI_OGRE_RTTEXTURE_H__
-#define __MYGUI_OGRE_RTTEXTURE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_IRenderTarget.h"
-
-#include <Ogre.h>
-
-#include "MyGUI_LastHeader.h"
-
-namespace MyGUI
-{
-
-	class OgreRTTexture :
-		public IRenderTarget
-	{
-	public:
-		OgreRTTexture(Ogre::TexturePtr _texture);
-		virtual ~OgreRTTexture();
-
-		virtual void begin();
-		virtual void end();
-
-		virtual void doRender(IVertexBuffer* _buffer, ITexture* _texture, size_t _count);
-
-		virtual const RenderTargetInfo& getInfo() { return mRenderTargetInfo; }
-
-	private:
-		RenderTargetInfo mRenderTargetInfo;
-		Ogre::Viewport* mViewport;
-		Ogre::Viewport* mSaveViewport;
-		Ogre::TexturePtr mTexture;
-		Ogre::Matrix4 mProjectMatrix;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_OGRE_RTTEXTURE_H__
diff --git a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreRenderManager.h b/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreRenderManager.h
deleted file mode 100644
index f3195a2f86..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreRenderManager.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2008
-	@module
-*/
-
-#ifndef __MYGUI_OGRE_RENDER_MANAGER_H__
-#define __MYGUI_OGRE_RENDER_MANAGER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Instance.h"
-#include "MyGUI_RenderFormat.h"
-#include "MyGUI_IVertexBuffer.h"
-#include "MyGUI_RenderManager.h"
-
-#include <Ogre.h>
-
-#include "MyGUI_LastHeader.h"
-
-namespace MyGUI
-{
-
-	class OgreRenderManager :
-		public RenderManager,
-		public IRenderTarget,
-		public Ogre::WindowEventListener,
-		public Ogre::RenderQueueListener,
-		public Ogre::RenderSystem::Listener
-	{
-		MYGUI_INSTANCE_HEADER(OgreRenderManager)
-
-	public:
-		void initialise(Ogre::RenderWindow* _window, Ogre::SceneManager* _scene);
-		void shutdown();
-
-		virtual const IntSize& getViewSize() const { return mViewSize; }
-
-		virtual VertexColourType getVertexFormat() { return mVertexFormat; }
-
-		virtual IVertexBuffer* createVertexBuffer();
-		virtual void destroyVertexBuffer(IVertexBuffer* _buffer);
-
-		virtual ITexture* createTexture(const std::string& _name);
-		virtual void destroyTexture(ITexture* _texture);
-		virtual ITexture* getTexture(const std::string& _name);
-
-		virtual bool isFormatSupported(PixelFormat _format, TextureUsage _usage);
-
-		virtual void begin();
-		virtual void end();
-
-		virtual void doRender(IVertexBuffer* _buffer, ITexture* _texture, size_t _count);
-
-		virtual const RenderTargetInfo& getInfo() { return mInfo; }
-
-		void setRenderSystem(Ogre::RenderSystem* _render);
-
-		void setRenderWindow(Ogre::RenderWindow* _window);
-
-		/** Set scene manager where MyGUI will be rendered */
-		void setSceneManager(Ogre::SceneManager* _scene);
-
-		/** Get GUI viewport index */
-		size_t getActiveViewport() { return mActiveViewport; }
-
-		/** Set GUI viewport index */
-		void setActiveViewport(size_t _num);
-
-		Ogre::RenderWindow * getRenderWindow() { return mWindow; }
-
-#if MYGUI_DEBUG_MODE == 1
-		virtual bool checkTexture(ITexture* _texture);
-#endif
-
-	private:
-		virtual void renderQueueStarted(Ogre::uint8 queueGroupId, const Ogre::String& invocation, bool& skipThisInvocation);
-		virtual void renderQueueEnded(Ogre::uint8 queueGroupId, const Ogre::String& invocation, bool& repeatThisInvocation);
-		virtual void windowResized(Ogre::RenderWindow* _window);
-
-		// ��������������� ������
-		virtual void eventOccurred(const Ogre::String& eventName, const Ogre::NameValuePairList* parameters);
-
-		void destroyAllResources();
-		void updateRenderInfo();
-
-	private:
-		// ���� ��� ���������� ���� � ���
-		bool mUpdate;
-
-		IntSize mViewSize;
-
-		Ogre::SceneManager* mSceneManager;
-
-		VertexColourType mVertexFormat;
-
-		// ����, �� ������� �� ������������� ��� ��������� ��������
-		Ogre::RenderWindow* mWindow;
-
-		// �������, � ������� �������� �������
-		size_t mActiveViewport;
-
-		Ogre::RenderSystem* mRenderSystem;
-		Ogre::TextureUnitState::UVWAddressingMode mTextureAddressMode;
-		Ogre::LayerBlendModeEx mColorBlendMode, mAlphaBlendMode;
-
-		RenderTargetInfo mInfo;
-
-		typedef std::map<std::string, ITexture*> MapTexture;
-		MapTexture mTextures;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_OGRE_RENDER_MANAGER_H__
diff --git a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreTexture.h b/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreTexture.h
deleted file mode 100644
index d261aff6d9..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreTexture.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-
-#ifndef __MYGUI_OGRE_TEXTURE_H__
-#define __MYGUI_OGRE_TEXTURE_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_ITexture.h"
-#include "MyGUI_RenderFormat.h"
-
-#include <OgreResource.h>
-#include <OgreTexture.h>
-
-#include "MyGUI_LastHeader.h"
-
-namespace MyGUI
-{
-
-	class OgreTexture :
-		public ITexture,
-		public Ogre::ManualResourceLoader
-	{
-	public:
-		OgreTexture(const std::string& _name, const std::string& _group);
-		virtual ~OgreTexture();
-
-		virtual const std::string& getName() const;
-
-		virtual void createManual(int _width, int _height, TextureUsage _usage, PixelFormat _format);
-		virtual void loadFromFile(const std::string& _filename);
-		virtual void saveToFile(const std::string& _filename);
-
-		virtual void setInvalidateListener(ITextureInvalidateListener* _listener);
-
-		virtual void destroy();
-
-		virtual void* lock(TextureUsage _access);
-		virtual void unlock();
-		virtual bool isLocked();
-
-		virtual int getWidth();
-		virtual int getHeight();
-
-		virtual PixelFormat getFormat() { return mOriginalFormat; }
-		virtual TextureUsage getUsage() { return mOriginalUsage; }
-		virtual size_t getNumElemBytes() { return mNumElemBytes; }
-
-		virtual IRenderTarget* getRenderTarget();
-
-		static Ogre::TextureUsage convertUsage(TextureUsage _usage);
-		static Ogre::PixelFormat convertFormat(PixelFormat _format);
-	/*internal:*/
-		Ogre::TexturePtr getOgreTexture() { return mTexture; }
-		void setOgreTexture(Ogre::TexturePtr _value) { mTexture = _value; }
-
-	private:
-		void setUsage(TextureUsage _usage);
-		void setFormat(PixelFormat _format);
-		void setFormatByOgreTexture();
-
-		virtual void loadResource(Ogre::Resource* resource);
-
-	private:
-		Ogre::TexturePtr mTexture;
-		std::string mName;
-		std::string mGroup;
-
-		TextureUsage mOriginalUsage;
-		PixelFormat mOriginalFormat;
-		size_t mNumElemBytes;
-
-		Ogre::PixelFormat mPixelFormat;
-		Ogre::TextureUsage mUsage;
-
-		ITextureInvalidateListener* mListener;
-		IRenderTarget* mRenderTarget;
-		Ogre::PixelBox mTmpData;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_OGRE_TEXTURE_H__
diff --git a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreVertexBuffer.h b/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreVertexBuffer.h
deleted file mode 100644
index 2d03e03026..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/include/MyGUI_OgreVertexBuffer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-
-#ifndef __MYGUI_OGRE_VERTEX_BUFFER_H__
-#define __MYGUI_OGRE_VERTEX_BUFFER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_IVertexBuffer.h"
-
-#include <OgreHardwareBufferManager.h>
-#include <OgreHardwareVertexBuffer.h>
-#include <OgrePrerequisites.h>
-#include <OgreRenderOperation.h>
-#include <OgreRenderSystem.h>
-#include <OgreTextureManager.h>
-#include <OgreTextureUnitState.h>
-
-#include "MyGUI_LastHeader.h"
-
-namespace MyGUI
-{
-
-	class OgreVertexBuffer : public IVertexBuffer
-	{
-	public:
-		OgreVertexBuffer();
-		virtual ~OgreVertexBuffer();
-
-		virtual void setVertextCount(size_t _count);
-		virtual size_t getVertextCount();
-
-		virtual Vertex* lock();
-		virtual void unlock();
-
-		Ogre::RenderOperation* getRenderOperation() { return &mRenderOperation; }
-
-	private:
-		void createVertexBuffer();
-		void destroyVertexBuffer();
-		void resizeVertexBuffer();
-
-	private:
-		size_t mVertexCount;
-		size_t mNeedVertexCount;
-
-		Ogre::RenderOperation mRenderOperation;
-		Ogre::HardwareVertexBufferSharedPtr mVertexBuffer;
-	};
-
-} // namespace MyGUI
-
-#endif // __MYGUI_OGRE_VERTEX_BUFFER_H__
diff --git a/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreDataManager.cpp b/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreDataManager.cpp
deleted file mode 100644
index 4ecbd63ac3..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreDataManager.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		05/2008
-	@module
-*/
-
-#include "MyGUI_OgreDataManager.h"
-#include "MyGUI_OgreDiagnostic.h"
-#include "MyGUI_OgreDataStream.h"
-
-#include <Ogre.h>
-
-#include "MyGUI_LastHeader.h"
-
-#if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-namespace MyGUI
-{
-
-	#if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
-	// This function will locate the path to our application on OS X,
-	// unlike windows you can not rely on the curent working directory
-	// for locating your configuration files and resources.
-	std::string MYGUI_EXPORT macBundlePath()
-	{
-		char path[1024];
-		CFBundleRef mainBundle = CFBundleGetMainBundle();    assert(mainBundle);
-		CFURLRef mainBundleURL = CFBundleCopyBundleURL(mainBundle);    assert(mainBundleURL);
-		CFStringRef cfStringRef = CFURLCopyFileSystemPath( mainBundleURL, kCFURLPOSIXPathStyle);    assert(cfStringRef);
-		CFStringGetCString(cfStringRef, path, 1024, kCFStringEncodingASCII);
-		CFRelease(mainBundleURL);
-		CFRelease(cfStringRef);
-		return std::string(path);
-	}
-	#endif
-
-	MYGUI_INSTANCE_IMPLEMENT(OgreDataManager)
-
-	void OgreDataManager::initialise(const std::string& _group)
-	{
-		MYGUI_PLATFORM_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_PLATFORM_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		mGroup = _group;
-
-		MYGUI_PLATFORM_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void OgreDataManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_PLATFORM_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		MYGUI_PLATFORM_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	IDataStream* OgreDataManager::getData(const std::string& _name)
-	{
-		try
-		{
-			Ogre::DataStreamPtr stream = Ogre::ResourceGroupManager::getSingleton().openResource(_name, mGroup);
-			OgreDataStream* data = new OgreDataStream(stream);
-
-			return data;
-		}
-		catch(Ogre::FileNotFoundException)
-		{
-		}
-
-		return nullptr;
-	}
-
-	bool OgreDataManager::isDataExist(const std::string& _name)
-	{
-		const VectorString& files = getDataListNames(_name);
-		return (files.size() == 1);
-	}
-
-	const VectorString& OgreDataManager::getDataListNames(const std::string& _pattern)
-	{
-		return getDataListNames(_pattern, false);
-	}
-
-	const VectorString& OgreDataManager::getDataListNames(const std::string& _pattern, bool _fullpath)
-	{
-		static VectorString result;
-		result.clear();
-
-		Ogre::FileInfoListPtr pFileInfo = Ogre::ResourceGroupManager::getSingleton().findResourceFileInfo(mGroup, _pattern);
-
-		result.reserve(pFileInfo->size());
-
-		for (Ogre::FileInfoList::iterator fi = pFileInfo->begin(); fi != pFileInfo->end(); ++fi )
-		{
-			if (fi->path.empty())
-			{
-				bool found = false;
-				for (VectorString::iterator iter=result.begin(); iter!=result.end(); ++iter)
-				{
-					if (*iter == fi->filename)
-					{
-						found = true;
-						break;
-					}
-				}
-				if (!found)
-				{
-					result.push_back(_fullpath ? fi->archive->getName() + "/" + fi->filename : fi->filename);
-				}
-
-			}
-		}
-
-		pFileInfo.setNull();
-
-		return result;
-	}
-
-	const std::string& OgreDataManager::getDataPath(const std::string& _name)
-	{
-		static std::string result;
-
-		const VectorString& files = getDataListNames(_name, true);
-		result = files.size() == 1 ? files[0] : "";
-
-		return result;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreDataStream.cpp b/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreDataStream.cpp
deleted file mode 100644
index 53ea73b7b3..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreDataStream.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		08/2009
-	@module
-*/
-
-#include "MyGUI_OgreDataStream.h"
-
-namespace MyGUI
-{
-
-	OgreDataStream::OgreDataStream(Ogre::DataStreamPtr _stream) :
-		mStream(_stream)
-	{
-	}
-
-	OgreDataStream::~OgreDataStream()
-	{
-		mStream.setNull();
-	}
-
-	bool OgreDataStream::eof()
-	{
-		return mStream.isNull() ? true : mStream->eof();
-	}
-
-	size_t OgreDataStream::size()
-	{
-		return mStream.isNull() ? 0 : mStream->size();
-	}
-
-	void OgreDataStream::readline(std::string& _source, Char _delim)
-	{
-		if (mStream.isNull())
-		{
-			_source.clear();
-			return;
-		}
-		_source = mStream->getLine(false);
-	}
-
-	size_t OgreDataStream::read(void* _buf, size_t _count)
-	{
-		if (mStream.isNull()) return 0;
-		return mStream->read(_buf, _count);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreRTTexture.cpp b/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreRTTexture.cpp
deleted file mode 100644
index e626d99d73..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreRTTexture.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		10/2009
-	@module
-*/
-
-#include <cstring>
-#include "MyGUI_OgreRTTexture.h"
-#include "MyGUI_OgreRenderManager.h"
-
-namespace MyGUI
-{
-
-	OgreRTTexture::OgreRTTexture(Ogre::TexturePtr _texture) :
-		mViewport(nullptr),
-		mSaveViewport(nullptr),
-		mTexture(_texture)
-	{
-		mProjectMatrix = Ogre::Matrix4::IDENTITY;
-		Ogre::Root * root = Ogre::Root::getSingletonPtr();
-		if (root != nullptr)
-		{
-			Ogre::RenderSystem* system = root->getRenderSystem();
-			if (system != nullptr)
-			{
-				int width = mTexture->getWidth();
-				int height = mTexture->getHeight();
-
-				mRenderTargetInfo.maximumDepth = system->getMaximumDepthInputValue();
-				mRenderTargetInfo.hOffset = system->getHorizontalTexelOffset() / float(width);
-				mRenderTargetInfo.vOffset = system->getVerticalTexelOffset() / float(height);
-				mRenderTargetInfo.aspectCoef = float(height) / float(width);
-				mRenderTargetInfo.pixScaleX = 1.0 / float(width);
-				mRenderTargetInfo.pixScaleY = 1.0 / float(height);
-			}
-
-			if (mTexture->getBuffer()->getRenderTarget()->requiresTextureFlipping())
-			{
-				mProjectMatrix[1][0] = -mProjectMatrix[1][0];
-				mProjectMatrix[1][1] = -mProjectMatrix[1][1];
-				mProjectMatrix[1][2] = -mProjectMatrix[1][2];
-				mProjectMatrix[1][3] = -mProjectMatrix[1][3];
-			}
-		}
-	}
-
-	OgreRTTexture::~OgreRTTexture()
-	{
-	}
-
-	void OgreRTTexture::begin()
-	{
-		Ogre::RenderTexture* rtt = mTexture->getBuffer()->getRenderTarget();
-
-		if (mViewport == nullptr)
-		{
-			mViewport = rtt->addViewport(nullptr);
-			mViewport->setClearEveryFrame(false);
-			mViewport->setOverlaysEnabled(false);
-		}
-
-		Ogre::RenderSystem* system = Ogre::Root::getSingleton().getRenderSystem();
-		system->_setProjectionMatrix(mProjectMatrix);
-		mSaveViewport = system->_getViewport();
-		system->_setViewport(mViewport);
-		system->clearFrameBuffer(Ogre::FBT_COLOUR, Ogre::ColourValue::ZERO);
-	}
-
-	void OgreRTTexture::end()
-	{
-		Ogre::RenderSystem* system = Ogre::Root::getSingleton().getRenderSystem();
-		system->_setViewport(mSaveViewport);
-		system->_setProjectionMatrix(Ogre::Matrix4::IDENTITY);
-	}
-
-	void OgreRTTexture::doRender(IVertexBuffer* _buffer, ITexture* _texture, size_t _count)
-	{
-		OgreRenderManager::getInstance().doRender(_buffer, _texture, _count);
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreRenderManager.cpp b/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreRenderManager.cpp
deleted file mode 100644
index 58848e65b7..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreRenderManager.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2008
-	@module
-*/
-
-#include "MyGUI_OgreDataManager.h"
-#include "MyGUI_OgreRenderManager.h"
-#include "MyGUI_OgreTexture.h"
-#include "MyGUI_OgreVertexBuffer.h"
-#include "MyGUI_LogManager.h"
-#include "MyGUI_Gui.h"
-#include "MyGUI_OgreDiagnostic.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_Timer.h"
-
-namespace MyGUI
-{
-
-	MYGUI_INSTANCE_IMPLEMENT(OgreRenderManager)
-
-	void OgreRenderManager::initialise(Ogre::RenderWindow* _window, Ogre::SceneManager* _scene)
-	{
-		MYGUI_PLATFORM_ASSERT(!mIsInitialise, INSTANCE_TYPE_NAME << " initialised twice");
-		MYGUI_PLATFORM_LOG(Info, "* Initialise: " << INSTANCE_TYPE_NAME);
-
-		mColorBlendMode.blendType	= Ogre::LBT_COLOUR;
-		mColorBlendMode.source1		= Ogre::LBS_TEXTURE;
-		mColorBlendMode.source2		= Ogre::LBS_DIFFUSE;
-		mColorBlendMode.operation	= Ogre::LBX_MODULATE;
-
-		mAlphaBlendMode.blendType	= Ogre::LBT_ALPHA;
-		mAlphaBlendMode.source1		= Ogre::LBS_TEXTURE;
-		mAlphaBlendMode.source2		= Ogre::LBS_DIFFUSE;
-		mAlphaBlendMode.operation	= Ogre::LBX_MODULATE;
-
-		mTextureAddressMode.u = Ogre::TextureUnitState::TAM_CLAMP;
-		mTextureAddressMode.v = Ogre::TextureUnitState::TAM_CLAMP;
-		mTextureAddressMode.w = Ogre::TextureUnitState::TAM_CLAMP;
-
-		mSceneManager = nullptr;
-		mWindow = nullptr;
-		mUpdate = false;
-		mRenderSystem = nullptr;
-		mActiveViewport = 0;
-
-		Ogre::Root * root = Ogre::Root::getSingletonPtr();
-		if (root != nullptr)
-			setRenderSystem(root->getRenderSystem());
-		setRenderWindow(_window);
-		setSceneManager(_scene);
-
-		MYGUI_PLATFORM_LOG(Info, INSTANCE_TYPE_NAME << " successfully initialized");
-		mIsInitialise = true;
-	}
-
-	void OgreRenderManager::shutdown()
-	{
-		if (!mIsInitialise) return;
-		MYGUI_PLATFORM_LOG(Info, "* Shutdown: " << INSTANCE_TYPE_NAME);
-
-		destroyAllResources();
-
-		setSceneManager(nullptr);
-		setRenderWindow(nullptr);
-		setRenderSystem(nullptr);
-
-		MYGUI_PLATFORM_LOG(Info, INSTANCE_TYPE_NAME << " successfully shutdown");
-		mIsInitialise = false;
-	}
-
-	void OgreRenderManager::setRenderSystem(Ogre::RenderSystem* _render)
-	{
-		// ������������
-		if (mRenderSystem != nullptr)
-		{
-			mRenderSystem->removeListener(this);
-			mRenderSystem = nullptr;
-		}
-
-		mRenderSystem = _render;
-
-		// ������������� �� ������ �����
-		if (mRenderSystem != nullptr)
-		{
-			mRenderSystem->addListener(this);
-
-			// ������ ����� � ��������
-			Ogre::VertexElementType vertext_type = mRenderSystem->getColourVertexElementType();
-			if (vertext_type == Ogre::VET_COLOUR_ARGB) mVertexFormat = VertexColourType::ColourARGB;
-			else if (vertext_type == Ogre::VET_COLOUR_ABGR) mVertexFormat = VertexColourType::ColourABGR;
-
-			updateRenderInfo();
-		}
-	}
-
-	void OgreRenderManager::setRenderWindow(Ogre::RenderWindow* _window)
-	{
-		// ������������
-		if (mWindow != nullptr)
-		{
-			Ogre::WindowEventUtilities::removeWindowEventListener(mWindow, this);
-			mWindow = nullptr;
-		}
-
-		mWindow = _window;
-
-		if (mWindow != nullptr)
-		{
-			Ogre::WindowEventUtilities::addWindowEventListener(mWindow, this);
-			windowResized(mWindow);
-		}
-	}
-
-	void OgreRenderManager::setSceneManager(Ogre::SceneManager* _scene)
-	{
-		if (nullptr != mSceneManager)
-		{
-			mSceneManager->removeRenderQueueListener(this);
-			mSceneManager = nullptr;
-		}
-
-		mSceneManager = _scene;
-
-		if (nullptr != mSceneManager)
-		{
-			mSceneManager->addRenderQueueListener(this);
-		}
-	}
-
-	void OgreRenderManager::setActiveViewport(size_t _num)
-	{
-		mActiveViewport = _num;
-
-		if (mWindow != nullptr)
-		{
-			Ogre::WindowEventUtilities::removeWindowEventListener(mWindow, this);
-			Ogre::WindowEventUtilities::addWindowEventListener(mWindow, this);
-
-			// �������� ����������
-			windowResized(mWindow);
-		}
-	}
-
-	void OgreRenderManager::renderQueueStarted(Ogre::uint8 queueGroupId, const Ogre::String& invocation, bool& skipThisInvocation)
-	{
-		if (Ogre::RENDER_QUEUE_OVERLAY != queueGroupId) return;
-
-		Ogre::Viewport * viewport = mSceneManager->getCurrentViewport();
-		if (nullptr == viewport
-			|| !viewport->getOverlaysEnabled())
-			return;
-
-		if (mWindow->getNumViewports() <= mActiveViewport
-			|| viewport != mWindow->getViewport(mActiveViewport))
-				return;
-
-		static Timer timer;
-		static unsigned long last_time = timer.getMilliseconds();
-		unsigned long now_time = timer.getMilliseconds();
-		unsigned long time = now_time - last_time;
-
-		Gui* gui = Gui::getInstancePtr();
-		if (gui != nullptr)
-			gui->_injectFrameEntered((float)((double)(time) / (double)1000));
-
-		last_time = now_time;
-
-		begin();
-		LayerManager::getInstance().renderToTarget(this, mUpdate);
-		end();
-
-		// ���������� ����
-		mUpdate = false;
-	}
-
-	void OgreRenderManager::renderQueueEnded(Ogre::uint8 queueGroupId, const Ogre::String& invocation, bool& repeatThisInvocation)
-	{
-	}
-
-	void OgreRenderManager::eventOccurred(const Ogre::String& eventName, const Ogre::NameValuePairList* parameters)
-	{
-		if (eventName == "DeviceLost")
-		{
-		}
-		else if (eventName == "DeviceRestored")
-		{
-			// �������� ����
-			mUpdate = true;
-		}
-	}
-
-	IVertexBuffer* OgreRenderManager::createVertexBuffer()
-	{
-		return new OgreVertexBuffer();
-	}
-
-	void OgreRenderManager::destroyVertexBuffer(IVertexBuffer* _buffer)
-	{
-		delete _buffer;
-	}
-
-	// ��� ���������� �� ��������� ���� �������
-	void OgreRenderManager::windowResized(Ogre::RenderWindow* _window)
-	{
-		if (_window->getNumViewports() > mActiveViewport)
-		{
-			Ogre::Viewport* port = _window->getViewport(mActiveViewport);
-			mViewSize.set(port->getActualWidth(), port->getActualHeight());
-
-			// �������� ����
-			mUpdate = true;
-
-			updateRenderInfo();
-
-			Gui* gui = Gui::getInstancePtr();
-			if (gui != nullptr)
-				gui->resizeWindow(mViewSize);
-		}
-	}
-
-	void OgreRenderManager::updateRenderInfo()
-	{
-		if (mRenderSystem != nullptr)
-		{
-			mInfo.maximumDepth = mRenderSystem->getMaximumDepthInputValue();
-			mInfo.hOffset = mRenderSystem->getHorizontalTexelOffset() / float(mViewSize.width);
-			mInfo.vOffset = mRenderSystem->getVerticalTexelOffset() / float(mViewSize.height);
-			mInfo.aspectCoef = float(mViewSize.height) / float(mViewSize.width);
-			mInfo.pixScaleX = 1.0 / float(mViewSize.width);
-			mInfo.pixScaleY = 1.0 / float(mViewSize.height);
-		}
-	}
-
-	void OgreRenderManager::doRender(IVertexBuffer* _buffer, ITexture* _texture, size_t _count)
-	{
-		if (_texture)
-		{
-			OgreTexture* texture = static_cast<OgreTexture*>(_texture);
-
-			Ogre::TexturePtr texture_ptr = texture->getOgreTexture();
-			if (!texture_ptr.isNull())
-			{
-				// � OpenGL ���������� ������������ ����� ����� ��������
-				mRenderSystem->_setTextureUnitFiltering(0, Ogre::FO_LINEAR, Ogre::FO_LINEAR, Ogre::FO_NONE);
-				mRenderSystem->_setTexture(0, true, texture_ptr);
-			}
-		}
-		
-		OgreVertexBuffer* buffer = static_cast<OgreVertexBuffer*>(_buffer);
-		Ogre::RenderOperation* operation = buffer->getRenderOperation();
-		operation->vertexData->vertexCount = _count;
-
-		mRenderSystem->_render(*operation);
-	}
-
-	void OgreRenderManager::begin()
-	{
-		// set-up matrices
-		mRenderSystem->_setWorldMatrix(Ogre::Matrix4::IDENTITY);
-		mRenderSystem->_setViewMatrix(Ogre::Matrix4::IDENTITY);
-		mRenderSystem->_setProjectionMatrix(Ogre::Matrix4::IDENTITY);
-
-		// initialise render settings
-		mRenderSystem->setLightingEnabled(false);
-		mRenderSystem->_setDepthBufferParams(false, false);
-		mRenderSystem->_setDepthBias(0, 0);
-		mRenderSystem->_setCullingMode(Ogre::CULL_NONE);
-		mRenderSystem->_setFog(Ogre::FOG_NONE);
-		mRenderSystem->_setColourBufferWriteEnabled(true, true, true, true);
-		mRenderSystem->unbindGpuProgram(Ogre::GPT_FRAGMENT_PROGRAM);
-		mRenderSystem->unbindGpuProgram(Ogre::GPT_VERTEX_PROGRAM);
-		mRenderSystem->setShadingType(Ogre::SO_GOURAUD);
-
-		// initialise texture settings
-		mRenderSystem->_setTextureCoordCalculation(0, Ogre::TEXCALC_NONE);
-		mRenderSystem->_setTextureCoordSet(0, 0);
-		mRenderSystem->_setTextureUnitFiltering(0, Ogre::FO_LINEAR, Ogre::FO_LINEAR, Ogre::FO_NONE);
-		mRenderSystem->_setTextureAddressingMode(0, mTextureAddressMode);
-		mRenderSystem->_setTextureMatrix(0, Ogre::Matrix4::IDENTITY);
-#if OGRE_VERSION < MYGUI_DEFINE_VERSION(1, 6, 0)
-		mRenderSystem->_setAlphaRejectSettings(Ogre::CMPF_ALWAYS_PASS, 0);
-#else
-		mRenderSystem->_setAlphaRejectSettings(Ogre::CMPF_ALWAYS_PASS, 0, false);
-#endif
-		mRenderSystem->_setTextureBlendMode(0, mColorBlendMode);
-		mRenderSystem->_setTextureBlendMode(0, mAlphaBlendMode);
-		mRenderSystem->_disableTextureUnitsFrom(1);
-
-		// enable alpha blending
-		mRenderSystem->_setSceneBlending(Ogre::SBF_SOURCE_ALPHA, Ogre::SBF_ONE_MINUS_SOURCE_ALPHA);
-	}
-
-	void OgreRenderManager::end()
-	{
-	}
-
-	ITexture* OgreRenderManager::createTexture(const std::string& _name)
-	{
-		MapTexture::const_iterator item = mTextures.find(_name);
-		MYGUI_PLATFORM_ASSERT(item == mTextures.end(), "Texture '" << _name << "' already exist");
-
-		OgreTexture* texture = new OgreTexture(_name, OgreDataManager::getInstance().getGroup());
-		mTextures[_name] = texture;
-		return texture;
-	}
-
-	void OgreRenderManager::destroyTexture(ITexture* _texture)
-	{
-		if (_texture == nullptr) return;
-
-		MapTexture::iterator item = mTextures.find(_texture->getName());
-		MYGUI_PLATFORM_ASSERT(item != mTextures.end(), "Texture '" << _texture->getName() << "' not found");
-
-		mTextures.erase(item);
-		delete _texture;
-	}
-
-	ITexture* OgreRenderManager::getTexture(const std::string& _name)
-	{
-		MapTexture::const_iterator item = mTextures.find(_name);
-		if (item == mTextures.end())
-		{
-			Ogre::TexturePtr texture = (Ogre::TexturePtr)Ogre::TextureManager::getSingleton().getByName(_name);
-			if (!texture.isNull())
-			{
-				ITexture* result = createTexture(_name);
-				static_cast<OgreTexture*>(result)->setOgreTexture(texture);
-				return result;
-			}
-			return nullptr;
-		}
-		return item->second;
-	}
-
-	bool OgreRenderManager::isFormatSupported(PixelFormat _format, TextureUsage _usage)
-	{
-		return Ogre::TextureManager::getSingleton().isFormatSupported(
-			Ogre::TEX_TYPE_2D,
-			OgreTexture::convertFormat(_format),
-			OgreTexture::convertUsage(_usage));
-	}
-
-	void OgreRenderManager::destroyAllResources()
-	{
-		for (MapTexture::const_iterator item=mTextures.begin(); item!=mTextures.end(); ++item)
-		{
-			delete item->second;
-		}
-		mTextures.clear();
-	}
-
-#if MYGUI_DEBUG_MODE == 1
-	bool OgreRenderManager::checkTexture(ITexture* _texture)
-	{
-		for (MapTexture::const_iterator item=mTextures.begin(); item!=mTextures.end(); ++item)
-		{
-			if (item->second == _texture)
-				return true;
-		}
-		return false;
-	}
-#endif
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreTexture.cpp b/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreTexture.cpp
deleted file mode 100644
index 0f0553c78f..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreTexture.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-
-#include <cstring>
-#include "MyGUI_OgreTexture.h"
-#include "MyGUI_DataManager.h"
-#include "MyGUI_OgreRenderManager.h"
-#include "MyGUI_OgreDiagnostic.h"
-#include "MyGUI_OgreRTTexture.h"
-#include <Ogre.h>
-
-#include "MyGUI_LastHeader.h"
-
-namespace MyGUI
-{
-
-	OgreTexture::OgreTexture(const std::string& _name, const std::string& _group) :
-		mName(_name),
-		mGroup(_group),
-		mNumElemBytes(0),
-		mPixelFormat(Ogre::PF_UNKNOWN),
-		mUsage(Ogre::TU_DEFAULT),
-		mListener(nullptr),
-		mRenderTarget(nullptr)
-	{
-		mTmpData.data = nullptr;
-	}
-
-	OgreTexture::~OgreTexture()
-	{
-		destroy();
-	}
-
-	const std::string& OgreTexture::getName() const
-	{
-		return mName;
-	}
-
-	void OgreTexture::saveToFile(const std::string& _filename)
-	{
-		Ogre::uchar *readrefdata = (Ogre::uchar*)lock(TextureUsage::Read);
-
-		Ogre::Image img;
-		img = img.loadDynamicImage(readrefdata, mTexture->getWidth(), mTexture->getHeight(), mTexture->getFormat());
-		img.save(_filename);
-
-		unlock();
-	}
-
-	void OgreTexture::setInvalidateListener(ITextureInvalidateListener* _listener)
-	{
-		mListener = _listener;
-	}
-
-	void OgreTexture::destroy()
-	{
-		if (mTmpData.data != nullptr)
-		{
-			delete[] (uint8*)mTmpData.data;
-			mTmpData.data = nullptr;
-		}
-
-		if (mRenderTarget != nullptr)
-		{
-			delete mRenderTarget;
-			mRenderTarget = nullptr;
-		}
-
-		if (!mTexture.isNull())
-		{
-			Ogre::TextureManager::getSingleton().remove(mTexture->getName());
-			mTexture.setNull();
-		}
-	}
-
-	int OgreTexture::getWidth()
-	{
-		return mTexture->getWidth();
-	}
-
-	int OgreTexture::getHeight()
-	{
-		return mTexture->getHeight();
-	}
-
-	void* OgreTexture::lock(TextureUsage _access)
-	{
-		if (_access == TextureUsage::Write)
-		{
-			return mTexture->getBuffer()->lock(Ogre::HardwareBuffer::HBL_DISCARD);
-		}
-
-		// ����� ��������� ����� ��������, � �������� ��� �������� ��� ������� �����
-
-		// ��� ������ �������� � ������� ����
-		if (mTmpData.data != nullptr)
-		{
-			delete[] (uint8*)mTmpData.data;
-			mTmpData.data = nullptr;
-		}
-
-		mTmpData = Ogre::PixelBox(mTexture->getWidth(), mTexture->getHeight(), mTexture->getDepth(), mTexture->getFormat());
-		mTmpData.data = new uint8[mTexture->getBuffer()->getSizeInBytes()];
-
-		mTexture->getBuffer()->blitToMemory(mTmpData);
-
-		return mTmpData.data;
-	}
-
-	void OgreTexture::unlock()
-	{
-		if (mTexture->getBuffer()->isLocked())
-		{
-			mTexture->getBuffer()->unlock();
-		}
-		else if (mTmpData.data != nullptr)
-		{
-			delete[] (uint8*)mTmpData.data;
-			mTmpData.data = nullptr;
-		}
-	}
-
-	bool OgreTexture::isLocked()
-	{
-		return mTexture->getBuffer()->isLocked();
-	}
-
-	Ogre::TextureUsage OgreTexture::convertUsage(TextureUsage _usage)
-	{
-		if (_usage == TextureUsage::Default)
-		{
-			return Ogre::TU_STATIC_WRITE_ONLY;
-		}
-		else if (_usage == TextureUsage::RenderTarget)
-		{
-			return Ogre::TU_RENDERTARGET;
-		}
-		else if (_usage.isValue(TextureUsage::Static))
-		{
-			if (_usage.isValue(TextureUsage::Write))
-			{
-				return Ogre::TU_STATIC_WRITE_ONLY;
-			}
-			else
-			{
-				return Ogre::TU_STATIC;
-			}
-		}
-		else if (_usage.isValue(TextureUsage::Dynamic))
-		{
-			if (_usage.isValue(TextureUsage::Write))
-			{
-				return Ogre::TU_DYNAMIC_WRITE_ONLY;
-			}
-			else
-			{
-				return Ogre::TU_DYNAMIC;
-			}
-		}
-		else if (_usage.isValue(TextureUsage::Stream))
-		{
-			if (_usage.isValue(TextureUsage::Write))
-			{
-				return Ogre::TU_DYNAMIC_WRITE_ONLY_DISCARDABLE;
-			}
-			else
-			{
-				return Ogre::TU_DYNAMIC;
-			}
-		}
-		return Ogre::TU_DEFAULT;
-	}
-
-	Ogre::PixelFormat OgreTexture::convertFormat(PixelFormat _format)
-	{
-		if (_format == PixelFormat::L8) return Ogre::PF_BYTE_L;
-		else if (_format == PixelFormat::L8A8) return Ogre::PF_BYTE_LA;
-		else if (_format == PixelFormat::R8G8B8) return Ogre::PF_R8G8B8;
-		else if (_format == PixelFormat::R8G8B8A8) return Ogre::PF_A8R8G8B8;
-
-		return Ogre::PF_UNKNOWN;
-	}
-
-	void OgreTexture::setFormat(PixelFormat _format)
-	{
-		mOriginalFormat = _format;
-		mPixelFormat = convertFormat(_format);
-		mNumElemBytes = 0;
-
-		if (_format == PixelFormat::L8) mNumElemBytes = 1;
-		else if (_format == PixelFormat::L8A8) mNumElemBytes = 2;
-		else if (_format == PixelFormat::R8G8B8) mNumElemBytes = 3;
-		else if (_format == PixelFormat::R8G8B8A8) mNumElemBytes = 4;
-	}
-
-	void OgreTexture::setUsage(TextureUsage _usage)
-	{
-		mOriginalUsage = _usage;
-		mUsage = convertUsage(_usage);
-	}
-
-	void OgreTexture::createManual(int _width, int _height, TextureUsage _usage, PixelFormat _format)
-	{
-		setFormat(_format);
-		setUsage(_usage);
-
-		mTexture = Ogre::TextureManager::getSingleton().createManual(
-			mName,
-			mGroup,
-			Ogre::TEX_TYPE_2D,
-			_width,
-			_height,
-			0,
-			mPixelFormat,
-			mUsage,
-			this);
-
-		mTexture->load();
-
-	}
-
-	void OgreTexture::loadFromFile(const std::string& _filename)
-	{
-		setUsage(TextureUsage::Default);
-
-		Ogre::TextureManager* manager = Ogre::TextureManager::getSingletonPtr();
-
-		if ( !manager->resourceExists(_filename) )
-		{
-			DataManager& resourcer = DataManager::getInstance();
-			if (!resourcer.isDataExist(_filename))
-			{
-				MYGUI_PLATFORM_LOG(Error, "Texture '" + _filename + "' not found, set default texture");
-			}
-			else
-			{
-				mTexture = manager->load(_filename, mGroup, Ogre::TEX_TYPE_2D, 0);
-			}
-		}
-		else
-		{
-			mTexture = manager->getByName(_filename);
-		}
-
-		setFormatByOgreTexture();
-	}
-
-	void OgreTexture::setFormatByOgreTexture()
-	{
-		mOriginalFormat = PixelFormat::Unknow;
-		mPixelFormat = Ogre::PF_UNKNOWN;
-		mNumElemBytes = 0;
-
-		if (!mTexture.isNull())
-		{
-			mPixelFormat = mTexture->getFormat();
-
-			if (mPixelFormat == Ogre::PF_BYTE_L)
-			{
-				mOriginalFormat = PixelFormat::L8;
-				mNumElemBytes = 1;
-			}
-			else if (mPixelFormat == Ogre::PF_BYTE_LA)
-			{
-				mOriginalFormat = PixelFormat::L8A8;
-				mNumElemBytes = 2;
-			}
-			else if (mPixelFormat == Ogre::PF_R8G8B8)
-			{
-				mOriginalFormat = PixelFormat::R8G8B8;
-				mNumElemBytes = 3;
-			}
-			else if (mPixelFormat == Ogre::PF_A8R8G8B8)
-			{
-				mOriginalFormat = PixelFormat::R8G8B8A8;
-				mNumElemBytes = 4;
-			}
-			else
-			{
-				mOriginalFormat = PixelFormat::Unknow;
-				mNumElemBytes = Ogre::PixelUtil::getNumElemBytes(mPixelFormat);
-			}
-
-		}
-	}
-
-	void OgreTexture::loadResource(Ogre::Resource* resource)
-	{
-		if (mListener)
-			mListener->textureInvalidate(this);
-	}
-
-	IRenderTarget* OgreTexture::getRenderTarget()
-	{
-		if (mRenderTarget == nullptr)
-			mRenderTarget = new OgreRTTexture(mTexture);
-
-		return mRenderTarget;
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreVertexBuffer.cpp b/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreVertexBuffer.cpp
deleted file mode 100644
index 83e00cbc07..0000000000
--- a/extern/mygui_3.0.1/OgrePlatform/src/MyGUI_OgreVertexBuffer.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*!
-	@file
-	@author		Albert Semenov
-	@date		04/2009
-	@module
-*/
-
-#include "MyGUI_OgreVertexBuffer.h"
-
-#include "Ogre.h"
-
-#include "MyGUI_LastHeader.h"
-
-namespace MyGUI
-{
-
-	const size_t VERTEX_IN_QUAD = 6;
-	const size_t RENDER_ITEM_STEEP_REALLOCK = 5 * VERTEX_IN_QUAD;
-
-	OgreVertexBuffer::OgreVertexBuffer() :
-		mVertexCount(RENDER_ITEM_STEEP_REALLOCK),
-		mNeedVertexCount(0)
-	{
-		createVertexBuffer();
-	}
-
-	OgreVertexBuffer::~OgreVertexBuffer()
-	{
-		destroyVertexBuffer();
-	}
-
-	void OgreVertexBuffer::createVertexBuffer()
-	{
-		mRenderOperation.vertexData = new Ogre::VertexData();
-		mRenderOperation.vertexData->vertexStart = 0;
-
-		Ogre::VertexDeclaration* vd = mRenderOperation.vertexData->vertexDeclaration;
-		vd->addElement( 0, 0, Ogre::VET_FLOAT3, Ogre::VES_POSITION );
-		vd->addElement( 0, Ogre::VertexElement::getTypeSize( Ogre::VET_FLOAT3 ), Ogre::VET_COLOUR, Ogre::VES_DIFFUSE );
-		vd->addElement( 0, Ogre::VertexElement::getTypeSize( Ogre::VET_FLOAT3 ) +
-						   Ogre::VertexElement::getTypeSize( Ogre::VET_COLOUR ),
-						   Ogre::VET_FLOAT2, Ogre::VES_TEXTURE_COORDINATES );
-
-		// Create the Vertex Buffer, using the Vertex Structure we previously declared in _declareVertexStructure.
-		mVertexBuffer = Ogre::HardwareBufferManager::getSingleton( ).createVertexBuffer(
-			mRenderOperation.vertexData->vertexDeclaration->getVertexSize(0), // declared Vertex used
-			mVertexCount,
-			Ogre::HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY_DISCARDABLE,
-			false );
-
-		// Bind the created buffer to the renderOperation object.  Now we can manipulate the buffer, and the RenderOp keeps the changes.
-		mRenderOperation.vertexData->vertexBufferBinding->setBinding( 0, mVertexBuffer );
-		mRenderOperation.operationType = Ogre::RenderOperation::OT_TRIANGLE_LIST;
-		mRenderOperation.useIndexes = false;
-	}
-
-	void OgreVertexBuffer::destroyVertexBuffer()
-	{
-		delete mRenderOperation.vertexData;
-		mRenderOperation.vertexData = 0;
-		mVertexBuffer.setNull();
-	}
-
-	void OgreVertexBuffer::resizeVertexBuffer()
-	{
-		mVertexCount = mNeedVertexCount + RENDER_ITEM_STEEP_REALLOCK;
-		destroyVertexBuffer();
-		createVertexBuffer();
-	}
-
-	void OgreVertexBuffer::setVertextCount(size_t _count)
-	{
-		mNeedVertexCount = _count;
-	}
-
-	size_t OgreVertexBuffer::getVertextCount()
-	{
-		return mNeedVertexCount;
-	}
-
-	Vertex* OgreVertexBuffer::lock()
-	{
-		if (mNeedVertexCount > mVertexCount) resizeVertexBuffer();
-
-		return (Vertex*)mVertexBuffer->lock(Ogre::HardwareVertexBuffer::HBL_DISCARD);
-	}
-
-	void OgreVertexBuffer::unlock()
-	{
-		mVertexBuffer->unlock();
-	}
-
-} // namespace MyGUI
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw.pointer.xml b/extern/mygui_3.0.1/openmw_resources/openmw.pointer.xml
deleted file mode 100644
index b91f7091a5..0000000000
--- a/extern/mygui_3.0.1/openmw_resources/openmw.pointer.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<MyGUI type="Pointer">
-
-    <Pointer layer="Pointer" texture="mwpointer.png" default="arrow">
-        <Info name="arrow" point="7 0" size="32 32" offset="0 0 32 32"/>
-        <Info name="hresize" point="16 14" size="32 32" offset="32 0 32 32"/>
-        <Info name="vresize" point="17 16" size="32 32" offset="0 32 32 32"/>
-        <Info name="dresize" point="17 15" size="32 32" offset="32 32 32 32"/>
-        <Info name="dresize2" point="15 15" size="32 32" offset="64 32 32 32"/>
-    </Pointer>
-
-</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_generate_class_result_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_generate_class_result_layout.xml
deleted file mode 100644
index 39bce01993..0000000000
--- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_generate_class_result_layout.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 330 217" name="_Main">
-        <!-- Class image -->
-        <Widget type="Widget" skin="MW_Box" position="32 10 265 138" align="ALIGN_LEFT ALIGN_TOP">
-            <Widget type="StaticImage" skin="StaticImage" position="2 2 261 134" name="ClassImage" align="ALIGN_LEFT ALIGN_TOP" />
-        </Widget>
-
-        <!-- Class text -->
-        <Widget type="StaticText" skin="SandText" position="32 152 265 18" name="ReflectT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_Caption" value="Your personality and past reflect a:"/>
-            <Property key="Widget_AlignText" value="ALIGN_TOP ALIGN_HCENTER"/>
-        </Widget>
-        <Widget type="StaticText" skin="SandText" position="32 170 265 18" name="ClassName" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_Caption" value="[Class]"/>
-            <Property key="Widget_AlignText" value="ALIGN_TOP ALIGN_HCENTER"/>
-        </Widget>
-
-        <!-- Dialog buttons -->
-        <Widget type="Button" skin="MW_Button" position="220 184 53 23" name="BackButton">
-            <Property key="Widget_Caption" value="Back"/>
-        </Widget>
-        <Widget type="Button" skin="MW_Button" position="277 184 42 23" name="OKButton">
-            <Property key="Widget_Caption" value="OK"/>
-        </Widget>
-    </Widget>
-</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_specialization_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_specialization_layout.xml
deleted file mode 100644
index 04af4a5e4d..0000000000
--- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_specialization_layout.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MyGUI type="Layout">
-    <!-- correct size is 247 144, adjust when skin is changed to a dialog -->
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 247 144" name="_Main">
-        <Widget type="Widget" skin="" position="14 14 216 113" align="ALIGN_STRETCH">
-
-            <!-- Label -->
-            <Widget type="StaticText" skin="HeaderText" position="0 0 216 18" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_Caption" value="Choose a Specialization"/>
-                <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
-            </Widget>
-
-            <!-- Specialization list -->
-            <Widget type="StaticText" skin="SandText" position="0 28 216 18" name="Specialization0" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_AlignText" value="ALIGN_TOP ALIGN_HCENTRE"/>
-            </Widget>
-            <Widget type="StaticText" skin="SandText" position="0 46 216 18" name="Specialization1" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_AlignText" value="ALIGN_TOP ALIGN_HCENTRE"/>
-            </Widget>
-            <Widget type="StaticText" skin="SandText" position="0 64 216 18" name="Specialization2" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_AlignText" value="ALIGN_TOP ALIGN_HCENTRE"/>
-            </Widget>
-
-            <!-- Dialog buttons -->
-            <Widget type="Button" skin="MW_Button" position="150 90 66 21" name="CancelButton">
-                <Property key="Widget_Caption" value="Cancel"/>
-            </Widget>
-
-        </Widget>
-    </Widget>
-</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_console_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_console_layout.xml
deleted file mode 100644
index 52d445fa2a..0000000000
--- a/extern/mygui_3.0.1/openmw_resources/openmw_console_layout.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MyGUI type="Layout">
-  <Widget type="Window" skin="MW_ConsoleWindow" position="0 0 400 400" layer="Console" name="_Main">
-    <Property key="Widget_Caption" value="Console"/>
-    <Property key="Window_MinMax" value="200 100 2000 2000"/>
-
-    <!-- Log window -->
-    <Widget type="Edit" skin="MW_ConsoleLog" position="5 5 390 360" align="Stretch" name="list_History"/>
-
-    <!-- Command line -->
-    <Widget type="Edit" skin="MW_ConsoleCommand" position="0 365 392 28" align="HStretch Bottom" name="edit_Command"/>
-
-  </Widget>
-</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml
deleted file mode 100644
index 44642167b2..0000000000
--- a/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 588 433" name="_Main">
-        <!-- HEADER -->
-        <Widget type="StaticText" skin="HeaderText" position="0 0 588 18" name="NpcName" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_Caption" value="Name"/>
-            <Property key="Widget_AlignText" value="ALIGN_CENTER"/>
-        </Widget>
-
-        <!-- The Dialogue history -->
-        <Widget type="DialogeHistory" skin="MW_TextBoxEdit" position="8 39 400 375" name="History"  align="ALIGN_LEFT ALIGN_TOP STRETCH">
-            <Property key="Edit_Static" value="true"/>
-            <Property key="Edit_WordWrap" value="true"/>
-            <Property key="Text_FontHeight" value="18"/>
-            <Property key="Edit_MultiLine" value="1" />
-            <Property key="Edit_VisibleVScroll" value="1" />
-        </Widget>
-
-		<!-- The disposition bar-->
-        <Widget type="Progress" skin="MW_EnergyBar_Blue" position="432 39 132 18"
-            align="Right Top" name="Disposition">		
-			<Widget type="Edit" skin="MW_DispositionEdit" position_real = "0.25 0 0.5 1" name = "DispositionText"/>	
-		</Widget>
-        <!-- The list of topics -->
-        <Widget type="List" skin="MW_List" position="432 62 132 318" name="TopicsList">
-        </Widget>
-
-        <!-- The Goodbye button -->
-        <Widget type="Button" skin="MW_Button" position="432 387 132 23" name="ByeButton">
-            <Property key="Widget_Caption" value="Goodbye"/>
-        </Widget>
-    </Widget>
-</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_hud_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_hud_layout.xml
deleted file mode 100644
index 9e5f26c5ba..0000000000
--- a/extern/mygui_3.0.1/openmw_resources/openmw_hud_layout.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<MyGUI type="Layout">
-    <Widget type="Widget" layer="HUD" position="0 0 300 200" name="_Main">
-        <!-- Energy bars -->
-        <Widget type="Progress" skin="MW_EnergyBar_Red" position="13 146 65 12"
-            align="Left Bottom" name="Health"/>
-        <Widget type="Progress" skin="MW_EnergyBar_Blue" position="13 161 65 12"
-            align="Left Bottom" name="Magicka"/>
-        <Widget type="Progress" skin="MW_EnergyBar_Green" position="13 176 65 12"
-            align="Left Bottom" name="Stamina"/>
-
-        <!-- Equipped weapon box -->
-        <Widget type="Widget" skin="HUD_Box" position="82 146 36 36"
-            align="Left Bottom">
-            <Widget type="StaticImage" skin="StaticImage" position="2 2 32 32" align="Left Top"
-                name="WeapImage"/>
-        </Widget>
-        <Widget type="Progress" skin="MW_EnergyBar_Red" position="82 182 36 6"
-            align="Left Bottom" name="WeapStatus"/>
-
-        <!-- Selected spell box -->
-        <Widget type="Widget" skin="HUD_Box" position="122 146 36 36"
-            align="Left Bottom">
-            <Widget type="StaticImage" skin="StaticImage" position="2 2 32 32" align="Left Top"
-                name="SpellImage"/>
-        </Widget>
-        <Widget type="Progress" skin="MW_EnergyBar_Red" position="122 182 36 6"
-            align="Left Bottom" name="SpellStatus"/>
-
-        <!-- Spell effects box -->
-        <Widget type="Widget" skin="HUD_Box" position="199 168 20 20"
-            align="Right Bottom" name="EffectBox">
-            <Widget type="StaticImage" skin="StaticImage" position="2 2 16 16" align="Left Bottom"
-                name="Effect1"/>
-        </Widget>
-
-        <!-- Map box -->
-        <Widget type="Widget" skin="HUD_Box" position="223 123 65 65"
-            align="Right Bottom">
-            <Widget type="StaticImage" skin="StaticImage" position="2 2 61 61" align="Left Bottom"
-                name="MiniMap"/>
-            <Widget type="StaticImage" skin="StaticImage" position="17 18 32 32" align="Left Bottom"
-                name="Compass"/>
-        </Widget>
-
-        <!-- Crosshair -->
-
-        <Widget type="StaticImage" skin="StaticImage" position="0 0 32
-            32" align="Center Center" name="Crosshair"/>
-
-        <!-- Basic FPSCounter box -->
-        <Widget type="Widget" skin="HUD_Box" position="12 12 28 21" align="Left Top"
-            name="FPSBox">
-            <Property key="Widget_Visible" value="false"/>
-            <Widget type="StaticText" skin="NumFPS" position="3 3 21 17" name="FPSCounter"/>
-        </Widget>
-
-        <!-- Advanced FPSCounter box -->
-        <Widget type="Widget" skin="HUD_Box" position="12 12 118 51" align="Left Top"
-            name="FPSBoxAdv">
-            <Property key="Widget_Visible" value="false"/>
-
-            <Widget type="StaticText" skin="NumFPS" position="3 3 71 17">
-                    <Property key="Widget_Caption" value="FPS: "/>
-            </Widget>
-            <Widget type="StaticText" skin="NumFPS" position="53 3 71 17" name="FPSCounterAdv"/>
-
-            <Widget type="StaticText" skin="NumFPS" position="3 3 71 32">
-                    <Property key="Widget_Caption" value="Tri Count: "/>
-            </Widget>
-            <Widget type="StaticText" skin="NumFPS" position="53 3 71 32" name="TriangleCounter"/>
-
-            <Widget type="StaticText" skin="NumFPS" position="3 3 71 47">
-                    <Property key="Widget_Caption" value="Batch Count: "/>
-            </Widget>
-            <Widget type="StaticText" skin="NumFPS" position="53 3 71 47" name="BatchCounter"/>
-        </Widget>
-
-    </Widget>
-</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_journal_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_journal_layout.xml
deleted file mode 100644
index dc2116ee0a..0000000000
--- a/extern/mygui_3.0.1/openmw_resources/openmw_journal_layout.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<MyGUI type="Layout">
-
-<Widget type="Window" skin="" layer="Windows" align="Left|Top" position="00 200 512 256" name="_Main">
-
-<Widget type="StaticImage" skin="StaticImage" position_real="0 0 1 1" align="Top|Right" name="JImage">     
-<Property key="Image_Texture" value="textures\tx_menubook.dds"/>
-<!--Property key="Image_Texture" value="mwgui.png"/-->
-
-<Widget type="Button" skin="Next_btn" position="370 220 64 32" name="NextPageBTN">
-</Widget>
-
-<Widget type="Button" skin="Prev_btn" position="80 220 128 32" name="PrevPageBTN">
-</Widget>
-
-    <Widget type="Edit" skin="MW_BookPage" position_real="0.15 0.1 0.3 0.8" name = "LeftText"/>
-    <Widget type="Edit" skin="MW_BookPage" position_real="0.55 0.1 0.3 0.8" name = "RightText"/>
-</Widget>
-</Widget>
-
-
-</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_journal_skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_journal_skin.xml
deleted file mode 100644
index b6cb1bca73..0000000000
--- a/extern/mygui_3.0.1/openmw_resources/openmw_journal_skin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<MyGUI type="Skin">
-<Skin name="Next_btn" size="64 32" texture="textures\tx_menubook_next_idle.dds">
-<BasisSkin type="MainSkin" offset="0 0 64 32" align="ALIGN_VSTRETCH">
-<State name="normal" offset="0 0 64 32"/>
-</BasisSkin>
-</Skin>
-
-<Skin name="Prev_btn" size="128 32" texture="textures\tx_menubook_prev_idle.dds">
-<BasisSkin type="MainSkin" offset="0 0 128 32" align="ALIGN_VSTRETCH">
-<State name="normal" offset="0 0 128 32"/>
-</BasisSkin>
-</Skin>
-
-    <Skin name = "MW_BookClient" size = "10 10">
-        <Property key="FontName" value = "MonoFont" />
-        <Property key="AlignText" value = "Left Top" />
-        <Property key="Colour" value = "0000FF" />
-        <!--Property key="Pointer" value = "beam" /-->
-        <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
-    </Skin>
-	
-    <Skin name="MW_BookPage" size="0 0 50 50">
-        <Property key="WordWrap" value = "true" />
-        <Child type="Widget" skin="MW_BookClient" offset="0 0 35 10" align = "ALIGN_STRETCH" name = "Client"/>
-        <!--Child type="VScroll" skin="VScroll" offset = "35 0 15 50" align = "Right VStretch" name = "VScroll"/-->
-    </Skin>
-</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_messagebox_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_messagebox_layout.xml
deleted file mode 100644
index 890752db3d..0000000000
--- a/extern/mygui_3.0.1/openmw_resources/openmw_messagebox_layout.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<MyGUI type="Layout">
-    <!--Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 0 0" name="_Main">
-        <Widget type="StaticText" skin="StaticText" position="4 4 4 4" name="message" />
-    </Widget-->
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 0 0" name="_Main">
-        <Widget type="Edit" skin="MW_TextEditClient" position="5 -5 0 0" name="message"  align="ALIGN_LEFT ALIGN_TOP STRETCH">
-            <Property key="Edit_Static" value="true"/>
-            <Property key="Edit_WordWrap" value="true"/>
-            <Property key="Text_FontHeight" value="18"/>
-            <Property key="Edit_MultiLine" value="1" />
-            <Property key="Edit_VisibleVScroll" value="1" />
-            <Property key="Widget_AlignText" value="ALIGN_CENTER" />
-            <Property key="FontName" value = "MyGUI_CoreFont.18" />
-            <Property key="TextColour" value = "0.7 0.7 0.7" />
-        </Widget>
-    </Widget>
-</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml
deleted file mode 100644
index 14b282ce4c..0000000000
--- a/extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 500 342" name="_Main">
-
-        <!-- Player health stats -->
-        <Widget type="Widget" skin="MW_Box" position="8 8 212 62">
-            <Widget type="StaticText" skin="NormalText" position="4 4 70 18" name="Health_str"/>
-            <Widget type="StaticText" skin="NormalText" position="4 22 70 18" name="Magicka_str"/>
-            <Widget type="StaticText" skin="NormalText" position="4 40 70 18" name="Fatigue_str"/>
-            <Widget type="Progress" skin="MW_Progress_Red" position="78 4 130 18" name="HBar"/>
-            <Widget type="Progress" skin="MW_Progress_Blue" position="78 22 130 18" name="MBar"/>
-            <Widget type="Progress" skin="MW_Progress_Green" position="78 40 130 18" name="FBar"/>
-            <Widget type="StaticText" skin="ProgressText" position="78 4 130 18" align="Center" name="HBarT"/>
-            <Widget type="StaticText" skin="ProgressText" position="78 22 130 18" align="Center" name="MBarT"/>
-            <Widget type="StaticText" skin="ProgressText" position="78 40 130 18" align="Center" name="FBarT"/>
-        </Widget>
-
-        <!-- Player level, race and class -->
-        <Widget type="Widget" skin="MW_Box" position="8 78 212 62">
-            <Widget type="StaticText" skin="NormalText" position="4 4 100 18" name="Level_str"/>
-            <Widget type="StaticText" skin="NormalText" position="4 22 100 18" name="Race_str"/>
-            <Widget type="StaticText" skin="NormalText" position="4 40 100 18" name="Class_str"/>
-            <Widget type="StaticText" skin="SandTextRight" position="104 4 104 18" name="LevelText"/>
-            <Widget type="StaticText" skin="SandTextRight" position="104 22 104 18" name="RaceText"/>
-            <Widget type="StaticText" skin="SandTextRight" position="104 40 104 18" name="ClassText"/>
-        </Widget>
-
-        <Widget type="Widget" skin="MW_Box" position="8 148 212 152">
-            <Widget type="StaticText" skin="SandText" position="4 4 100 18" name="Attrib1"/>
-            <Widget type="StaticText" skin="SandTextRight" position="104 4 104 18" name="AttribVal1"/>
-
-            <Widget type="StaticText" skin="SandText" position="4 22 100 18" name="Attrib2"/>
-            <Widget type="StaticText" skin="SandTextRight" position="104 22 104 18" name="AttribVal2"/>
-
-            <Widget type="StaticText" skin="SandText" position="4 40 100 18" name="Attrib3"/>
-            <Widget type="StaticText" skin="SandTextRight" position="104 40 104 18" name="AttribVal3"/>
-
-            <Widget type="StaticText" skin="SandText" position="4 58 100 18" name="Attrib4"/>
-            <Widget type="StaticText" skin="SandTextRight" position="104 58 104 18" name="AttribVal4"/>
-
-            <Widget type="StaticText" skin="SandText" position="4 76 100 18" name="Attrib5"/>
-            <Widget type="StaticText" skin="SandTextRight" position="104 76 104 18" name="AttribVal5"/>
-
-            <Widget type="StaticText" skin="SandText" position="4 94 100 18" name="Attrib6"/>
-            <Widget type="StaticText" skin="SandTextRight" position="104 94 104 18" name="AttribVal6"/>
-
-            <Widget type="StaticText" skin="SandText" position="4 112 100 18" name="Attrib7"/>
-            <Widget type="StaticText" skin="SandTextRight" position="104 112 104 18" name="AttribVal7"/>
-
-            <Widget type="StaticText" skin="SandText" position="4 130 100 18" name="Attrib8"/>
-            <Widget type="StaticText" skin="SandTextRight" position="104 130 104 18" name="AttribVal8"/>
-        </Widget>
-
-        <!-- Player skills, factions, birthsign and reputation -->
-        <Widget type="Widget" skin="MW_Box" position="228 8 248 292" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Skills">
-            <Widget type="Widget" skin="" position="4 4 222 284" align="ALIGN_STRETCH" name="SkillClient" />
-            <Widget type="VScroll" skin="MW_VScroll" position="230 4 14 284" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="SkillScroller" />
-        </Widget>
-    </Widget>
-</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_text_input_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_text_input_layout.xml
deleted file mode 100644
index e1fd8f47a5..0000000000
--- a/extern/mygui_3.0.1/openmw_resources/openmw_text_input_layout.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 320 97" name="_Main">
-
-        <!-- Appearance -->
-        <Widget type="StaticText" skin="ProgressText" position="10 12 300 18" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
-        </Widget>
-        <Widget type="Edit" skin="MW_TextEdit" position="10 28 300 30" name="TextEdit" align="ALIGN_LEFT ALIGN_TOP"/>
-
-        <!-- Dialog buttons -->
-        <Widget type="Button" skin="MW_Button" position="264 60 42 23" name="OKButton">
-            <Property key="Widget_Caption" value="OK"/>
-        </Widget>
-    </Widget>
-</MyGUI>
diff --git a/extern/mygui_3.0.1/CMakeLists.txt b/files/mygui/CMakeLists.txt
similarity index 91%
rename from extern/mygui_3.0.1/CMakeLists.txt
rename to files/mygui/CMakeLists.txt
index 6a96bd3674..9ea84747c8 100644
--- a/extern/mygui_3.0.1/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -1,27 +1,7 @@
 # Minimal MyGUI build system for OpenMW
 
-cmake_minimum_required(VERSION 2.6)
-project(MYGUI)
-
-# Use Freetype
-find_package(Freetype REQUIRED)
-set(MYGUI_USE_FREETYPE TRUE)
-
-# Use Ogre
-add_definitions("-DMYGUI_OGRE_PLATFORM")
-
-# Static linking
-set(MYGUI_LIB_TYPE STATIC)
-add_definitions(-DMYGUI_STATIC)
-
-# Setup MyGUIEngine project
-add_subdirectory(MyGUIEngine)
-
-# Setup OgrePlatform
-add_subdirectory(OgrePlatform)
-
 # Copy resource files into the build directory
-set(SDIR ${CMAKE_CURRENT_SOURCE_DIR}/openmw_resources)
+set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui)
 
 configure_file("${SDIR}/bigbars.png" "${DDIR}/bigbars.png" COPYONLY)
@@ -31,6 +11,8 @@ configure_file("${SDIR}/core.skin" "${DDIR}/core.skin" COPYONLY)
 configure_file("${SDIR}/core.xml" "${DDIR}/core.xml" COPYONLY)
 configure_file("${SDIR}/mwpointer.png" "${DDIR}/mwpointer.png" COPYONLY)
 configure_file("${SDIR}/mwgui.png" "${DDIR}/mwgui.png" COPYONLY)
+configure_file("${SDIR}/openmw_images.xml" "${DDIR}/openmw_images.xml" COPYONLY)
+configure_file("${SDIR}/openmw_settings.xml" "${DDIR}/openmw_settings.xml" COPYONLY)
 configure_file("${SDIR}/openmw_box.skin.xml" "${DDIR}/openmw_box.skin.xml" COPYONLY)
 configure_file("${SDIR}/openmw_button.skin.xml" "${DDIR}/openmw_button.skin.xml" COPYONLY)
 configure_file("${SDIR}/openmw_list.skin.xml" "${DDIR}/openmw_list.skin.xml" COPYONLY)
diff --git a/extern/mygui_3.0.1/openmw_resources/Comic.TTF b/files/mygui/Comic.TTF
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/Comic.TTF
rename to files/mygui/Comic.TTF
diff --git a/extern/mygui_3.0.1/openmw_resources/VeraMono.ttf b/files/mygui/VeraMono.ttf
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/VeraMono.ttf
rename to files/mygui/VeraMono.ttf
diff --git a/extern/mygui_3.0.1/openmw_resources/bigbars.png b/files/mygui/bigbars.png
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/bigbars.png
rename to files/mygui/bigbars.png
diff --git a/extern/mygui_3.0.1/openmw_resources/black.png b/files/mygui/black.png
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/black.png
rename to files/mygui/black.png
diff --git a/extern/mygui_3.0.1/openmw_resources/core.skin b/files/mygui/core.skin
similarity index 73%
rename from extern/mygui_3.0.1/openmw_resources/core.skin
rename to files/mygui/core.skin
index 3d26f13f8d..83dcd4b9f8 100644
--- a/extern/mygui_3.0.1/openmw_resources/core.skin
+++ b/files/mygui/core.skin
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Skin">
-    <Skin name = "StaticText" size = "16 16">
+    <Skin name = "TextBox" size = "16 16">
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_DEFAULT" />
+        <Property key="TextAlign" value = "ALIGN_DEFAULT" />
         <Property key="TextColour" value = "0.7 0.7 0.7" />
         
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
 
-    <Skin name = "StaticImage" size = "16 16">
+    <Skin name = "ImageBox" size = "16 16">
         <BasisSkin type="MainSkin" offset = "0 0 16 16"/>
     </Skin>
 
diff --git a/extern/mygui_3.0.1/openmw_resources/core.xml b/files/mygui/core.xml
similarity index 59%
rename from extern/mygui_3.0.1/openmw_resources/core.xml
rename to files/mygui/core.xml
index e98b20d3ad..30e01a8f3d 100644
--- a/extern/mygui_3.0.1/openmw_resources/core.xml
+++ b/files/mygui/core.xml
@@ -2,13 +2,13 @@
 
 <MyGUI>
 
-    <MyGUI type="List">
-	    <List file="core.skin" group="General"/>
-
-	    <List file="openmw_layers.xml" group="General"/>
-	    <List file="openmw.pointer.xml" group="General"/>
-	    <List file="openmw.font.xml" group="General"/>
-	    <List file="openmw_text.skin.xml" group="General"/>
+      <MyGUI type="List">
+            <List file="core.skin" group="General"/>
+            <List file="openmw_images.xml" group="General"/>
+            <List file="openmw_layers.xml" group="General"/>
+            <List file="openmw.pointer.xml" group="General"/>
+            <List file="openmw.font.xml" group="General"/>
+            <List file="openmw_text.skin.xml" group="General"/>
             <List file="openmw_windows.skin.xml" group="General"/>
             <List file="openmw_button.skin.xml" group="General"/>
             <List file="openmw_list.skin.xml" group="General"/>
@@ -20,7 +20,8 @@
             <List file="openmw_mainmenu_skin.xml" group="General"/>
             <List file="openmw_console.skin.xml" group="General"/>
             <List file="openmw_journal_skin.xml" group="General"/>
-			<List file="openmw_dialogue_window_skin.xml" group="General"/>
-    </MyGUI>
+            <List file="openmw_dialogue_window_skin.xml" group="General"/>
+            <List file="openmw_settings.xml" group="General"/>
+      </MyGUI>
 
 </MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/mwgui.png b/files/mygui/mwgui.png
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/mwgui.png
rename to files/mygui/mwgui.png
diff --git a/extern/mygui_3.0.1/openmw_resources/mwpointer.png b/files/mygui/mwpointer.png
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/mwpointer.png
rename to files/mygui/mwpointer.png
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw.font.xml b/files/mygui/openmw.font.xml
similarity index 98%
rename from extern/mygui_3.0.1/openmw_resources/openmw.font.xml
rename to files/mygui/openmw.font.xml
index 76f164bcb6..454c3caecc 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw.font.xml
+++ b/files/mygui/openmw.font.xml
@@ -2,7 +2,7 @@
 
 <MyGUI type="Font">
 
-	<Font name="MyGUI_CoreFont.18" source="Comic.TTF" size="18" resolution="72" antialias_colour="false" space_width="4" tab_count="4" spacer="5" distance="10">
+	<Font name="MyGUI_CoreFont.18" source="Comic.TTF" size="13" resolution="72" antialias_colour="false" space_width="4" tab_count="4" spacer="5" distance="10">
 		<Code range="33 126"/>
 		<Code range="192 382"/><!-- Central and Eastern European languages glyphs -->
 		<Code range="1025 1105"/>
diff --git a/files/mygui/openmw.pointer.xml b/files/mygui/openmw.pointer.xml
new file mode 100644
index 0000000000..0fbef2fdf5
--- /dev/null
+++ b/files/mygui/openmw.pointer.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Resource">
+	<Resource type="ResourceImageSetPointer" name="arrow">
+		<Property key="Point" value="7 0"/>
+		<Property key="Size" value="32 32"/>
+		<Property key="Resource" value="ArrowPointerImage"/>
+	</Resource>
+	<Resource type="ResourceImageSetPointer" name="hresize">
+		<Property key="Point" value="16 14"/>
+		<Property key="Size" value="32 32"/>
+		<Property key="Resource" value="HResizePointerImage"/>
+	</Resource>
+	<Resource type="ResourceImageSetPointer" name="vresize">
+		<Property key="Point" value="17 16"/>
+		<Property key="Size" value="32 32"/>
+		<Property key="Resource" value="VResizePointerImage"/>
+	</Resource>
+	<Resource type="ResourceImageSetPointer" name="dresize">
+		<Property key="Point" value="17 15"/>
+		<Property key="Size" value="32 32"/>
+		<Property key="Resource" value="DResizePointerImage"/>
+	</Resource>
+	<Resource type="ResourceImageSetPointer" name="dresize2">
+		<Property key="Point" value="15 15"/>
+		<Property key="Size" value="32 32"/>
+		<Property key="Resource" value="DResize2PointerImage"/>
+	</Resource>
+</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_box.skin.xml b/files/mygui/openmw_box.skin.xml
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/openmw_box.skin.xml
rename to files/mygui/openmw_box.skin.xml
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_button.skin.xml b/files/mygui/openmw_button.skin.xml
similarity index 96%
rename from extern/mygui_3.0.1/openmw_resources/openmw_button.skin.xml
rename to files/mygui/openmw_button.skin.xml
index fbc5aeb591..0533a360f6 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_button.skin.xml
+++ b/files/mygui/openmw_button.skin.xml
@@ -49,8 +49,8 @@
         <!--Property key="FontName" value = "cards" /-->
         <!--Property key="FontName" value = "albertis"/-->
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_CENTER" />
-        <Property key="Colour" value = "0.6 0.6 0.6" />
+        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <Property key="TextColour" value = "0.6 0.6 0.6" />
 
         <Child type="Widget" skin="BTN_Left" offset="0 4 4 16" align="ALIGN_VSTRETCH ALIGN_LEFT"/>
         <Child type="Widget" skin="BTN_Right" offset="132 4 4 16" align="ALIGN_VSTRETCH ALIGN_RIGHT"/>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_birth_layout.xml b/files/mygui/openmw_chargen_birth_layout.xml
similarity index 69%
rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_birth_layout.xml
rename to files/mygui/openmw_chargen_birth_layout.xml
index f7df09417e..bce3f585dc 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_birth_layout.xml
+++ b/files/mygui/openmw_chargen_birth_layout.xml
@@ -2,11 +2,11 @@
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 485 375" name="_Main">
         <!-- Birthsign list -->
-        <Widget type="List" skin="MW_List" position="8 13 196 137" name="BirthsignList" />
+        <Widget type="ListBox" skin="MW_List" position="8 13 196 137" name="BirthsignList" />
 
         <!-- Birthsign image -->
         <Widget type="Widget" skin="MW_Box" position="206 13 263 137" align="ALIGN_LEFT ALIGN_TOP">
-            <Widget type="StaticImage" skin="StaticImage" position="2 2 259 133" name="BirthsignImage" align="ALIGN_LEFT ALIGN_TOP" />
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 259 133" name="BirthsignImage" align="ALIGN_LEFT ALIGN_TOP" />
         </Widget>
 
         <!-- Spell list -->
@@ -15,10 +15,10 @@
 
         <!-- Dialog buttons -->
         <Widget type="Button" skin="MW_Button" position="375 340 53 23" name="BackButton">
-            <Property key="Widget_Caption" value="Back"/>
+            <Property key="Caption" value="Back"/>
         </Widget>
         <Widget type="Button" skin="MW_Button" position="431 340 42 23" name="OKButton">
-            <Property key="Widget_Caption" value="OK"/>
+            <Property key="Caption" value="OK"/>
         </Widget>
     </Widget>
 </MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_description_layout.xml b/files/mygui/openmw_chargen_class_description_layout.xml
similarity index 50%
rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_description_layout.xml
rename to files/mygui/openmw_chargen_class_description_layout.xml
index 9cf3dd247c..2ffc7d7072 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_description_layout.xml
+++ b/files/mygui/openmw_chargen_class_description_layout.xml
@@ -4,15 +4,15 @@
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 249 249" name="_Main">
 
         <!-- Edit box -->
-        <Widget type="Edit" skin="MW_TextBoxEdit" position="14 14 220 192" name="TextEdit" align="ALIGN_LEFT ALIGN_TOP STRETCH">
-            <Property key="Edit_MultiLine" value="1" />
-            <Property key="Edit_VisibleVScroll" value="1" />
-            <Property key="Edit_WordWrap" value="1" />
+        <Widget type="EditBox" skin="MW_TextBoxEdit" position="14 14 220 192" name="TextEdit" align="ALIGN_LEFT ALIGN_TOP STRETCH">
+            <Property key="MultiLine" value="1" />
+            <Property key="VisibleVScroll" value="1" />
+            <Property key="WordWrap" value="1" />
         </Widget>
 
         <!-- Dialog buttons -->
         <Widget type="Button" skin="MW_Button" position="177 214 57 24" name="OKButton">
-            <Property key="Widget_Caption" value="Enter"/>
+            <Property key="Caption" value="Enter"/>
         </Widget>
     </Widget>
 </MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_layout.xml b/files/mygui/openmw_chargen_class_layout.xml
similarity index 60%
rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_layout.xml
rename to files/mygui/openmw_chargen_class_layout.xml
index 0b4762935b..bf49810c80 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_layout.xml
+++ b/files/mygui/openmw_chargen_class_layout.xml
@@ -3,36 +3,36 @@
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 491 302" name="_Main">
         <!-- Class list -->
-        <Widget type="List" skin="MW_List" position="14 13 181 131" name="ClassList" />
+        <Widget type="ListBox" skin="MW_List" position="14 13 181 131" name="ClassList" />
 
         <!-- Class image -->
         <Widget type="Widget" skin="MW_Box" position="212 9 265 138" align="ALIGN_LEFT ALIGN_TOP">
-            <Widget type="StaticImage" skin="StaticImage" position="2 2 261 134" name="ClassImage" align="ALIGN_LEFT ALIGN_TOP" />
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 261 134" name="ClassImage" align="ALIGN_LEFT ALIGN_TOP" />
         </Widget>
 
         <!-- Specialization -->
         <Widget type="Widget" skin="" position="15 152 484 178" align="ALIGN_LEFT ALIGN_TOP">
 
-        <Widget type="StaticText" skin="HeaderText" position="0 0 162 18" name="SpecializationT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_Caption" value="Specialization:"/>
-            <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="HeaderText" position="0 0 162 18" name="SpecializationT" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="Caption" value="Specialization:"/>
+            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
-        <Widget type="StaticText" skin="SandText" position="0 18 162 18" name="SpecializationName" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="SandText" position="0 18 162 18" name="SpecializationName" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
 
         <!-- Favorite Attributes -->
-        <Widget type="StaticText" skin="HeaderText" position="0 41 162 18" name="FavoriteAttributesT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_Caption" value="Favorite Attributes:"/>
-            <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="HeaderText" position="0 41 162 18" name="FavoriteAttributesT" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="Caption" value="Favorite Attributes:"/>
+            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
         <Widget type="MWAttribute" skin="MW_StatName" position="0 59 162 18" name="FavoriteAttribute0" align="ALIGN_LEFT ALIGN_TOP" />
         <Widget type="MWAttribute" skin="MW_StatName" position="0 77 162 18" name="FavoriteAttribute1" align="ALIGN_LEFT ALIGN_TOP" />
 
         <!-- Major Skills -->
-        <Widget type="StaticText" skin="HeaderText" position="162 0 162 18" name="MajorSkillT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_Caption" value="Major Skills:"/>
-            <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="HeaderText" position="162 0 162 18" name="MajorSkillT" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="Caption" value="Major Skills:"/>
+            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
         <Widget type="MWSkill" skin="MW_StatName" position="162 18 162 18" name="MajorSkill0" align="ALIGN_LEFT ALIGN_TOP" />
         <Widget type="MWSkill" skin="MW_StatName" position="162 36 162 18" name="MajorSkill1" align="ALIGN_LEFT ALIGN_TOP" />
@@ -41,9 +41,9 @@
         <Widget type="MWSkill" skin="MW_StatName" position="162 90 162 18" name="MajorSkill4" align="ALIGN_LEFT ALIGN_TOP" />
 
         <!-- Minor Skills -->
-        <Widget type="StaticText" skin="HeaderText" position="325 0 162 18" name="MinorSkillT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_Caption" value="Minor Skills:"/>
-            <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="HeaderText" position="325 0 162 18" name="MinorSkillT" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="Caption" value="Minor Skills:"/>
+            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
         <Widget type="MWSkill" skin="MW_StatName" position="325 18 162 18" name="MinorSkill0" align="ALIGN_LEFT ALIGN_TOP" />
         <Widget type="MWSkill" skin="MW_StatName" position="325 36 162 18" name="MinorSkill1" align="ALIGN_LEFT ALIGN_TOP" />
@@ -55,10 +55,10 @@
 
         <!-- Dialog buttons -->
         <Widget type="Button" skin="MW_Button" position="382 265 53 23" name="BackButton">
-            <Property key="Widget_Caption" value="Back"/>
+            <Property key="Caption" value="Back"/>
         </Widget>
         <Widget type="Button" skin="MW_Button" position="434 265 42 23" name="OKButton">
-            <Property key="Widget_Caption" value="OK"/>
+            <Property key="Caption" value="OK"/>
         </Widget>
     </Widget>
 </MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_create_class_layout.xml b/files/mygui/openmw_chargen_create_class_layout.xml
similarity index 57%
rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_create_class_layout.xml
rename to files/mygui/openmw_chargen_create_class_layout.xml
index 950cecec44..3b7d91b00c 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_create_class_layout.xml
+++ b/files/mygui/openmw_chargen_create_class_layout.xml
@@ -2,35 +2,35 @@
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 474 192" name="_Main">
         <!-- Class name -->
-        <Widget type="StaticText" skin="ProgressText" position="12 12 48 30" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_Caption" value="Name"/>
-            <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_VCENTRE"/>
+        <Widget type="TextBox" skin="ProgressText" position="12 12 48 30" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="Caption" value="Name"/>
+            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_VCENTRE"/>
         </Widget>
-        <Widget type="Edit" skin="MW_TextEdit" position="62 12 250 30" name="EditName" align="ALIGN_HSTRETCH ALIGN_TOP"/>
+        <Widget type="EditBox" skin="MW_TextEdit" position="62 12 250 30" name="EditName" align="ALIGN_HSTRETCH ALIGN_TOP"/>
 
         <Widget type="Widget" skin="" position="12 46 480 110" align="ALIGN_STRETCH">
 
             <!-- Specialization -->
-            <Widget type="StaticText" skin="HeaderText" position="0 0 156 18" name="SpecializationT" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_Caption" value="Specialization:"/>
-                <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Widget type="TextBox" skin="HeaderText" position="0 0 156 18" name="SpecializationT" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="Caption" value="Specialization:"/>
+                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
             </Widget>
-            <Widget type="StaticText" skin="SandText" position="0 18 156 18" name="SpecializationName" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Widget type="TextBox" skin="SandText" position="0 18 156 18" name="SpecializationName" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
             </Widget>
 
             <!-- Favorite Attributes -->
-            <Widget type="StaticText" skin="HeaderText" position="0 41 156 18" name="FavoriteAttributesT" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_Caption" value="Favorite Attributes:"/>
-                <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Widget type="TextBox" skin="HeaderText" position="0 41 156 18" name="FavoriteAttributesT" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="Caption" value="Favorite Attributes:"/>
+                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
             </Widget>
             <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 59 156 18" name="FavoriteAttribute0" align="ALIGN_LEFT ALIGN_TOP" />
             <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 77 156 18" name="FavoriteAttribute1" align="ALIGN_LEFT ALIGN_TOP" />
 
             <!-- Major Skills -->
-            <Widget type="StaticText" skin="HeaderText" position="156 0 158 18" name="MajorSkillT" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_Caption" value="Major Skills:"/>
-                <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Widget type="TextBox" skin="HeaderText" position="156 0 158 18" name="MajorSkillT" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="Caption" value="Major Skills:"/>
+                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
             </Widget>
             <Widget type="MWSkill" skin="MW_StatNameButton" position="156 18 158 18" name="MajorSkill0" align="ALIGN_LEFT ALIGN_TOP" />
             <Widget type="MWSkill" skin="MW_StatNameButton" position="156 36 158 18" name="MajorSkill1" align="ALIGN_LEFT ALIGN_TOP" />
@@ -39,9 +39,9 @@
             <Widget type="MWSkill" skin="MW_StatNameButton" position="156 90 158 18" name="MajorSkill4" align="ALIGN_LEFT ALIGN_TOP" />
 
             <!-- Minor Skills -->
-            <Widget type="StaticText" skin="HeaderText" position="314 0 140 18" name="MinorSkillT" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_Caption" value="Minor Skills:"/>
-                <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Widget type="TextBox" skin="HeaderText" position="314 0 140 18" name="MinorSkillT" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="Caption" value="Minor Skills:"/>
+                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
             </Widget>
             <Widget type="MWSkill" skin="MW_StatNameButton" position="314 18 140 18" name="MinorSkill0" align="ALIGN_LEFT ALIGN_TOP" />
             <Widget type="MWSkill" skin="MW_StatNameButton" position="314 36 140 18" name="MinorSkill1" align="ALIGN_LEFT ALIGN_TOP" />
@@ -53,13 +53,13 @@
 
         <!-- Dialog buttons -->
         <Widget type="Button" skin="MW_Button" position="207 158 143 23" name="DescriptionButton">
-            <Property key="Widget_Caption" value="Class Description"/>
+            <Property key="Caption" value="Class Description"/>
         </Widget>
         <Widget type="Button" skin="MW_Button" position="356 158 53 23" name="BackButton">
-            <Property key="Widget_Caption" value="Back"/>
+            <Property key="Caption" value="Back"/>
         </Widget>
         <Widget type="Button" skin="MW_Button" position="417 158 42 23" name="OKButton">
-            <Property key="Widget_Caption" value="OK"/>
+            <Property key="Caption" value="OK"/>
         </Widget>
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_chargen_generate_class_result_layout.xml b/files/mygui/openmw_chargen_generate_class_result_layout.xml
new file mode 100644
index 0000000000..7ec926eb05
--- /dev/null
+++ b/files/mygui/openmw_chargen_generate_class_result_layout.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 330 217" name="_Main">
+        <!-- Class image -->
+        <Widget type="Widget" skin="MW_Box" position="32 10 265 138" align="ALIGN_LEFT ALIGN_TOP">
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 261 134" name="ClassImage" align="ALIGN_LEFT ALIGN_TOP" />
+        </Widget>
+
+        <!-- Class text -->
+        <Widget type="TextBox" skin="SandText" position="32 152 265 18" name="ReflectT" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="Caption" value="Your personality and past reflect a:"/>
+            <Property key="TextAlign" value="ALIGN_TOP ALIGN_HCENTER"/>
+        </Widget>
+        <Widget type="TextBox" skin="SandText" position="32 170 265 18" name="ClassName" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="Caption" value="[Class]"/>
+            <Property key="TextAlign" value="ALIGN_TOP ALIGN_HCENTER"/>
+        </Widget>
+
+        <!-- Dialog buttons -->
+        <Widget type="Button" skin="MW_Button" position="220 184 53 23" name="BackButton">
+            <Property key="Caption" value="Back"/>
+        </Widget>
+        <Widget type="Button" skin="MW_Button" position="277 184 42 23" name="OKButton">
+            <Property key="Caption" value="OK"/>
+        </Widget>
+    </Widget>
+</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml b/files/mygui/openmw_chargen_race_layout.xml
similarity index 53%
rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml
rename to files/mygui/openmw_chargen_race_layout.xml
index c4db138c80..6887b12c5c 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml
+++ b/files/mygui/openmw_chargen_race_layout.xml
@@ -4,9 +4,9 @@
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 588 433" name="_Main">
 
         <!-- Appearance -->
-        <Widget type="StaticText" skin="HeaderText" position="8 16 241 18" name="AppearanceT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_Caption" value="Appearance"/>
-            <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="HeaderText" position="8 16 241 18" name="AppearanceT" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="Caption" value="Appearance"/>
+            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
         <Widget type="Canvas" skin="MW_Box" position="8 39 241 230" name="AppearanceBox"/>
 
@@ -16,55 +16,55 @@
 
         <!-- Gender choice -->
         <Widget type="Button" skin="MW_ScrollLeft" position="8 298 14 14" name="PrevGenderButton"/>
-        <Widget type="StaticText" skin="HeaderText" position="14 298 227 14" name="GenderChoiceT">
-            <Property key="Widget_Caption" value="Change Sex"/>
+        <Widget type="TextBox" skin="HeaderText" position="14 298 227 14" name="GenderChoiceT">
+            <Property key="Caption" value="Change Sex"/>
         </Widget>
         <Widget type="Button" skin="MW_ScrollRight" position="235 298 14 14" name="NextGenderButton"/>
 
         <!-- Face choice -->
         <Widget type="Button" skin="MW_ScrollLeft" position="8 320 14 14" name="PrevFaceButton"/>
-        <Widget type="StaticText" skin="HeaderText" position="14 320 227 14" name="FaceChoiceT">
-            <Property key="Widget_Caption" value="Change Face"/>
+        <Widget type="TextBox" skin="HeaderText" position="14 320 227 14" name="FaceChoiceT">
+            <Property key="Caption" value="Change Face"/>
         </Widget>
         <Widget type="Button" skin="MW_ScrollRight" position="235 320 14 14" name="NextFaceButton"/>
 
         <!-- Hair choice -->
         <Widget type="Button" skin="MW_ScrollLeft" position="8 342 14 14" name="PrevHairButton"/>
-        <Widget type="StaticText" skin="HeaderText" position="14 342 227 14" name="HairChoiceT">
-            <Property key="Widget_Caption" value="Change Hair"/>
+        <Widget type="TextBox" skin="HeaderText" position="14 342 227 14" name="HairChoiceT">
+            <Property key="Caption" value="Change Hair"/>
         </Widget>
         <Widget type="Button" skin="MW_ScrollRight" position="235 342 14 14" name="NextHairButton"/>
 
         <!-- Race -->
-        <Widget type="StaticText" skin="HeaderText" position="261 16 132 18" name="RaceT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_Caption" value="Race"/>
-            <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="HeaderText" position="261 16 132 18" name="RaceT" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="Caption" value="Race"/>
+            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
-        <Widget type="List" skin="MW_List" position="264 39 132 161" name="RaceList">
+        <Widget type="ListBox" skin="MW_List" position="264 39 132 161" name="RaceList">
         </Widget>
 
         <!-- Spell powers -->
-        <Widget type="StaticText" skin="HeaderText" position="261 200 132 18" name="SpellPowerT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_Caption" value="Specials"/>
-            <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="HeaderText" position="261 200 132 18" name="SpellPowerT" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="Caption" value="Specials"/>
+            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
         <!-- Spell power sub-widgets will be placed here, no skin to make it invisible -->
         <Widget type="Widget" skin="" position="261 220 132 140" name="SpellPowerList" />
 
         <!-- Skill bonus -->
-        <Widget type="StaticText" skin="HeaderText" position="403 39 159 18" name="SkillsT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="Widget_Caption" value="Skill Bonus"/>
-            <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="HeaderText" position="403 39 159 18" name="SkillsT" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="Caption" value="Skill Bonus"/>
+            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
         <!-- Skill bonus sub-widgets will be placed here, no skin to make it invisible -->
         <Widget type="Widget" skin="" position="403 59 159 360" name="SkillList" />
 
         <!-- Dialog buttons -->
         <Widget type="Button" skin="MW_Button" position="471 397 53 23" name="BackButton">
-            <Property key="Widget_Caption" value="Back"/>
+            <Property key="Caption" value="Back"/>
         </Widget>
         <Widget type="Button" skin="MW_Button" position="532 397 42 23" name="OKButton">
-            <Property key="Widget_Caption" value="OK"/>
+            <Property key="Caption" value="OK"/>
         </Widget>
     </Widget>
 </MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_review_layout.xml b/files/mygui/openmw_chargen_review_layout.xml
similarity index 80%
rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_review_layout.xml
rename to files/mygui/openmw_chargen_review_layout.xml
index f5c7e28f2c..c713eb4772 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_review_layout.xml
+++ b/files/mygui/openmw_chargen_review_layout.xml
@@ -9,10 +9,10 @@
             <Widget type="Button" skin="MW_Button" position="8 37 56 23" name="RaceButton"/>
             <Widget type="Button" skin="MW_Button" position="8 66 56 23" name="ClassButton"/>
             <Widget type="Button" skin="MW_Button" position="8 95 54 23" name="SignButton"/>
-            <Widget type="StaticText" skin="SandTextRight" position="100 10 140 18" name="NameText"/>
-            <Widget type="StaticText" skin="SandTextRight" position="100 39 140 18" name="RaceText"/>
-            <Widget type="StaticText" skin="SandTextRight" position="100 68 140 18" name="ClassText"/>
-            <Widget type="StaticText" skin="SandTextRight" position="100 97 140 18" name="SignText"/>
+            <Widget type="TextBox" skin="SandTextRight" position="100 10 140 18" name="NameText"/>
+            <Widget type="TextBox" skin="SandTextRight" position="100 39 140 18" name="RaceText"/>
+            <Widget type="TextBox" skin="SandTextRight" position="100 68 140 18" name="ClassText"/>
+            <Widget type="TextBox" skin="SandTextRight" position="100 97 140 18" name="SignText"/>
         </Widget>
 
         <!-- Player health, magicka and fatigue -->
@@ -37,15 +37,15 @@
         <!-- Player skills, factions, birthsign and reputation -->
         <Widget type="Widget" skin="MW_Box" position="258 12 244 356" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Skills">
             <Widget type="Widget" skin="" position="4 4 218 346" align="ALIGN_STRETCH" name="SkillClient" />
-            <Widget type="VScroll" skin="MW_VScroll" position="226 4 14 346" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="SkillScroller" />
+            <Widget type="ScrollBar" skin="MW_VScroll" position="226 4 14 346" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="SkillScroller" />
         </Widget>
 
         <!-- Dialog buttons -->
         <Widget type="Button" skin="MW_Button" position="400 372 53 23" name="BackButton">
-            <Property key="Widget_Caption" value="Back"/>
+            <Property key="Caption" value="Back"/>
         </Widget>
         <Widget type="Button" skin="MW_Button" position="460 372 42 23" name="OKButton">
-            <Property key="Widget_Caption" value="OK"/>
+            <Property key="Caption" value="OK"/>
         </Widget>
     </Widget>
 </MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_attribute_layout.xml b/files/mygui/openmw_chargen_select_attribute_layout.xml
similarity index 82%
rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_attribute_layout.xml
rename to files/mygui/openmw_chargen_select_attribute_layout.xml
index c5a74778d3..e1ab4d888b 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_attribute_layout.xml
+++ b/files/mygui/openmw_chargen_select_attribute_layout.xml
@@ -4,9 +4,9 @@
         <Widget type="Widget" skin="" position="14 14 186 203" align="ALIGN_STRETCH">
 
             <!-- Label -->
-            <Widget type="StaticText" skin="HeaderText" position="0 0 186 18" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_Caption" value="Choose a Specialization"/>
-                <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Widget type="TextBox" skin="HeaderText" position="0 0 186 18" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="Caption" value="Choose a Specialization"/>
+                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
             </Widget>
 
             <!-- Attribute list -->
@@ -21,7 +21,7 @@
 
             <!-- Dialog buttons -->
             <Widget type="Button" skin="MW_Button" position="120 180 66 21" name="CancelButton">
-                <Property key="Widget_Caption" value="Cancel"/>
+                <Property key="Caption" value="Cancel"/>
             </Widget>
 
         </Widget>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_skill_layout.xml b/files/mygui/openmw_chargen_select_skill_layout.xml
similarity index 78%
rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_skill_layout.xml
rename to files/mygui/openmw_chargen_select_skill_layout.xml
index 14b55eff6c..2c7dae80c4 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_skill_layout.xml
+++ b/files/mygui/openmw_chargen_select_skill_layout.xml
@@ -4,15 +4,15 @@
         <Widget type="Widget" skin="" position="17 14 447 239" align="ALIGN_STRETCH">
 
             <!-- Label -->
-            <Widget type="StaticText" skin="HeaderText" position="0 0 447 18" name="LabelT" align="ALIGN_HCENTRE ALIGN_TOP">
-                <Property key="Widget_Caption" value="Choose a Skill"/>
-                <Property key="Widget_AlignText" value="ALIGN_HCENTRE ALIGN_TOP"/>
+            <Widget type="TextBox" skin="HeaderText" position="0 0 447 18" name="LabelT" align="ALIGN_HCENTRE ALIGN_TOP">
+                <Property key="Caption" value="Choose a Skill"/>
+                <Property key="TextAlign" value="ALIGN_HCENTRE ALIGN_TOP"/>
             </Widget>
 
             <!-- Combat list -->
-            <Widget type="StaticText" skin="HeaderText" position="0 32 154 18" name="CombatLabelT" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_Caption" value="Combat"/>
-                <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Widget type="TextBox" skin="HeaderText" position="0 32 154 18" name="CombatLabelT" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="Caption" value="Combat"/>
+                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
             </Widget>
             <Widget type="MWSkill" skin="MW_StatNameButton" position="0 50 154 18" name="CombatSkill0" align="ALIGN_LEFT ALIGN_TOP" />
             <Widget type="MWSkill" skin="MW_StatNameButton" position="0 68 154 18" name="CombatSkill1" align="ALIGN_LEFT ALIGN_TOP" />
@@ -25,9 +25,9 @@
             <Widget type="MWSkill" skin="MW_StatNameButton" position="0 194 154 18" name="CombatSkill8" align="ALIGN_LEFT ALIGN_TOP" />
 
             <!-- Magic list -->
-            <Widget type="StaticText" skin="HeaderText" position="158 32 154 18" name="MagicLabelT" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_Caption" value="Magic"/>
-                <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Widget type="TextBox" skin="HeaderText" position="158 32 154 18" name="MagicLabelT" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="Caption" value="Magic"/>
+                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
             </Widget>
             <Widget type="MWSkill" skin="MW_StatNameButton" position="158 50 154 18" name="MagicSkill0" align="ALIGN_LEFT ALIGN_TOP" />
             <Widget type="MWSkill" skin="MW_StatNameButton" position="158 68 154 18" name="MagicSkill1" align="ALIGN_LEFT ALIGN_TOP" />
@@ -40,9 +40,9 @@
             <Widget type="MWSkill" skin="MW_StatNameButton" position="158 194 154 18" name="MagicSkill8" align="ALIGN_LEFT ALIGN_TOP" />
 
             <!-- Stealth list -->
-            <Widget type="StaticText" skin="HeaderText" position="316 32 131 18" name="StealthLabelT" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="Widget_Caption" value="Stealth"/>
-                <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Widget type="TextBox" skin="HeaderText" position="316 32 131 18" name="StealthLabelT" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="Caption" value="Stealth"/>
+                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
             </Widget>
             <Widget type="MWSkill" skin="MW_StatNameButton" position="316 50 131 18" name="StealthSkill0" align="ALIGN_LEFT ALIGN_TOP" />
             <Widget type="MWSkill" skin="MW_StatNameButton" position="316 68 131 18" name="StealthSkill1" align="ALIGN_LEFT ALIGN_TOP" />
@@ -56,7 +56,7 @@
 
             <!-- Dialog buttons -->
             <Widget type="Button" skin="MW_Button" position="381 218 66 21" name="CancelButton">
-                <Property key="Widget_Caption" value="Cancel"/>
+                <Property key="Caption" value="Cancel"/>
             </Widget>
 
         </Widget>
diff --git a/files/mygui/openmw_chargen_select_specialization_layout.xml b/files/mygui/openmw_chargen_select_specialization_layout.xml
new file mode 100644
index 0000000000..53980b1335
--- /dev/null
+++ b/files/mygui/openmw_chargen_select_specialization_layout.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI type="Layout">
+    <!-- correct size is 247 144, adjust when skin is changed to a dialog -->
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 247 144" name="_Main">
+        <Widget type="Widget" skin="" position="14 14 216 113" align="ALIGN_STRETCH">
+
+            <!-- Label -->
+            <Widget type="TextBox" skin="HeaderText" position="0 0 216 18" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="Caption" value="Choose a Specialization"/>
+                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+            </Widget>
+
+            <!-- Specialization list -->
+            <Widget type="TextBox" skin="SandText" position="0 28 216 18" name="Specialization0" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="TextAlign" value="ALIGN_TOP ALIGN_HCENTRE"/>
+            </Widget>
+            <Widget type="TextBox" skin="SandText" position="0 46 216 18" name="Specialization1" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="TextAlign" value="ALIGN_TOP ALIGN_HCENTRE"/>
+            </Widget>
+            <Widget type="TextBox" skin="SandText" position="0 64 216 18" name="Specialization2" align="ALIGN_LEFT ALIGN_TOP">
+                <Property key="TextAlign" value="ALIGN_TOP ALIGN_HCENTRE"/>
+            </Widget>
+
+            <!-- Dialog buttons -->
+            <Widget type="Button" skin="MW_Button" position="150 90 66 21" name="CancelButton">
+                <Property key="Caption" value="Cancel"/>
+            </Widget>
+
+        </Widget>
+    </Widget>
+</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml b/files/mygui/openmw_console.skin.xml
similarity index 81%
rename from extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml
rename to files/mygui/openmw_console.skin.xml
index afb692e201..1c8740ede1 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml
+++ b/files/mygui/openmw_console.skin.xml
@@ -4,9 +4,9 @@
     <Skin name = "MW_ConsoleWindow" size = "256 54">
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "17" />
-        <Property key="AlignText" value = "ALIGN_CENTER" />
-        <Property key="Colour" value = "0.8 0.8 0.8" />
-        <Property key="ToStick" value = "true" />
+        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <Property key="TextColour" value = "0.8 0.8 0.8" />
+        <Property key="Snap" value = "true" />
 
         <Child type="Widget" skin="BlackBG" offset = "4 4 248 46" align = "ALIGN_STRETCH" name = "Client"/>
 
@@ -40,30 +40,30 @@
 
     <Skin name = "MW_LogClient" size = "10 10">
         <Property key="FontName" value = "MonoFont" />
-        <Property key="AlignText" value = "Left Top" />
-        <Property key="Colour" value = "1 1 1" />
-        <!--Property key="Pointer" value = "beam" /-->
-        <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
-    </Skin>
-
-    <Skin name="MW_ConsoleLog" size="0 0 50 50">
-        <Property key="WordWrap" value = "true" />
-        <Child type="Widget" skin="MW_LogClient" offset="0 0 35 10" align = "ALIGN_STRETCH" name = "Client"/>
-        <!--Child type="VScroll" skin="VScroll" offset = "35 0 15 50" align = "Right VStretch" name = "VScroll"/-->
-    </Skin>
-
-    <Skin name = "MW_EditClient" size = "10 10">
-        <Property key="FontName" value = "MonoFont" />
-        <Property key="AlignText" value = "Left VCenter" />
-        <Property key="Colour" value = "1 1 1" />
+        <Property key="TextAlign" value = "Left Top" />
+        <Property key="TextColour" value = "1 1 1" />
         <!--Property key="Pointer" value = "beam" /-->
         <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
     </Skin>
 
     <!-- The edit control used for entering commands -->
     <Skin name = "MW_ConsoleCommand" size = "29 26">
-        <Child type="Widget" skin="MW_EditClient" offset = "2 1 23 22" align = "Stretch" name = "Client"/>
+        <Child type="TextBox" skin="MW_EditClient" offset = "2 1 23 22" align = "Stretch" name = "Client"/>
 
         <Child type="Widget" skin="MW_BarFrame" offset="0 0 29 26" align="ALIGN_STRETCH"/>
     </Skin>
+
+    <Skin name="MW_ConsoleLog" size="0 0 50 50">
+        <Property key="WordWrap" value = "true" />
+        <Child type="TextBox" skin="MW_LogClient" offset="0 0 35 10" align = "ALIGN_STRETCH" name = "Client"/>
+        <!--Child type="VScroll" skin="VScroll" offset = "35 0 15 50" align = "Right VStretch" name = "VScroll"/-->
+    </Skin>
+
+    <Skin name = "MW_EditClient" size = "10 10">
+        <Property key="FontName" value = "MonoFont" />
+        <Property key="TextAlign" value = "Left VCenter" />
+        <Property key="TextColour" value = "1 1 1" />
+        <!--Property key="Pointer" value = "beam" /-->
+        <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
+    </Skin>
 </MyGUI>
diff --git a/files/mygui/openmw_console_layout.xml b/files/mygui/openmw_console_layout.xml
new file mode 100644
index 0000000000..a2b883cdb5
--- /dev/null
+++ b/files/mygui/openmw_console_layout.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI type="Layout">
+  <Widget type="Window" skin="MW_ConsoleWindow" position="0 0 400 400" layer="Console" name="_Main">
+    <Property key="Caption" value="Console"/>
+    <Property key="MinSize" value="200 100"/>
+    <Property key="MaxSize" value="2000 2000"/>
+
+    <!-- Log window -->
+    <Widget type="EditBox" skin="MW_ConsoleLog" position="5 5 390 360" align="Stretch" name="list_History">
+        <Property key="MultiLine" value="1"/>
+    </Widget>
+
+    <!-- Command line -->
+    <Widget type="EditBox" skin="MW_ConsoleCommand" position="0 365 392 28" align="HStretch Bottom" name="edit_Command"/>
+
+  </Widget>
+</MyGUI>
diff --git a/files/mygui/openmw_dialogue_window_layout.xml b/files/mygui/openmw_dialogue_window_layout.xml
new file mode 100644
index 0000000000..6e833004b1
--- /dev/null
+++ b/files/mygui/openmw_dialogue_window_layout.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 588 433" name="_Main">
+        <!-- HEADER -->
+        <Widget type="TextBox" skin="HeaderText" position="0 0 588 18" name="NpcName" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="Caption" value="Name"/>
+            <Property key="TextAlign" value="ALIGN_CENTER"/>
+        </Widget>
+
+        <!-- The Dialogue history -->
+        <Widget type="DialogueHistory" skin="MW_TextBoxEdit" position="8 39 400 375" name="History"  align="ALIGN_LEFT ALIGN_TOP STRETCH">
+            <Property key="Static" value="true"/>
+            <Property key="WordWrap" value="true"/>
+            <Property key="FontHeight" value="18"/>
+            <Property key="MultiLine" value="1" />
+            <Property key="VisibleVScroll" value="1" />
+            <!-- invisible box for receiving mouse events -->
+            <Widget type="Widget" skin="" position="0 0 400 375" name="EventBox" align="ALIGN_LEFT ALIGN_TOP STRETCH"/>
+        </Widget>
+
+		<!-- The disposition bar-->
+        <Widget type="ProgressBar" skin="MW_EnergyBar_Blue" position="432 39 132 18"
+            align="Right Top" name="Disposition">		
+			<Widget type="EditBox" skin="MW_DispositionEdit" position_real = "0.25 0 0.5 1" name = "DispositionText"/>	
+		</Widget>
+        <!-- The list of topics -->
+        <Widget type="ListBox" skin="MW_List" position="432 62 132 318" name="TopicsList">
+        </Widget>
+
+        <!-- The Goodbye button -->
+        <Widget type="Button" skin="MW_Button" position="432 387 132 23" name="ByeButton">
+            <Property key="Caption" value="Goodbye"/>
+        </Widget>
+    </Widget>
+</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_skin.xml b/files/mygui/openmw_dialogue_window_skin.xml
similarity index 61%
rename from extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_skin.xml
rename to files/mygui/openmw_dialogue_window_skin.xml
index 25e0b86592..ecdec8a5c0 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_skin.xml
+++ b/files/mygui/openmw_dialogue_window_skin.xml
@@ -3,16 +3,17 @@
 <MyGUI type="Skin">
 
     <Skin name = "MW_DispEdit" size = "10 10">
-        <Property key="FontName" value = "MonoFont" />
-        <Property key="AlignText" value = "Left Top" />
-        <Property key="Colour" value = "0000FF" />
         <!--Property key="Pointer" value = "beam" /-->
         <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
     </Skin>
-	
+
     <Skin name="MW_DispositionEdit" size="0 0 50 50">
+        <Property key="FontName" value = "MonoFont" />
+        <Property key="TextAlign" value = "Left Top" />
+        <Property key="Colour" value = "0000FF" />
+        <Property key="Static" value="1" />
         <Property key="WordWrap" value = "true" />
-        <Child type="Widget" skin="MW_DispEdit" offset="0 0 35 10" align = "ALIGN_STRETCH" name = "Client"/>
-        <!--Child type="VScroll" skin="VScroll" offset = "35 0 15 50" align = "Right VStretch" name = "VScroll"/-->
+        <Child type="TextBox" skin="MW_DispEdit" offset="0 0 35 10" align = "ALIGN_STRETCH" name = "Client"/>
     </Skin>
-</MyGUI>
\ No newline at end of file
+    
+</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_edit.skin.xml b/files/mygui/openmw_edit.skin.xml
similarity index 73%
rename from extern/mygui_3.0.1/openmw_resources/openmw_edit.skin.xml
rename to files/mygui/openmw_edit.skin.xml
index 9985e623d9..609dfe2c89 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_edit.skin.xml
+++ b/files/mygui/openmw_edit.skin.xml
@@ -3,24 +3,19 @@
 <MyGUI type="Skin">
     <!-- Text edit widget -->
     <Skin name = "MW_TextEditClient" size = "10 10">
-        <Property key="FontName" value = "MyGUI_CoreFont.18"/>
-        <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_LEFT ALIGN_VCENTER" />
-        <Property key="Colour" value = "0.6 0.6 0.6" />
-
         <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
     </Skin>
 
     <Skin name = "MW_TextBoxEditClient" size = "10 10">
-        <Property key="FontName" value = "MyGUI_CoreFont.18"/>
-        <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_LEFT ALIGN_TOP" />
-        <Property key="Colour" value = "0.6 0.6 0.6" />
-
         <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
     </Skin>
 
-    <Skin name = "MW_TextEdit" size = "512 20"  texture="mwgui.png">
+    <Skin name="MW_TextEdit" size="512 20" texture="mwgui.png">
+        <Property key="FontName" value = "MyGUI_CoreFont.18"/>
+        <Property key="FontHeight" value = "18" />
+        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_VCENTER" />
+        <Property key="TextColour" value = "0.6 0.6 0.6" />
+
         <BasisSkin type="SubSkin" offset = "0 0 512 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
             <State name="normal" offset = "2 2 512 2"/>
         </BasisSkin>
@@ -34,10 +29,15 @@
             <State name="normal" offset = "2 20 512 2"/>
         </BasisSkin>
 
-        <Child type="Widget" skin="MW_TextEditClient" offset = "2 2 508 18" align = "Stretch" name = "Client"/>
+        <Child type="TextBox" skin="MW_TextEditClient" offset = "2 2 508 18" align = "Stretch" name = "Client"/>
     </Skin>
 
-    <Skin name = "MW_TextBoxEdit" size = "512 20"  texture="mwgui.png">
+    <Skin name="MW_TextBoxEdit" size="512 20" texture="mwgui.png">
+        <Property key="FontName" value = "MyGUI_CoreFont.18"/>
+        <Property key="FontHeight" value = "18" />
+        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_TOP" />
+        <Property key="TextColour" value = "0.6 0.6 0.6" />
+
         <BasisSkin type="SubSkin" offset = "0 0 512 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
             <State name="normal" offset = "2 2 512 2"/>
         </BasisSkin>
@@ -51,7 +51,7 @@
             <State name="normal" offset = "2 20 512 2"/>
         </BasisSkin>
 
-        <Child type="Widget" skin="MW_TextBoxEditClient" offset = "2 2 490 18" align = "Stretch" name = "Client"/>
-        <Child type="VScroll" skin="MW_VScroll" offset = "494 3 14 14" align = "Right VStretch" name = "VScroll"/>
+        <Child type="TextBox" skin="MW_TextBoxEditClient" offset = "2 2 490 18" align = "Stretch" name = "Client"/>	  	
+        <Child type="ScrollBar" skin="MW_VScroll" offset = "494 3 14 14" align = "Right VStretch" name = "VScroll"/>
     </Skin>
 </MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_hud_box.skin.xml b/files/mygui/openmw_hud_box.skin.xml
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/openmw_hud_box.skin.xml
rename to files/mygui/openmw_hud_box.skin.xml
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_hud_energybar.skin.xml b/files/mygui/openmw_hud_energybar.skin.xml
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/openmw_hud_energybar.skin.xml
rename to files/mygui/openmw_hud_energybar.skin.xml
diff --git a/files/mygui/openmw_hud_layout.xml b/files/mygui/openmw_hud_layout.xml
new file mode 100644
index 0000000000..86f4df172c
--- /dev/null
+++ b/files/mygui/openmw_hud_layout.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Widget" layer="HUD" position="0 0 300 200" name="_Main">
+        <!-- Energy bars -->
+        <Widget type="ProgressBar" skin="MW_EnergyBar_Red" position="13 146 65 12"
+            align="Left Bottom" name="Health"/>
+        <Widget type="ProgressBar" skin="MW_EnergyBar_Blue" position="13 161 65 12"
+            align="Left Bottom" name="Magicka"/>
+        <Widget type="ProgressBar" skin="MW_EnergyBar_Green" position="13 176 65 12"
+            align="Left Bottom" name="Stamina"/>
+
+        <!-- Equipped weapon box -->
+        <Widget type="Widget" skin="HUD_Box" position="82 146 36 36"
+            align="Left Bottom">
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 32 32" align="Left Top"
+                name="WeapImage"/>
+        </Widget>
+        <Widget type="ProgressBar" skin="MW_EnergyBar_Red" position="82 182 36 6"
+            align="Left Bottom" name="WeapStatus"/>
+
+        <!-- Selected spell box -->
+        <Widget type="Widget" skin="HUD_Box" position="122 146 36 36"
+            align="Left Bottom">
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 32 32" align="Left Top"
+                name="SpellImage"/>
+        </Widget>
+        <Widget type="ProgressBar" skin="MW_EnergyBar_Red" position="122 182 36 6"
+            align="Left Bottom" name="SpellStatus"/>
+
+        <!-- Spell effects box -->
+        <Widget type="Widget" skin="HUD_Box" position="199 168 20 20"
+            align="Right Bottom" name="EffectBox">
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 16 16" align="Left Bottom"
+                name="Effect1"/>
+        </Widget>
+
+        <!-- Map box -->
+        <Widget type="Widget" skin="HUD_Box" position="223 123 65 65"
+            align="Right Bottom">
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 61 61" align="Left Bottom"
+                name="MiniMap"/>
+            <Widget type="ImageBox" skin="ImageBox" position="17 18 32 32" align="Left Bottom"
+                name="Compass"/>
+        </Widget>
+
+        <!-- Crosshair -->
+
+        <Widget type="ImageBox" skin="ImageBox" position="0 0 32
+            32" align="Center Center" name="Crosshair"/>
+
+        <!-- Basic FPSCounter box -->
+        <Widget type="Widget" skin="HUD_Box" position="12 12 28 21" align="Left Top"
+            name="FPSBox">
+            <Property key="Visible" value="false"/>
+            <Widget type="TextBox" skin="NumFPS" position="3 3 21 17" name="FPSCounter"/>
+        </Widget>
+
+        <!-- Advanced FPSCounter box -->
+        <Widget type="Widget" skin="HUD_Box" position="12 12 118 51" align="Left Top"
+            name="FPSBoxAdv">
+            <Property key="Visible" value="false"/>
+
+            <Widget type="TextBox" skin="NumFPS" position="3 3 71 17">
+                    <Property key="Caption" value="FPS: "/>
+            </Widget>
+            <Widget type="TextBox" skin="NumFPS" position="53 3 71 17" name="FPSCounterAdv"/>
+
+            <Widget type="TextBox" skin="NumFPS" position="3 3 71 32">
+                    <Property key="Caption" value="Tri Count: "/>
+            </Widget>
+            <Widget type="TextBox" skin="NumFPS" position="53 3 71 32" name="TriangleCounter"/>
+
+            <Widget type="TextBox" skin="NumFPS" position="3 3 71 47">
+                    <Property key="Caption" value="Batch Count: "/>
+            </Widget>
+            <Widget type="TextBox" skin="NumFPS" position="53 3 71 47" name="BatchCounter"/>
+        </Widget>
+
+    </Widget>
+</MyGUI>
diff --git a/files/mygui/openmw_images.xml b/files/mygui/openmw_images.xml
new file mode 100644
index 0000000000..6487742c3e
--- /dev/null
+++ b/files/mygui/openmw_images.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Resource">
+        <Resource type="ResourceImageSet" name="ArrowPointerImage">
+                <Group name="Pointer" texture="mwpointer.png" size="32 32">
+                        <Index name="Pointer" >
+                                <Frame point="0 0"/>
+                        </Index>
+                </Group>
+        </Resource>
+        <Resource type="ResourceImageSet" name="HResizePointerImage">
+                <Group name="Pointer" texture="mwpointer.png" size="32 32">
+                        <Index name="Pointer" >
+                                <Frame point="32 0"/>
+                        </Index>
+                </Group>
+        </Resource>
+        <Resource type="ResourceImageSet" name="VResizePointerImage">
+                <Group name="Pointer" texture="mwpointer.png" size="32 32">
+                        <Index name="Pointer" >
+                                <Frame point="0 32"/>
+                        </Index>
+                </Group>
+        </Resource>
+        <Resource type="ResourceImageSet" name="DResizePointerImage">
+                <Group name="Pointer" texture="mwpointer.png" size="32 32">
+                        <Index name="Pointer" >
+                                <Frame point="32 32"/>
+                        </Index>
+                </Group>
+        </Resource>
+        <Resource type="ResourceImageSet" name="DResize2PointerImage">
+                <Group name="Pointer" texture="mwpointer.png" size="32 32">
+                        <Index name="Pointer" >
+                                <Frame point="64 32"/>
+                        </Index>
+                </Group>
+        </Resource>
+</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_infobox_layout.xml b/files/mygui/openmw_infobox_layout.xml
similarity index 75%
rename from extern/mygui_3.0.1/openmw_resources/openmw_infobox_layout.xml
rename to files/mygui/openmw_infobox_layout.xml
index 63725a5c3e..de10308304 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_infobox_layout.xml
+++ b/files/mygui/openmw_infobox_layout.xml
@@ -5,8 +5,8 @@
 
         <!-- Edit box -->
         <Widget type="Widget" skin="MW_Box" position="14 14 516 70" name="TextBox" align="ALIGN_TOP ALIGN_HCENTER">
-            <Widget type="StaticText" skin="SandText" position="4 4 508 62" name="Text" align="ALIGN_TOP ALIGN_HCENTER">
-                <Property key="Edit_WordWrap" value="1" />
+            <Widget type="TextBox" skin="SandText" position="4 4 508 62" name="Text" align="ALIGN_TOP ALIGN_HCENTER">
+                <Property key="WordWrap" value="1" />
             </Widget>
         </Widget>
 
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_interactive_messagebox_layout.xml b/files/mygui/openmw_interactive_messagebox_layout.xml
similarity index 53%
rename from extern/mygui_3.0.1/openmw_resources/openmw_interactive_messagebox_layout.xml
rename to files/mygui/openmw_interactive_messagebox_layout.xml
index 40c0787b88..4ef2243d42 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_interactive_messagebox_layout.xml
+++ b/files/mygui/openmw_interactive_messagebox_layout.xml
@@ -2,13 +2,13 @@
 
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 500 400" name="_Main">
-        <Widget type="Edit" skin="MW_TextEditClient" position="10 10 490 20" align="ALIGN_LEFT ALIGN_TOP STRETCH" name="message">
-            <Property key="Edit_Static" value="true"/>
-            <Property key="Edit_WordWrap" value="true"/>
-            <Property key="Text_FontHeight" value="18"/>
-            <Property key="Edit_MultiLine" value="1" />
-            <Property key="Edit_VisibleVScroll" value="1" />
-            <Property key="Widget_AlignText" value="ALIGN_CENTER" />
+        <Widget type="EditBox" skin="MW_TextEditClient" position="10 10 490 20" align="ALIGN_LEFT ALIGN_TOP STRETCH" name="message">
+            <Property key="Static" value="true"/>
+            <Property key="WordWrap" value="true"/>
+            <Property key="FontHeight" value="18"/>
+            <Property key="MultiLine" value="1" />
+            <Property key="VisibleVScroll" value="1" />
+            <Property key="TextAlign" value="ALIGN_CENTER" />
             <Property key="FontName" value = "MyGUI_CoreFont.18" />
             <Property key="TextColour" value = "0.7 0.7 0.7" />
         </Widget>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_inventory_window_layout.xml b/files/mygui/openmw_inventory_window_layout.xml
similarity index 76%
rename from extern/mygui_3.0.1/openmw_resources/openmw_inventory_window_layout.xml
rename to files/mygui/openmw_inventory_window_layout.xml
index e5c32a9f78..c69b6d8fe2 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_inventory_window_layout.xml
+++ b/files/mygui/openmw_inventory_window_layout.xml
@@ -4,13 +4,13 @@
     <Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 600 300" name="_Main">
 
         <!-- Player enumbrance -->
-        <Widget type="Progress" skin="MW_Progress_Blue" position="8 8 212 18" name="EncumbranceBar">
-            <Widget type="StaticText" skin="ProgressText" position="0 0 212 18" align="Center" name="EncumbranceBarT"/>
+        <Widget type="ProgressBar" skin="MW_Progress_Blue" position="8 8 212 18" name="EncumbranceBar">
+            <Widget type="TextBox" skin="ProgressText" position="0 0 212 18" align="Center" name="EncumbranceBarT"/>
         </Widget>
 
         <!-- Avatar -->
         <Widget type="Widget" skin="MW_Box" position="8 32 212 166" name="Avatar">
-            <Widget type="StaticText" skin="ProgressText" position="0 -8 212 18" align="HCenter Bottom" name="ArmorRating"/>
+            <Widget type="TextBox" skin="ProgressText" position="0 -8 212 18" align="HCenter Bottom" name="ArmorRating"/>
         </Widget>
 
         <!-- Items in inventory -->
diff --git a/files/mygui/openmw_journal_layout.xml b/files/mygui/openmw_journal_layout.xml
new file mode 100644
index 0000000000..da4fe658bd
--- /dev/null
+++ b/files/mygui/openmw_journal_layout.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+
+<Widget type="Window" skin="" layer="Windows" align="Left|Top" position="00 200 512 256" name="_Main">
+
+    <Widget type="ImageBox" skin="ImageBox" position_real="0 0 1 1" align="Top|Right" name="JImage">     
+        <Property key="ImageTexture" value="textures\tx_menubook.dds"/>
+
+        <Widget type="Button" skin="Next_btn" position="370 220 64 32" name="NextPageBTN">
+        </Widget>
+
+        <Widget type="Button" skin="Prev_btn" position="80 220 128 32" name="PrevPageBTN">
+        </Widget>
+
+        <Widget type="EditBox" skin="MW_BookPage" position_real="0.15 0.1 0.3 0.8" name = "LeftText"/>
+        <Widget type="EditBox" skin="MW_BookPage" position_real="0.55 0.1 0.3 0.8" name = "RightText"/>
+    </Widget>
+</Widget>
+
+</MyGUI>
diff --git a/files/mygui/openmw_journal_skin.xml b/files/mygui/openmw_journal_skin.xml
new file mode 100644
index 0000000000..a0d6ee2e86
--- /dev/null
+++ b/files/mygui/openmw_journal_skin.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Skin">
+        <Skin name="Next_btn" size="64 32" texture="textures\tx_menubook_next_idle.dds">
+                <BasisSkin type="MainSkin" offset="0 0 64 32" align="ALIGN_VSTRETCH">
+                        <State name="normal" offset="0 0 64 32"/>
+                </BasisSkin>
+        </Skin>
+
+        <Skin name="Prev_btn" size="128 32" texture="textures\tx_menubook_prev_idle.dds">
+                <BasisSkin type="MainSkin" offset="0 0 128 32" align="ALIGN_VSTRETCH">
+                        <State name="normal" offset="0 0 128 32"/>
+                </BasisSkin>
+        </Skin>
+
+        <Skin name = "MW_BookClient" size = "10 10">
+                <Property key="FontName" value = "MonoFont" />
+                <Property key="TextAlign" value = "Left Top" />
+                <Property key="TextColour" value = "0 0 0" />
+                <!--Property key="Pointer" value = "beam" /-->
+                <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
+        </Skin>
+	
+        <Skin name="MW_BookPage" size="0 0 50 50">
+                <Property key="WordWrap" value = "true" />
+                <Child type="TextBox" skin="MW_BookClient" offset="0 0 35 10" align = "ALIGN_STRETCH" name = "Client"/>
+                <!--Child type="ScrollBar" skin="VScroll" offset = "35 0 15 50" align = "Right VStretch" name = "VScroll"/-->
+        </Skin>
+</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_layers.xml b/files/mygui/openmw_layers.xml
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/openmw_layers.xml
rename to files/mygui/openmw_layers.xml
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml b/files/mygui/openmw_list.skin.xml
similarity index 94%
rename from extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml
rename to files/mygui/openmw_list.skin.xml
index 163af4b7fc..c3b97c7527 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml
+++ b/files/mygui/openmw_list.skin.xml
@@ -169,8 +169,8 @@
     <Skin name = "HeaderText" size = "16 16">
         <Property key="FontName" value = "MyGUI_CoreFont.18"/>
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_CENTER" />
-        <Property key="Colour" value = "0.82 0.74 0.58" />
+        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <Property key="TextColour" value = "0.82 0.74 0.58" />
 
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
@@ -179,8 +179,7 @@
     <Skin name = "MW_ListLine" size = "5 5" texture="mwgui.png">
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_LEFT ALIGN_VCENTER" />
-        <Property key="Colour" value = "0.70 0.57 0.33" />
+        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_VCENTER" />
         
         <BasisSkin type="SimpleText" offset = "2 0 1 5" align = "ALIGN_STRETCH">
             <State name="normal" colour = "0.70 0.57 0.33"/>
@@ -195,10 +194,10 @@
         <Property key="SkinLine" value = "MW_ListLine" />
         <Property key="HeightLine" value = "20" />
 
-        <Child type="VScroll" skin="MW_VScroll" offset = "498 3 14 509" align = "ALIGN_RIGHT ALIGN_VSTRETCH" name = "VScroll">
+        <Child type="ScrollBar" skin="MW_VScroll" offset = "498 3 14 509" align = "ALIGN_RIGHT ALIGN_VSTRETCH" name = "VScroll">
         </Child>
 
-        <Child type="Widget" skin="DefaultClient" offset = "3 3 493 509" align = "ALIGN_STRETCH" name = "Client">
+        <Child type="Widget" skin="ClientDefaultSkin" offset = "3 3 493 509" align = "ALIGN_STRETCH" name = "Client">
         </Child>
 
         <Child type="Widget" skin="IB_T" offset="2 0 512 2" align="ALIGN_TOP ALIGN_HSTRETCH"/>
@@ -216,7 +215,7 @@
         <Property key="SkinLine" value = "MW_ListLine" />
         <Property key="HeightLine" value = "20" />
 
-        <Child type="VScroll" skin="VScroll" offset = "498 3 14 509" align = "ALIGN_RIGHT ALIGN_VSTRETCH" name = "VScroll">
+        <Child type="ScrollBar" skin="VScroll" offset = "498 3 14 509" align = "ALIGN_RIGHT ALIGN_VSTRETCH" name = "VScroll">
         </Child>
 
         <Child type="Widget" skin="Default" offset = "3 3 493 509" align = "ALIGN_STRETCH" name = "Client">
@@ -229,12 +228,12 @@
     <Skin name = "MW_MultiList" size = "516 516" align = "ALIGN_LEFT ALIGN_TOP">
         <Property key="NeedKey" value = "true" />
         <Property key="SkinButton" value = "ButtonSmall" />
-        <Property key="_SkinButtonEmpty" value = "Edit" />
+        <Property key="_SkinButtonEmpty" value = "EditBox" />
         <Property key="HeightButton" value = "20" />
 
         <Property key="SkinList" value = "MW_MultiSubList" />
 
-        <Child type="Widget" skin="DefaultClient" offset = "3 3 516 516" align = "ALIGN_STRETCH" name = "Client">
+        <Child type="Widget" skin="ClientDefaultSkin" offset = "3 3 516 516" align = "ALIGN_STRETCH" name = "Client">
         </Child>
 
         <Child type="Widget" skin="IB_T" offset="2 0 512 2" align="ALIGN_TOP ALIGN_HSTRETCH"/>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_mainmenu_layout.xml b/files/mygui/openmw_mainmenu_layout.xml
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/openmw_mainmenu_layout.xml
rename to files/mygui/openmw_mainmenu_layout.xml
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_mainmenu_skin.xml b/files/mygui/openmw_mainmenu_skin.xml
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/openmw_mainmenu_skin.xml
rename to files/mygui/openmw_mainmenu_skin.xml
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_map_window_layout.xml b/files/mygui/openmw_map_window_layout.xml
similarity index 57%
rename from extern/mygui_3.0.1/openmw_resources/openmw_map_window_layout.xml
rename to files/mygui/openmw_map_window_layout.xml
index f4ff50f72c..011487de7e 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_map_window_layout.xml
+++ b/files/mygui/openmw_map_window_layout.xml
@@ -2,8 +2,8 @@
 
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 300 300" name="_Main">
-        <Widget type="StaticImage" skin="StaticImage" position="0 0 284 264" align="ALIGN_STRETCH" name="Map"/>
-        <Widget type="StaticImage" skin="StaticImage" position="126 116 32 32" align="Center" name="Compass"/>
+        <Widget type="ImageBox" skin="ImageBox" position="0 0 284 264" align="ALIGN_STRETCH" name="Map"/>
+        <Widget type="ImageBox" skin="ImageBox" position="126 116 32 32" align="Center" name="Compass"/>
         <Widget type="Button" skin="MW_Button" position="213 233 61 22" align="ALIGN_BOTTOM ALIGN_RIGHT" name="WorldButton"/>
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_messagebox_layout.xml b/files/mygui/openmw_messagebox_layout.xml
new file mode 100644
index 0000000000..244f58c99d
--- /dev/null
+++ b/files/mygui/openmw_messagebox_layout.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <!--Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 0 0" name="_Main">
+        <Widget type="TextBox" skin="TextBox" position="4 4 4 4" name="message" />
+    </Widget-->
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 0 0" name="_Main">
+        <Widget type="EditBox" skin="MW_TextEditClient" position="5 -5 0 0" name="message"  align="ALIGN_LEFT ALIGN_TOP STRETCH">
+            <Property key="Static" value="true"/>
+            <Property key="WordWrap" value="true"/>
+            <Property key="FontHeight" value="18"/>
+            <Property key="MultiLine" value="1" />
+            <Property key="VisibleVScroll" value="1" />
+            <Property key="TextAlign" value="ALIGN_CENTER" />
+            <Property key="FontName" value = "MyGUI_CoreFont.18" />
+            <Property key="TextColour" value = "0.7 0.7 0.7" />
+        </Widget>
+    </Widget>
+</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_progress.skin.xml b/files/mygui/openmw_progress.skin.xml
similarity index 94%
rename from extern/mygui_3.0.1/openmw_resources/openmw_progress.skin.xml
rename to files/mygui/openmw_progress.skin.xml
index b6cfd2b57b..a5fbfb0a34 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_progress.skin.xml
+++ b/files/mygui/openmw_progress.skin.xml
@@ -21,8 +21,8 @@
     <Skin name = "ProgressText" size = "16 16">
         <Property key="FontName" value = "MyGUI_CoreFont.18"/>
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_CENTER" />
-        <Property key="Colour" value = "0.75 0.6 0.35" />
+        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <Property key="TextColour" value = "0.75 0.6 0.35" />
         
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
diff --git a/files/mygui/openmw_settings.xml b/files/mygui/openmw_settings.xml
new file mode 100644
index 0000000000..ca62294de0
--- /dev/null
+++ b/files/mygui/openmw_settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI>
+    <MyGUI type="Font">
+        <Property key="Default" value="MyGUI_CoreFont.18"/>
+    </MyGUI>
+
+    <MyGUI type="Pointer">
+        <Property key="Default" value="arrow"/>
+        <Property key="Layer" value="Pointer"/>
+    </MyGUI>
+</MyGUI>
diff --git a/files/mygui/openmw_stats_window_layout.xml b/files/mygui/openmw_stats_window_layout.xml
new file mode 100644
index 0000000000..1380d474cd
--- /dev/null
+++ b/files/mygui/openmw_stats_window_layout.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 500 342" name="_Main">
+
+        <!-- Player health stats -->
+        <Widget type="Widget" skin="MW_Box" position="8 8 212 62">
+            <Widget type="TextBox" skin="NormalText" position="4 4 70 18" name="Health_str"/>
+            <Widget type="TextBox" skin="NormalText" position="4 22 70 18" name="Magicka_str"/>
+            <Widget type="TextBox" skin="NormalText" position="4 40 70 18" name="Fatigue_str"/>
+            <Widget type="ProgressBar" skin="MW_Progress_Red" position="78 4 130 18" name="HBar"/>
+            <Widget type="ProgressBar" skin="MW_Progress_Blue" position="78 22 130 18" name="MBar"/>
+            <Widget type="ProgressBar" skin="MW_Progress_Green" position="78 40 130 18" name="FBar"/>
+            <Widget type="TextBox" skin="ProgressText" position="78 4 130 18" align="Center" name="HBarT"/>
+            <Widget type="TextBox" skin="ProgressText" position="78 22 130 18" align="Center" name="MBarT"/>
+            <Widget type="TextBox" skin="ProgressText" position="78 40 130 18" align="Center" name="FBarT"/>
+        </Widget>
+
+        <!-- Player level, race and class -->
+        <Widget type="Widget" skin="MW_Box" position="8 78 212 62">
+            <Widget type="TextBox" skin="NormalText" position="4 4 100 18" name="Level_str"/>
+            <Widget type="TextBox" skin="NormalText" position="4 22 100 18" name="Race_str"/>
+            <Widget type="TextBox" skin="NormalText" position="4 40 100 18" name="Class_str"/>
+            <Widget type="TextBox" skin="SandTextRight" position="104 4 104 18" name="LevelText"/>
+            <Widget type="TextBox" skin="SandTextRight" position="104 22 104 18" name="RaceText"/>
+            <Widget type="TextBox" skin="SandTextRight" position="104 40 104 18" name="ClassText"/>
+        </Widget>
+
+        <Widget type="Widget" skin="MW_Box" position="8 148 212 152">
+            <Widget type="TextBox" skin="SandText" position="4 4 100 18" name="Attrib1"/>
+            <Widget type="TextBox" skin="SandTextRight" position="104 4 104 18" name="AttribVal1"/>
+
+            <Widget type="TextBox" skin="SandText" position="4 22 100 18" name="Attrib2"/>
+            <Widget type="TextBox" skin="SandTextRight" position="104 22 104 18" name="AttribVal2"/>
+
+            <Widget type="TextBox" skin="SandText" position="4 40 100 18" name="Attrib3"/>
+            <Widget type="TextBox" skin="SandTextRight" position="104 40 104 18" name="AttribVal3"/>
+
+            <Widget type="TextBox" skin="SandText" position="4 58 100 18" name="Attrib4"/>
+            <Widget type="TextBox" skin="SandTextRight" position="104 58 104 18" name="AttribVal4"/>
+
+            <Widget type="TextBox" skin="SandText" position="4 76 100 18" name="Attrib5"/>
+            <Widget type="TextBox" skin="SandTextRight" position="104 76 104 18" name="AttribVal5"/>
+
+            <Widget type="TextBox" skin="SandText" position="4 94 100 18" name="Attrib6"/>
+            <Widget type="TextBox" skin="SandTextRight" position="104 94 104 18" name="AttribVal6"/>
+
+            <Widget type="TextBox" skin="SandText" position="4 112 100 18" name="Attrib7"/>
+            <Widget type="TextBox" skin="SandTextRight" position="104 112 104 18" name="AttribVal7"/>
+
+            <Widget type="TextBox" skin="SandText" position="4 130 100 18" name="Attrib8"/>
+            <Widget type="TextBox" skin="SandTextRight" position="104 130 104 18" name="AttribVal8"/>
+        </Widget>
+
+        <!-- Player skills, factions, birthsign and reputation -->
+        <Widget type="Widget" skin="MW_Box" position="228 8 248 292" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Skills">
+            <Widget type="Widget" skin="" position="4 4 222 284" align="ALIGN_STRETCH" name="SkillClient" />
+            <Widget type="ScrollBar" skin="MW_VScroll" position="230 4 14 284" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="SkillScroller" />
+        </Widget>
+    </Widget>
+</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_text.skin.xml b/files/mygui/openmw_text.skin.xml
similarity index 55%
rename from extern/mygui_3.0.1/openmw_resources/openmw_text.skin.xml
rename to files/mygui/openmw_text.skin.xml
index 97c5cb3b28..d62a5b8c02 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_text.skin.xml
+++ b/files/mygui/openmw_text.skin.xml
@@ -4,40 +4,39 @@
     <Skin name = "NormalText" size = "16 16">
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_LEFT ALIGN_BOTTOM" />
-        <Property key="Colour" value = "0.87 0.78 0.62" />
+        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_BOTTOM" />
+        <Property key="TextColour" value = "0.87 0.78 0.62" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16" align = "ALIGN_STRETCH"/>
     </Skin>
 
     <Skin name = "NumFPS" size = "16 16">
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_HCENTER ALIGN_BOTTOM" />
-        <Property key="Colour" value = "1 1 1" />
+        <Property key="TextAlign" value = "ALIGN_HCENTER ALIGN_BOTTOM" />
+        <Property key="TextColour" value = "1 1 1" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16" align = "ALIGN_STRETCH"/>
     </Skin>
 
     <Skin name = "SandText" size = "16 16">
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_LEFT ALIGN_BOTTOM" />
-        <Property key="Colour" value = "0.75 0.6 0.35" />
+        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_BOTTOM" />
+        <Property key="TextColour" value = "0.75 0.6 0.35" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
 
     <Skin name = "SandTextC" size = "16 16">
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "TOP HCENTER" />
-        <Property key="Colour" value = "0.75 0.6 0.35" />
+        <Property key="TextAlign" value = "TOP HCENTER" />
+        <Property key="TextColour" value = "0.75 0.6 0.35" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
 
     <Skin name = "SandTextRight" size = "16 16">
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_RIGHT ALIGN_BOTTOM" />
-        <Property key="Colour" value = "0.75 0.6 0.35" />
+        <Property key="TextAlign" value = "ALIGN_RIGHT ALIGN_BOTTOM" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH">
             <State name="normal" colour = "0.75 0.6 0.35"/>
             <State name="increased" colour = "0.757 0.679 0.539"/>
@@ -48,38 +47,38 @@
     <Skin name = "SandBrightText" size = "16 16">
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_LEFT ALIGN_BOTTOM" />
-        <Property key="Colour" value = "0.85 0.76 0.60" />
+        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_BOTTOM" />
+        <Property key="TextColour" value = "0.85 0.76 0.60" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
 
     <Skin name = "DaedricText" size = "16 16">
         <Property key="FontName" value = "daedric36" />
         <Property key="FontHeight" value = "36" />
-        <Property key="AlignText" value = "ALIGN_DEFAULT" />
-        <Property key="Colour" value = "1 1 1" />
+        <Property key="TextAlign" value = "ALIGN_DEFAULT" />
+        <Property key="TextColour" value = "1 1 1" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
 
     <Skin name = "DaedricText_orig" size = "16 16">
         <Property key="FontName" value = "daedric_orig36" />
         <Property key="FontHeight" value = "36" />
-        <Property key="AlignText" value = "ALIGN_DEFAULT" />
-        <Property key="Colour" value = "1 1 1" />
+        <Property key="TextAlign" value = "ALIGN_DEFAULT" />
+        <Property key="TextColour" value = "1 1 1" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
 
     <Skin name = "MW_StatName" size = "200 18">
-        <Child type="StaticText" skin="SandText" offset = "0 0 200 18" align = "ALIGN_LEFT ALIGN_HSTRETCH" name = "StatName" />
+        <Child type="TextBox" skin="SandText" offset = "0 0 200 18" align = "ALIGN_LEFT ALIGN_HSTRETCH" name = "StatName" />
     </Skin>
 
     <Skin name = "MW_StatNameC" size = "200 18">
-        <Child type="StaticTextC" skin="SandText" offset = "0 0 200 18" align = "LEFT HSTRETCH" name = "StatName" />
+        <Child type="TextBoxC" skin="SandText" offset = "0 0 200 18" align = "LEFT HSTRETCH" name = "StatName" />
     </Skin>
 
     <Skin name = "MW_StatNameValue" size = "200 18">
-        <Child type="StaticText" skin="SandText" offset = "0 0 160 18" align = "ALIGN_LEFT ALIGN_HSTRETCH" name = "StatName" />
-        <Child type="StaticText" skin="SandTextRight" offset = "160 0 40 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "StatValue" />
+        <Child type="TextBox" skin="SandText" offset = "0 0 160 18" align = "ALIGN_LEFT ALIGN_HSTRETCH" name = "StatName" />
+        <Child type="TextBox" skin="SandTextRight" offset = "160 0 40 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "StatValue" />
     </Skin>
 
     <Skin name = "MW_StatNameButtonC" size = "200 18">
@@ -96,25 +95,25 @@
     </Skin>
 
     <Skin name = "MW_EffectImage" size = "200 24">
-        <Child type="StaticImage" skin="StaticImage" offset = "4 4 16 16" align = "ALIGN_LEFT ALIGN_TOP" name = "Image" />
-        <Child type="StaticText" skin="SandText" offset = "24 0 176 20" align = "ALIGN_VCENTRE ALIGN_HSTRETCH" name = "Text" />
+        <Child type="ImageBox" skin="ImageBox" offset = "4 4 16 16" align = "ALIGN_LEFT ALIGN_TOP" name = "Image" />
+        <Child type="TextBox" skin="SandText" offset = "24 0 176 20" align = "ALIGN_VCENTRE ALIGN_HSTRETCH" name = "Text" />
     </Skin>
 
     <Skin name = "MW_DynamicStat_Red" size = "204 18">
-        <Child type="StaticText" skin="SandText" offset = "0 0 70 18" align = "ALIGN_LEFT ALIGN_TOP" name = "Text" />
-        <Child type="Progress" skin="MW_Progress_Red" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
-        <Child type="StaticText" skin="SandTextC" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "BarText" />
+        <Child type="TextBox" skin="SandText" offset = "0 0 70 18" align = "ALIGN_LEFT ALIGN_TOP" name = "Text" />
+        <Child type="ProgressBar" skin="MW_Progress_Red" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
+        <Child type="TextBox" skin="SandTextC" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "BarText" />
     </Skin>
 
     <Skin name = "MW_DynamicStat_Blue" size = "204 18">
-        <Child type="StaticText" skin="SandText" offset = "0 0 70 18" align = "ALIGN_LEFT ALIGN_TOP" name = "Text" />
-        <Child type="Progress" skin="MW_Progress_Blue" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
-        <Child type="StaticText" skin="SandTextC" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "BarText" />
+        <Child type="TextBox" skin="SandText" offset = "0 0 70 18" align = "ALIGN_LEFT ALIGN_TOP" name = "Text" />
+        <Child type="ProgressBar" skin="MW_Progress_Blue" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
+        <Child type="TextBox" skin="SandTextC" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "BarText" />
     </Skin>
 
     <Skin name = "MW_DynamicStat_Green" size = "204 18">
-        <Child type="StaticText" skin="SandText" offset = "0 0 70 18" align = "ALIGN_LEFT ALIGN_TOP" name = "Text" />
-        <Child type="Progress" skin="MW_Progress_Green" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
-        <Child type="StaticText" skin="SandTextC" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "BarText" />
+        <Child type="TextBox" skin="SandText" offset = "0 0 70 18" align = "ALIGN_LEFT ALIGN_TOP" name = "Text" />
+        <Child type="ProgressBar" skin="MW_Progress_Green" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
+        <Child type="TextBox" skin="SandTextC" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "BarText" />
     </Skin>
 </MyGUI>
diff --git a/files/mygui/openmw_text_input_layout.xml b/files/mygui/openmw_text_input_layout.xml
new file mode 100644
index 0000000000..6a7ad27f01
--- /dev/null
+++ b/files/mygui/openmw_text_input_layout.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 320 97" name="_Main">
+
+        <!-- Appearance -->
+        <Widget type="TextBox" skin="ProgressText" position="10 12 300 18" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
+            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+        </Widget>
+        <Widget type="EditBox" skin="MW_TextEdit" position="10 28 300 30" name="TextEdit" align="ALIGN_LEFT ALIGN_TOP"/>
+
+        <!-- Dialog buttons -->
+        <Widget type="Button" skin="MW_Button" position="264 60 42 23" name="OKButton">
+            <Property key="Caption" value="OK"/>
+        </Widget>
+    </Widget>
+</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_windows.skin.xml b/files/mygui/openmw_windows.skin.xml
similarity index 96%
rename from extern/mygui_3.0.1/openmw_resources/openmw_windows.skin.xml
rename to files/mygui/openmw_windows.skin.xml
index ae04eb3a99..ea8eb5330b 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_windows.skin.xml
+++ b/files/mygui/openmw_windows.skin.xml
@@ -197,8 +197,8 @@
         -->
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_CENTER" />
-        <Property key="Colour" value = "0.75 0.62 0.36" />
+        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <Property key="TextColour" value = "0.75 0.62 0.36" />
 
         <BasisSkin type="SubSkin" offset="0 0 88 20" align="ALIGN_STRETCH">
             <State name="normal" offset = "0 0 8 8"/>
@@ -223,9 +223,9 @@
     <Skin name = "MW_Window" size = "256 54">
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_CENTER" />
-        <Property key="Colour" value = "0.8 0.8 0.8" />
-        <Property key="ToStick" value = "true" />
+        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <Property key="TextColour" value = "0.8 0.8 0.8" />
+        <Property key="Snap" value = "true" />
 
         <Child type="Widget" skin="BlackBG" offset = "8 28 240 18" align = "ALIGN_STRETCH" name = "Client"/>
 
@@ -287,7 +287,7 @@
             <Property key="Scale" value = "1 1 0 0"/>
         </Child>
 
-        <Child type="Widget" skin="MW_Caption" offset = "80 4 88 20" align = "ALIGN_HCENTER ALIGN_TOP" name = "Caption">
+        <Child type="TextBox" skin="MW_Caption" offset = "80 4 88 20" align = "ALIGN_HCENTER ALIGN_TOP" name = "Caption">
         </Child>
 
         <!-- This invisible button makes it possible to move the
@@ -300,8 +300,8 @@
     <Skin name = "MW_Dialog" size = "256 54">
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
-        <Property key="AlignText" value = "ALIGN_CENTER" />
-        <Property key="Colour" value = "0.8 0.8 0.8" />
+        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <Property key="TextColour" value = "0.8 0.8 0.8" />
 
         <Child type="Widget" skin="DialogBG" offset = "4 4 248 46" align = "ALIGN_STRETCH" name = "Client"/>
 
diff --git a/extern/mygui_3.0.1/openmw_resources/smallbars.png b/files/mygui/smallbars.png
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/smallbars.png
rename to files/mygui/smallbars.png
diff --git a/files/mygui/test.skin b/files/mygui/test.skin
new file mode 100644
index 0000000000..5f198ab4a0
--- /dev/null
+++ b/files/mygui/test.skin
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI type="Resource" version="1.1">
+    <Resource type="ResourceSkin" name="Skin name 0" size="32 32" texture="">
+        <BasisSkin type="SubSkin" offset="0 0 32 32" align="Stretch">
+            <State name="normal" offset="0 0 32 32"/>
+        </BasisSkin>
+    </Resource>
+</MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/transparent.png b/files/mygui/transparent.png
similarity index 100%
rename from extern/mygui_3.0.1/openmw_resources/transparent.png
rename to files/mygui/transparent.png
diff --git a/libs/openengine/gui/events.cpp b/libs/openengine/gui/events.cpp
index 713db85858..3e52c6435d 100644
--- a/libs/openengine/gui/events.cpp
+++ b/libs/openengine/gui/events.cpp
@@ -11,8 +11,8 @@ EventInjector::EventInjector(MyGUI::Gui *g)
   : gui(g), mouseX(0), mouseY(0), enabled(true)
 {
   assert(gui);
-  maxX = gui->getViewSize().width;
-  maxY = gui->getViewSize().height;
+  maxX = MyGUI::RenderManager::getInstance().getViewSize().width;
+  maxY = MyGUI::RenderManager::getInstance().getViewSize().height;
 }
 
 template <typename X>
@@ -51,11 +51,11 @@ void EventInjector::event(Type type, int index, const void *p)
             is still pretty significant.)
           */
           MyGUI::Char text = (MyGUI::Char)key->text;
-          gui->injectKeyPress(code,text);
+          MyGUI::InputManager::getInstance().injectKeyPress(code,text);
         }
       else
         {
-          gui->injectKeyRelease(code);
+          MyGUI::InputManager::getInstance().injectKeyRelease(code);
         }
     }
   else if(type & EV_Mouse)
@@ -71,10 +71,10 @@ void EventInjector::event(Type type, int index, const void *p)
       setRange(mouseY,0,maxY);
 
       if(type == EV_MouseDown)
-        gui->injectMousePress(mouseX, mouseY, id);
+        MyGUI::InputManager::getInstance().injectMousePress(mouseX, mouseY, id);
       else if(type == EV_MouseUp)
-        gui->injectMouseRelease(mouseX, mouseY, id);
+        MyGUI::InputManager::getInstance().injectMouseRelease(mouseX, mouseY, id);
       else
-        gui->injectMouseMove(mouseX, mouseY, mouse->state.Z.abs);
+        MyGUI::InputManager::getInstance().injectMouseMove(mouseX, mouseY, mouse->state.Z.abs);
     }
 }
diff --git a/libs/openengine/gui/layout.hpp b/libs/openengine/gui/layout.hpp
index f02ddbdff1..3c03423c38 100644
--- a/libs/openengine/gui/layout.hpp
+++ b/libs/openengine/gui/layout.hpp
@@ -13,7 +13,7 @@ namespace GUI
   class Layout
   {
   public:
-    Layout(const std::string & _layout, MyGUI::WidgetPtr _parent = nullptr)
+    Layout(const std::string & _layout, MyGUI::Widget* _parent = nullptr)
       : mMainWidget(nullptr)
     { initialise(_layout, _parent); }
     virtual ~Layout() { shutdown();  }
@@ -25,7 +25,7 @@ namespace GUI
       for (MyGUI::VectorWidgetPtr::iterator iter=mListWindowRoot.begin();
            iter!=mListWindowRoot.end(); ++iter)
         {
-          MyGUI::WidgetPtr find = (*iter)->findWidget(mPrefix + _name);
+          MyGUI::Widget* find = (*iter)->findWidget(mPrefix + _name);
           if (nullptr != find)
             {
               T * cast = find->castType<T>(false);
@@ -44,7 +44,7 @@ namespace GUI
     }
 
     void initialise(const std::string & _layout,
-                    MyGUI::WidgetPtr _parent = nullptr)
+                    MyGUI::Widget* _parent = nullptr)
     {
       const std::string MAIN_WINDOW = "_Main";
       mLayoutName = _layout;
@@ -87,30 +87,30 @@ namespace GUI
 
     void setText(const std::string& name, const std::string& caption)
     {
-      MyGUI::WidgetPtr pt;
+      MyGUI::Widget* pt;
       getWidget(pt, name);
-      pt->setCaption(caption);
+      static_cast<MyGUI::TextBox*>(pt)->setCaption(caption);
     }
 
     void setTextColor(const std::string& name, float r, float g, float b)
     {
-      MyGUI::WidgetPtr pt;
+      MyGUI::Widget* pt;
       getWidget(pt, name);
-      MyGUI::StaticText *st = dynamic_cast<MyGUI::StaticText*>(pt);
+      MyGUI::TextBox *st = dynamic_cast<MyGUI::TextBox*>(pt);
       if(st != NULL)
         st->setTextColour(MyGUI::Colour(b,g,r));
     }
 
     void setImage(const std::string& name, const std::string& imgName)
     {
-      MyGUI::StaticImagePtr pt;
+      MyGUI::ImageBox* pt;
       getWidget(pt, name);
       pt->setImageTexture(imgName);
     }
 
   protected:
 
-    MyGUI::WidgetPtr mMainWidget;
+    MyGUI::Widget* mMainWidget;
     std::string mPrefix;
     std::string mLayoutName;
     MyGUI::VectorWidgetPtr mListWindowRoot;
diff --git a/libs/openengine/gui/manager.cpp b/libs/openengine/gui/manager.cpp
index b606d7d16f..2d84ac8045 100644
--- a/libs/openengine/gui/manager.cpp
+++ b/libs/openengine/gui/manager.cpp
@@ -18,8 +18,7 @@ void MyGUIManager::setup(Ogre::RenderWindow *wnd, Ogre::SceneManager *mgr, bool
   // manager before the main gui system itself, otherwise the main
   // object will get the chance to spit out a few messages before we
   // can able to disable it.
-  LogManager::initialise();
-  LogManager::setSTDOutputEnabled(logging);
+  /// \todo - can't avoid this with MyGUI 3.2?
 
   std::string theLogFile = std::string(MYGUI_PLATFORM_LOG_FILENAME);
   if(!logDir.empty())
@@ -29,9 +28,11 @@ void MyGUIManager::setup(Ogre::RenderWindow *wnd, Ogre::SceneManager *mgr, bool
   mPlatform = new OgrePlatform();
   mPlatform->initialise(wnd, mgr, "General", theLogFile);
 
+  LogManager::getInstance().setSTDOutputEnabled(logging);
+
   // Create GUI
   mGui = new Gui();
-  mGui->initialise("core.xml", theLogFile);
+  mGui->initialise("core.xml");
 }
 
 void MyGUIManager::shutdown()