summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-19 12:18:42 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-19 15:12:22 +0300
commit589e377f6159268bb3a3ec072ffce30ce4ad5422 (patch)
tree72fb96fa24a9eb08557eb1b26334b73fc8149e71
parentad1e0ec0584eebabbeac7473baba956e957101b5 (diff)
downloadmv-589e377f6159268bb3a3ec072ffce30ce4ad5422.tar.gz
mv-589e377f6159268bb3a3ec072ffce30ce4ad5422.tar.bz2
mv-589e377f6159268bb3a3ec072ffce30ce4ad5422.tar.xz
mv-589e377f6159268bb3a3ec072ffce30ce4ad5422.zip
fix definition in tab.
-rw-r--r--src/gui/widgets/tabs/tab.cpp13
-rw-r--r--src/gui/widgets/tabs/tab.h13
2 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index 733d030d2..1f09f28fd 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -33,16 +33,7 @@
int Tab::mInstances = 0;
float Tab::mAlpha = 1.0;
-enum
-{
- TAB_STANDARD = 0, // 0
- TAB_HIGHLIGHTED, // 1
- TAB_SELECTED, // 2
- TAB_UNUSED, // 3
- TAB_COUNT // 4 - Must be last.
-};
-
-static std::string const data[TAB_COUNT] =
+static std::string const data[Tab::TAB_COUNT] =
{
"tab.xml",
"tab_highlighted.xml",
@@ -50,7 +41,7 @@ static std::string const data[TAB_COUNT] =
"tab_unused.xml"
};
-Skin *Tab::tabImg[TAB_COUNT];
+Skin *Tab::tabImg[Tab::TAB_COUNT];
Tab::Tab(const Widget2 *const widget) :
gcn::BasicContainer(),
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index 6106ccb29..1c5f349e4 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -51,6 +51,15 @@ class Tab : public gcn::BasicContainer,
virtual ~Tab();
+ enum
+ {
+ TAB_STANDARD = 0,
+ TAB_HIGHLIGHTED = 1,
+ TAB_SELECTED = 2,
+ TAB_UNUSED = 3,
+ TAB_COUNT = 4 // Must be last
+ };
+
/**
* Update the alpha value to the graphic components.
*/
@@ -160,8 +169,8 @@ class Tab : public gcn::BasicContainer,
/** Load images if no other instances exist yet */
void init();
- static Skin *tabImg[4]; /**< Tab state graphics */
- static int mInstances; /**< Number of tab instances */
+ static Skin *tabImg[TAB_COUNT]; /**< Tab state graphics */
+ static int mInstances; /**< Number of tab instances */
static float mAlpha;
const gcn::Color *mTabColor;