From f24b4360e73d45bc0830d2964c06e295890e5f18 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 18 Feb 2014 01:12:45 +0300
Subject: derive Widget from Widget2.

---
 src/gui/widgets/button.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/gui/widgets/button.cpp')

diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 5d27af68a..a9b621d90 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -49,8 +49,7 @@ static std::string const data[Button::BUTTON_COUNT] =
 Skin *Button::button[BUTTON_COUNT];
 
 Button::Button(const Widget2 *const widget) :
-    gcn::Button(),
-    Widget2(widget),
+    gcn::Button(widget),
     WidgetListener(),
     mDescription(),
     mVertexes2(new ImageCollection),
@@ -83,8 +82,7 @@ Button::Button(const Widget2 *const widget,
                const std::string &restrict caption,
                const std::string &restrict actionEventId,
                ActionListener *const listener) :
-    gcn::Button(caption),
-    Widget2(widget),
+    gcn::Button(widget, caption),
     WidgetListener(),
     mDescription(),
     mVertexes2(new ImageCollection),
@@ -123,8 +121,7 @@ Button::Button(const Widget2 *const widget,
                const int imageWidth, const int imageHeight,
                const std::string &restrict actionEventId,
                ActionListener *const listener) :
-    gcn::Button(caption),
-    Widget2(widget),
+    gcn::Button(widget, caption),
     WidgetListener(),
     mDescription(),
     mVertexes2(new ImageCollection),
@@ -163,8 +160,7 @@ Button::Button(const Widget2 *const widget,
                const int imageWidth, const int imageHeight,
                const std::string &restrict actionEventId,
                ActionListener *const listener) :
-    gcn::Button(),
-    Widget2(widget),
+    gcn::Button(widget),
     WidgetListener(),
     mDescription(),
     mVertexes2(new ImageCollection),
@@ -203,8 +199,7 @@ Button::Button(const Widget2 *const widget,
                const std::string &restrict imageName,
                const std::string &restrict actionEventId,
                ActionListener *const listener) :
-    gcn::Button(caption),
-    Widget2(widget),
+    gcn::Button(widget, caption),
     WidgetListener(),
     mDescription(),
     mVertexes2(new ImageCollection),
-- 
cgit v1.2.3-70-g09d2