diff --git a/apps/openmw/mwgui/countdialog.cpp b/apps/openmw/mwgui/countdialog.cpp index 43c5bfe5da..db34b082e0 100644 --- a/apps/openmw/mwgui/countdialog.cpp +++ b/apps/openmw/mwgui/countdialog.cpp @@ -5,7 +5,6 @@ #include #include -#include #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" diff --git a/apps/openmw/mwgui/countdialog.hpp b/apps/openmw/mwgui/countdialog.hpp index 8f0bbc7caf..0b1e53d167 100644 --- a/apps/openmw/mwgui/countdialog.hpp +++ b/apps/openmw/mwgui/countdialog.hpp @@ -6,7 +6,6 @@ namespace Gui { class NumericEditBox; - class ScrollBar; } namespace MWGui @@ -24,7 +23,7 @@ namespace MWGui MyGUI::delegates::MultiDelegate eventOkClicked; private: - Gui::ScrollBar* mSlider; + MyGUI::ScrollBar* mSlider; Gui::NumericEditBox* mItemEdit; MyGUI::TextBox* mItemText; MyGUI::TextBox* mLabelText; diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp index e31f31c8be..f1843fb4d7 100644 --- a/apps/openmw/mwgui/race.cpp +++ b/apps/openmw/mwgui/race.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp index 1f6400e5b2..0b00de40c0 100644 --- a/apps/openmw/mwgui/race.hpp +++ b/apps/openmw/mwgui/race.hpp @@ -25,11 +25,6 @@ namespace Resource class ResourceSystem; } -namespace Gui -{ - class ScrollBar; -} - namespace MWGui { class RaceDialog : public WindowModal @@ -105,7 +100,7 @@ namespace MWGui MyGUI::ImageBox* mPreviewImage; MyGUI::ListBox* mRaceList; - Gui::ScrollBar* mHeadRotate; + MyGUI::ScrollBar* mHeadRotate; MyGUI::Button* mBackButton; MyGUI::Button* mOkButton; diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp index 49a71801aa..190793b77a 100644 --- a/apps/openmw/mwgui/spellcreationdialog.cpp +++ b/apps/openmw/mwgui/spellcreationdialog.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include diff --git a/apps/openmw/mwgui/spellcreationdialog.hpp b/apps/openmw/mwgui/spellcreationdialog.hpp index 35e3fb2eb2..f4624c89b3 100644 --- a/apps/openmw/mwgui/spellcreationdialog.hpp +++ b/apps/openmw/mwgui/spellcreationdialog.hpp @@ -13,7 +13,6 @@ namespace Gui { class MWList; - class ScrollBar; } namespace MWGui @@ -59,10 +58,10 @@ namespace MWGui MyGUI::TextBox* mDurationValue; MyGUI::TextBox* mAreaValue; - Gui::ScrollBar* mMagnitudeMinSlider; - Gui::ScrollBar* mMagnitudeMaxSlider; - Gui::ScrollBar* mDurationSlider; - Gui::ScrollBar* mAreaSlider; + MyGUI::ScrollBar* mMagnitudeMinSlider; + MyGUI::ScrollBar* mMagnitudeMaxSlider; + MyGUI::ScrollBar* mDurationSlider; + MyGUI::ScrollBar* mAreaSlider; MyGUI::TextBox* mAreaText; diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp index 0a4d4a6ffc..0943863a69 100644 --- a/apps/openmw/mwgui/waitdialog.cpp +++ b/apps/openmw/mwgui/waitdialog.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include "../mwbase/environment.hpp" #include "../mwbase/mechanicsmanager.hpp" diff --git a/apps/openmw/mwgui/waitdialog.hpp b/apps/openmw/mwgui/waitdialog.hpp index c3dc45587c..19d7752946 100644 --- a/apps/openmw/mwgui/waitdialog.hpp +++ b/apps/openmw/mwgui/waitdialog.hpp @@ -5,11 +5,6 @@ #include "windowbase.hpp" #include -namespace Gui -{ - class ScrollBar; -} - namespace MWGui { @@ -60,7 +55,7 @@ namespace MWGui MyGUI::Button* mUntilHealedButton; MyGUI::Button* mWaitButton; MyGUI::Button* mCancelButton; - Gui::ScrollBar* mHourSlider; + MyGUI::ScrollBar* mHourSlider; TimeAdvancer mTimeAdvancer; bool mSleeping; diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 184da4da25..8a3325ea71 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -354,7 +354,7 @@ add_component_dir (myguiplatform ) add_component_dir (widgets - box fontwrapper imagebutton tags list numericeditbox scrollbar sharedstatebutton windowcaption widgets + box fontwrapper imagebutton tags list numericeditbox sharedstatebutton windowcaption widgets ) add_component_dir (fontloader diff --git a/components/widgets/scrollbar.cpp b/components/widgets/scrollbar.cpp deleted file mode 100644 index 0384003e65..0000000000 --- a/components/widgets/scrollbar.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "scrollbar.hpp" - -#include - -namespace Gui -{ - std::vector ScrollBar::getAllWidgets() - { - std::vector widgets; - widgets.push_back(mWidgetStart); - widgets.push_back(mWidgetEnd); - widgets.push_back(mWidgetTrack); - widgets.push_back(mWidgetFirstPart); - widgets.push_back(mWidgetSecondPart); - return widgets; - } -} diff --git a/components/widgets/scrollbar.hpp b/components/widgets/scrollbar.hpp deleted file mode 100644 index fa4cee01f0..0000000000 --- a/components/widgets/scrollbar.hpp +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef OPENMW_COMPONENTS_WIDGETS_SCROLLBAR_H -#define OPENMW_COMPONENTS_WIDGETS_SCROLLBAR_H - -#include - -namespace Gui -{ - /// @brief A scrollbar that can return all its widgets for binding hover listeners. - class ScrollBar : public MyGUI::ScrollBar - { - MYGUI_RTTI_DERIVED(ScrollBar) - - public: - std::vector getAllWidgets(); - }; -} - -#endif diff --git a/components/widgets/widgets.cpp b/components/widgets/widgets.cpp index 58b5736b30..d27d7e5fc9 100644 --- a/components/widgets/widgets.cpp +++ b/components/widgets/widgets.cpp @@ -6,7 +6,6 @@ #include "imagebutton.hpp" #include "list.hpp" #include "numericeditbox.hpp" -#include "scrollbar.hpp" #include "sharedstatebutton.hpp" #include "windowcaption.hpp" @@ -27,7 +26,6 @@ namespace Gui MyGUI::FactoryManager::getInstance().registerFactory("Widget"); MyGUI::FactoryManager::getInstance().registerFactory("Widget"); MyGUI::FactoryManager::getInstance().registerFactory("Widget"); - MyGUI::FactoryManager::getInstance().registerFactory("Widget"); MyGUI::FactoryManager::getInstance().registerFactory("Widget"); MyGUI::FactoryManager::getInstance().registerFactory("Widget"); }