diff options
| author | Chuck Miller <shadowmil@gmail.com> | 2009-05-11 21:39:29 -0400 |
|---|---|---|
| committer | Chuck Miller <shadowmil@gmail.com> | 2009-05-11 21:39:29 -0400 |
| commit | 260e22a429311e597e91e2d9a149c8fdbf5df5b3 (patch) | |
| tree | dc35a88b84f9858a167e34769a8e8111f47ebc7d /src/gui/widgets/tab.cpp | |
| parent | 6f501e2f687df1550dfc024f7ac5d36a5b88d548 (diff) | |
| parent | eac0ebd493f6be170c8caa8df21ae147b1486d50 (diff) | |
| download | mana-client-260e22a429311e597e91e2d9a149c8fdbf5df5b3.tar.gz mana-client-260e22a429311e597e91e2d9a149c8fdbf5df5b3.tar.bz2 mana-client-260e22a429311e597e91e2d9a149c8fdbf5df5b3.tar.xz mana-client-260e22a429311e597e91e2d9a149c8fdbf5df5b3.zip | |
Merge branch 'master' of git://gitorious.org/tmw/mainline
Diffstat (limited to 'src/gui/widgets/tab.cpp')
| -rw-r--r-- | src/gui/widgets/tab.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index c98ecee4..f2231fca 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -63,7 +63,7 @@ static TabData const data[TAB_COUNT] = { ImageRect Tab::tabImg[TAB_COUNT]; Tab::Tab() : gcn::Tab(), - mTabColor(guiPalette->getColor(Palette::TEXT)) + mTabColor(&guiPalette->getColor(Palette::TEXT)) { init(); } @@ -127,7 +127,7 @@ void Tab::draw(gcn::Graphics *graphics) { mode = TAB_SELECTED; // if tab is selected, it doesnt need to highlight activity - mLabel->setForegroundColor(mTabColor); + mLabel->setForegroundColor(*mTabColor); mHighlighted = false; } else if (mHighlighted) @@ -137,7 +137,7 @@ void Tab::draw(gcn::Graphics *graphics) } else { - mLabel->setForegroundColor(mTabColor); + mLabel->setForegroundColor(*mTabColor); } } @@ -163,7 +163,7 @@ void Tab::draw(gcn::Graphics *graphics) drawChildren(graphics); } -void Tab::setTabColor(const gcn::Color &color) +void Tab::setTabColor(const gcn::Color *color) { mTabColor = color; } |