From 213a21e4c079113e5822d2cf90802d6dcb2cb232 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 19 Oct 2012 21:02:14 +0300 Subject: In all controls, call Widget2 methods to get colors. --- src/gui/widgets/button.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/gui/widgets/button.cpp') diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 2ea528a8e..9b0f0578f 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -66,6 +66,7 @@ Skin *Button::button[BUTTON_COUNT]; Button::Button() : gcn::Button(), + Widget2(), gcn::WidgetListener(), mDescription(""), mClickCount(0), mTag(0), @@ -88,6 +89,7 @@ Button::Button() : Button::Button(const std::string &caption, const std::string &actionEventId, gcn::ActionListener *const listener) : gcn::Button(caption), + Widget2(), gcn::WidgetListener(), mDescription(""), mClickCount(0), @@ -117,6 +119,7 @@ Button::Button(const std::string &caption, const std::string &imageName, const std::string &actionEventId, gcn::ActionListener *const listener) : gcn::Button(caption), + Widget2(), gcn::WidgetListener(), mDescription(""), mClickCount(0), @@ -192,10 +195,10 @@ void Button::init() updateAlpha(); } - mEnabledColor = Theme::getThemeColor(Theme::BUTTON); - mDisabledColor = Theme::getThemeColor(Theme::BUTTON_DISABLED); - mHighlightedColor = Theme::getThemeColor(Theme::BUTTON_HIGHLIGHTED); - mPressedColor = Theme::getThemeColor(Theme::BUTTON_PRESSED); + mEnabledColor = getThemeColor(Theme::BUTTON); + mDisabledColor = getThemeColor(Theme::BUTTON_DISABLED); + mHighlightedColor = getThemeColor(Theme::BUTTON_HIGHLIGHTED); + mPressedColor = getThemeColor(Theme::BUTTON_PRESSED); mInstances++; } -- cgit v1.2.3-60-g2f50