diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-10 15:37:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-10 15:37:27 +0300 |
| commit | b2f23e4a4f57a88ee4872d1f5af4cf97ed0d9bed (patch) | |
| tree | fe270dd4eec62bd6973d5e21d6662f78cc93b24c /src/gui/widgets/button.cpp | |
| parent | 66b6d8d740670a6053d0714ed63776119f7e13c3 (diff) | |
| download | manaplus-b2f23e4a4f57a88ee4872d1f5af4cf97ed0d9bed.tar.gz manaplus-b2f23e4a4f57a88ee4872d1f5af4cf97ed0d9bed.tar.bz2 manaplus-b2f23e4a4f57a88ee4872d1f5af4cf97ed0d9bed.tar.xz manaplus-b2f23e4a4f57a88ee4872d1f5af4cf97ed0d9bed.zip | |
Sort varibles in button and remove some unused functions.
Diffstat (limited to 'src/gui/widgets/button.cpp')
| -rw-r--r-- | src/gui/widgets/button.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 1d3d4427b..6fe3e9bc2 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -105,11 +105,6 @@ Button::Button(const Widget2 *const widget) : FocusListener(), WidgetListener(), mCaption(), - mHasMouse(false), - mKeyPressed(false), - mMousePressed(false), - mAlignment(Graphics::CENTER), - mSpacing(4), mDescription(), mVertexes2(new ImageCollection), mEnabledColor(getThemeColor(Theme::BUTTON)), @@ -122,13 +117,18 @@ Button::Button(const Widget2 *const widget) : mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), + mAlignment(Graphics::CENTER), mClickCount(0), + mSpacing(4), mTag(0), mMode(0), mXOffset(0), mYOffset(0), mImageWidth(0), mImageHeight(0), + mHasMouse(false), + mKeyPressed(false), + mMousePressed(false), mStick(false), mPressed(false) { @@ -146,11 +146,6 @@ Button::Button(const Widget2 *const widget, FocusListener(), WidgetListener(), mCaption(caption), - mHasMouse(false), - mKeyPressed(false), - mMousePressed(false), - mAlignment(Graphics::CENTER), - mSpacing(4), mDescription(), mVertexes2(new ImageCollection), mEnabledColor(getThemeColor(Theme::BUTTON)), @@ -163,13 +158,18 @@ Button::Button(const Widget2 *const widget, mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), + mAlignment(Graphics::CENTER), mClickCount(0), + mSpacing(4), mTag(0), mMode(0), mXOffset(0), mYOffset(0), mImageWidth(0), mImageHeight(0), + mHasMouse(false), + mKeyPressed(false), + mMousePressed(false), mStick(false), mPressed(false) { @@ -193,11 +193,6 @@ Button::Button(const Widget2 *const widget, FocusListener(), WidgetListener(), mCaption(caption), - mHasMouse(false), - mKeyPressed(false), - mMousePressed(false), - mAlignment(Graphics::CENTER), - mSpacing(4), mDescription(), mVertexes2(new ImageCollection), mEnabledColor(getThemeColor(Theme::BUTTON)), @@ -210,13 +205,18 @@ Button::Button(const Widget2 *const widget, mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), + mAlignment(Graphics::CENTER), mClickCount(0), + mSpacing(4), mTag(0), mMode(0), mXOffset(0), mYOffset(0), mImageWidth(imageWidth), mImageHeight(imageHeight), + mHasMouse(false), + mKeyPressed(false), + mMousePressed(false), mStick(false), mPressed(false) { @@ -240,11 +240,6 @@ Button::Button(const Widget2 *const widget, FocusListener(), WidgetListener(), mCaption(), - mHasMouse(false), - mKeyPressed(false), - mMousePressed(false), - mAlignment(Graphics::CENTER), - mSpacing(4), mDescription(), mVertexes2(new ImageCollection), mEnabledColor(getThemeColor(Theme::BUTTON)), @@ -257,13 +252,18 @@ Button::Button(const Widget2 *const widget, mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), + mAlignment(Graphics::CENTER), mClickCount(0), + mSpacing(4), mTag(0), mMode(0), mXOffset(0), mYOffset(0), mImageWidth(imageWidth), mImageHeight(imageHeight), + mHasMouse(false), + mKeyPressed(false), + mMousePressed(false), mStick(false), mPressed(false) { @@ -287,11 +287,6 @@ Button::Button(const Widget2 *const widget, FocusListener(), WidgetListener(), mCaption(caption), - mHasMouse(false), - mKeyPressed(false), - mMousePressed(false), - mAlignment(Graphics::CENTER), - mSpacing(4), mDescription(), mVertexes2(new ImageCollection), mEnabledColor(getThemeColor(Theme::BUTTON)), @@ -304,13 +299,18 @@ Button::Button(const Widget2 *const widget, mPressedColor2(getThemeColor(Theme::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), mImageSet(nullptr), + mAlignment(Graphics::CENTER), mClickCount(0), + mSpacing(4), mTag(0), mMode(0), mXOffset(0), mYOffset(0), mImageWidth(0), mImageHeight(0), + mHasMouse(false), + mKeyPressed(false), + mMousePressed(false), mStick(false), mPressed(false) { |