diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-09-28 18:04:21 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-09-28 18:04:21 +0200 |
| commit | 19c6b66f41396dc1a06ea17ab70f27a4f8802ade (patch) | |
| tree | a3bab638909d00dc06cfac36d599a984141aff8d | |
| parent | 490b0da7da368a64d9e9e4b9379f738a23d8f091 (diff) | |
| download | mana-19c6b66f41396dc1a06ea17ab70f27a4f8802ade.tar.gz mana-19c6b66f41396dc1a06ea17ab70f27a4f8802ade.tar.bz2 mana-19c6b66f41396dc1a06ea17ab70f27a4f8802ade.tar.xz mana-19c6b66f41396dc1a06ea17ab70f27a4f8802ade.zip | |
Small changes requested by o11c - part 1.
| -rw-r--r-- | src/gui/widgets/button.cpp | 5 | ||||
| -rw-r--r-- | src/gui/widgets/button.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 61ec28a2..f0d7e022 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -37,8 +37,8 @@ int Button::mInstances = 0; float Button::mAlpha = 1.0; -ImageRect* Button::mButton; -TextPopup* Button::mTextPopup = 0; +ImageRect *Button::mButton; +TextPopup *Button::mTextPopup = 0; enum{ BUTTON_STANDARD, // 0 @@ -188,6 +188,7 @@ Button::~Button() // Remove the popup delete mTextPopup; + mTextPopup = 0; } removeButtonIcon(); } diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index 7463d2ad..94d550e9 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -96,7 +96,11 @@ class Button : public gcn::Button Image** mButtonIcon; /**< Button Icons graphics */ - static TextPopup* mTextPopup; /**< The buttons popup */ + /** + * The buttons popup + * @note: This is a global object. One for all the buttons. + */ + static TextPopup* mTextPopup; std::string mPopupText; /**< the current button text */ }; |