diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-18 01:12:45 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-18 22:05:06 +0300 |
| commit | f24b4360e73d45bc0830d2964c06e295890e5f18 (patch) | |
| tree | 6ce4f8440b22ec665aa94403643c6cb0df1b47f0 /src/gui/widgets/button.cpp | |
| parent | 14a0a04b2bb3928f7429fd748dd40e1843fca571 (diff) | |
| download | plus-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.gz plus-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.bz2 plus-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.xz plus-f24b4360e73d45bc0830d2964c06e295890e5f18.zip | |
derive Widget from Widget2.
Diffstat (limited to 'src/gui/widgets/button.cpp')
| -rw-r--r-- | src/gui/widgets/button.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
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), |