diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-07-29 00:06:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-07-29 00:06:07 +0300 |
| commit | 8e7abb562861d53f9aa0a4fb0ebae52adaeb17e5 (patch) | |
| tree | e699cf343a6c18e7a4c71afde28dd46e85d4bd35 /src/gui/widgets/button.cpp | |
| parent | b14dd921c74c1543d1cd75602d6666f32df518ca (diff) | |
| download | plus-8e7abb562861d53f9aa0a4fb0ebae52adaeb17e5.tar.gz plus-8e7abb562861d53f9aa0a4fb0ebae52adaeb17e5.tar.bz2 plus-8e7abb562861d53f9aa0a4fb0ebae52adaeb17e5.tar.xz plus-8e7abb562861d53f9aa0a4fb0ebae52adaeb17e5.zip | |
move bools in button.
Diffstat (limited to 'src/gui/widgets/button.cpp')
| -rw-r--r-- | src/gui/widgets/button.cpp | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 42fb754e6..ae6886e72 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -63,13 +63,8 @@ Button::Button(const Widget2 *const widget) : gcn::Button(), Widget2(widget), gcn::WidgetListener(), - mDescription(""), mClickCount(0), - mTag(0), + mDescription(), mVertexes2(new ImageCollection), - mRedraw(true), - mMode(0), - mXOffset(0), - mYOffset(0), mEnabledColor(getThemeColor(Theme::BUTTON)), mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)), mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)), @@ -80,8 +75,14 @@ Button::Button(const Widget2 *const widget) : mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), + mClickCount(0), + mTag(0), + mMode(0), + mXOffset(0), + mYOffset(0), mImageWidth(0), mImageHeight(0), + mRedraw(true), mStick(false), mPressed(false) { @@ -95,14 +96,8 @@ Button::Button(const Widget2 *const widget, gcn::Button(caption), Widget2(widget), gcn::WidgetListener(), - mDescription(""), - mClickCount(0), - mTag(0), + mDescription(), mVertexes2(new ImageCollection), - mRedraw(true), - mMode(0), - mXOffset(0), - mYOffset(0), mEnabledColor(getThemeColor(Theme::BUTTON)), mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)), mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)), @@ -113,8 +108,14 @@ Button::Button(const Widget2 *const widget, mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), + mClickCount(0), + mTag(0), + mMode(0), + mXOffset(0), + mYOffset(0), mImageWidth(0), mImageHeight(0), + mRedraw(true), mStick(false), mPressed(false) { @@ -134,14 +135,8 @@ Button::Button(const Widget2 *const widget, gcn::Button(caption), Widget2(widget), gcn::WidgetListener(), - mDescription(""), - mClickCount(0), - mTag(0), + mDescription(), mVertexes2(new ImageCollection), - mRedraw(true), - mMode(0), - mXOffset(0), - mYOffset(0), mEnabledColor(getThemeColor(Theme::BUTTON)), mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)), mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)), @@ -152,8 +147,14 @@ Button::Button(const Widget2 *const widget, mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), + mClickCount(0), + mTag(0), + mMode(0), + mXOffset(0), + mYOffset(0), mImageWidth(imageWidth), mImageHeight(imageHeight), + mRedraw(true), mStick(false), mPressed(false) { @@ -170,17 +171,11 @@ Button::Button(const Widget2 *const widget, const std::string &imageName, const int imageWidth, const int imageHeight, const std::string &actionEventId, gcn::ActionListener *const listener) : - gcn::Button(""), + gcn::Button(), Widget2(widget), gcn::WidgetListener(), - mDescription(""), - mClickCount(0), - mTag(0), + mDescription(), mVertexes2(new ImageCollection), - mRedraw(true), - mMode(0), - mXOffset(0), - mYOffset(0), mEnabledColor(getThemeColor(Theme::BUTTON)), mEnabledColor2(getThemeColor(Theme::BUTTON_OUTLINE)), mDisabledColor(getThemeColor(Theme::BUTTON_DISABLED)), @@ -191,8 +186,14 @@ Button::Button(const Widget2 *const widget, const std::string &imageName, mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), + mClickCount(0), + mTag(0), + mMode(0), + mXOffset(0), + mYOffset(0), mImageWidth(imageWidth), mImageHeight(imageHeight), + mRedraw(true), mStick(false), mPressed(false) { |