diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp index 299ff93b5..54af83ff7 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; @@ -60,7 +60,7 @@ namespace MWGui */ std::string parseText(std::string text); - DialogeHistory* history; + DialogueHistory* history; MyGUI::ListPtr topicsList; MyGUI::ProgressPtr pDispositionBar; MyGUI::EditPtr pDispositionText; diff --git a/apps/openmw/mwgui/dialogue_history.cpp b/apps/openmw/mwgui/dialogue_history.cpp index acd55efa8..cd34ee119 100644 --- a/apps/openmw/mwgui/dialogue_history.cpp +++ b/apps/openmw/mwgui/dialogue_history.cpp @@ -13,7 +13,7 @@ using namespace MWGui; using namespace Widgets; -UString DialogeHistory::getColorAtPos(size_t _pos) +UString DialogueHistory::getColorAtPos(size_t _pos) { UString colour = TextIterator::convertTagColour(getTextColour()); TextIterator iterator(getCaption()); @@ -29,7 +29,7 @@ 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(getTextColour()); @@ -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 aa4aa1c7c..12a9c53e7 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::EditBox + 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/window_manager.cpp b/apps/openmw/mwgui/window_manager.cpp index db56b1c1c..8ac4b11d7 100644 --- a/apps/openmw/mwgui/window_manager.cpp +++ b/apps/openmw/mwgui/window_manager.cpp @@ -37,7 +37,7 @@ WindowManager::WindowManager(MWWorld::Environment& environment, gui = mGuiManager->getGui(); //Register own widgets with MyGUI - MyGUI::FactoryManager::getInstance().registerFactory("Widget"); + MyGUI::FactoryManager::getInstance().registerFactory("Widget"); // Get size info from the Gui object assert(gui); 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 index 3a0556e01..c545d7720 100644 --- 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 @@ -9,7 +9,7 @@ - +