diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-10-17 20:37:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-10-17 21:17:12 +0300 |
| commit | 5eeef71adcafe98dade6cc9d0c47a5260528592d (patch) | |
| tree | 30ca22dab5e97016f64fc8bda2583b3e2b037f4b | |
| parent | 9d5edb66388911525652534a08b5db4968b6c555 (diff) | |
| download | plus-5eeef71adcafe98dade6cc9d0c47a5260528592d.tar.gz plus-5eeef71adcafe98dade6cc9d0c47a5260528592d.tar.bz2 plus-5eeef71adcafe98dade6cc9d0c47a5260528592d.tar.xz plus-5eeef71adcafe98dade6cc9d0c47a5260528592d.zip | |
Fix button defenition in button class.
| -rw-r--r-- | src/gui/widgets/button.cpp | 11 | ||||
| -rw-r--r-- | src/gui/widgets/button.h | 13 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 73aa63d34..f8ae3e65c 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -37,16 +37,7 @@ int Button::mInstances = 0; float Button::mAlpha = 1.0; -enum -{ - BUTTON_STANDARD = 0, // 0 - BUTTON_HIGHLIGHTED, // 1 - BUTTON_PRESSED, // 2 - BUTTON_DISABLED, // 3 - BUTTON_COUNT // 4 - Must be last. -}; - -static std::string const data[BUTTON_COUNT] = +static std::string const data[Button::BUTTON_COUNT] = { "button.xml", "button_highlighted.xml", diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index aa951ff7e..2ba91822b 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -135,11 +135,20 @@ class Button final : public gcn::Button, bool isPressed2() const A_WARN_UNUSED; + enum + { + BUTTON_STANDARD = 0, // 0 + BUTTON_HIGHLIGHTED, // 1 + BUTTON_PRESSED, // 2 + BUTTON_DISABLED, // 3 + BUTTON_COUNT // 4 - Must be last. + }; + private: void init(); - static Skin *button[4]; /**< Button state graphics */ - static int mInstances; /**< Number of button instances */ + static Skin *button[BUTTON_COUNT]; /**< Button state graphics */ + static int mInstances; /**< Number of button instances */ static float mAlpha; std::string mDescription; |