diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp index 9efa30e20..e9c15fab4 100644 --- a/apps/openmw/mwgui/birth.cpp +++ b/apps/openmw/mwgui/birth.cpp @@ -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; diff --git a/apps/openmw/mwgui/birth.hpp b/apps/openmw/mwgui/birth.hpp index 0280d8fb3..b5f7db774 100644 --- a/apps/openmw/mwgui/birth.hpp +++ b/apps/openmw/mwgui/birth.hpp @@ -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,7 +49,7 @@ namespace MWGui void updateBirths(); void updateSpells(); - MyGUI::ListPtr birthList; + MyGUI::ListBox* birthList; MyGUI::WidgetPtr spellArea; MyGUI::ImageBox* birthImage; std::vector spellItems; diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp index 4d2f212fd..75e534b42 100644 --- a/apps/openmw/mwgui/class.cpp +++ b/apps/openmw/mwgui/class.cpp @@ -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; diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp index eb0a52db0..0e3348086 100644 --- a/apps/openmw/mwgui/class.hpp +++ b/apps/openmw/mwgui/class.hpp @@ -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); @@ -126,7 +126,7 @@ namespace MWGui void updateStats(); MyGUI::ImageBox* classImage; - MyGUI::ListPtr classList; + MyGUI::ListBox* classList; MyGUI::TextBox* specializationName; Widgets::MWAttributePtr favoriteAttribute[2]; Widgets::MWSkillPtr majorSkill[5]; diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 64336cfe0..d6c4ce4e5 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -106,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 54af83ff7..b80a016cb 100644 --- a/apps/openmw/mwgui/dialogue.hpp +++ b/apps/openmw/mwgui/dialogue.hpp @@ -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); @@ -61,7 +61,7 @@ namespace MWGui std::string parseText(std::string text); DialogueHistory* history; - MyGUI::ListPtr topicsList; + MyGUI::ListBox* topicsList; MyGUI::ProgressPtr pDispositionBar; MyGUI::EditPtr pDispositionText; std::map pTopicsText;// this map links keyword and "real" text. diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp index e2f607282..880c0bc52 100644 --- a/apps/openmw/mwgui/race.cpp +++ b/apps/openmw/mwgui/race.cpp @@ -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 0af173c3c..bcd3b5185 100644 --- a/apps/openmw/mwgui/race.hpp +++ b/apps/openmw/mwgui/race.hpp @@ -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,7 +76,7 @@ namespace MWGui void updateSpellPowers(); MyGUI::CanvasPtr appearanceBox; - MyGUI::ListPtr raceList; + MyGUI::ListBox* raceList; MyGUI::ScrollBar* headRotate; MyGUI::WidgetPtr skillList; diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_birth_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_birth_layout.xml index f453dfe58..bce3f585d 100644 --- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_birth_layout.xml +++ b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_birth_layout.xml @@ -2,7 +2,7 @@ - + diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_layout.xml index c29a49046..5f2751728 100644 --- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_layout.xml +++ b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_layout.xml @@ -3,7 +3,7 @@ - + diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml index 65a4e4d04..168eee5b8 100644 --- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml +++ b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml @@ -40,7 +40,7 @@ - + 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 c545d7720..3ef376716 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 @@ -25,7 +25,7 @@ - +