diff options
author | Bertram <bertram@cegetel.net> | 2010-03-06 15:53:30 +0100 |
---|---|---|
committer | Bertram <bertram@cegetel.net> | 2010-03-06 15:53:30 +0100 |
commit | da77a5f25dbf9cdfbb33ddae1c01ed961f41374f (patch) | |
tree | 7160c19d185fa8d0bf826c09c9346cdc8354e50d /src/gui/widgets/checkbox.cpp | |
parent | f0bf3996fbc2f9dc3edc55b45e4fa3a3a6275db4 (diff) | |
parent | 3a447afa534573ed4a014372c687ef4028d16760 (diff) | |
download | mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.gz mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.bz2 mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.xz mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.zip |
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src/gui/widgets/checkbox.cpp')
-rw-r--r-- | src/gui/widgets/checkbox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index 0fefbfe9..5ca38727 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -25,7 +25,7 @@ #include "graphics.h" #include "gui/palette.h" -#include "gui/skin.h" +#include "gui/theme.h" #include "resources/image.h" @@ -44,7 +44,7 @@ CheckBox::CheckBox(const std::string &caption, bool selected): { if (instances == 0) { - Image *checkBox = SkinLoader::getImageFromTheme("checkbox.png"); + Image *checkBox = Theme::getImageFromTheme("checkbox.png"); checkBoxNormal = checkBox->getSubImage(0, 0, 9, 10); checkBoxChecked = checkBox->getSubImage(9, 0, 9, 10); checkBoxDisabled = checkBox->getSubImage(18, 0, 9, 10); @@ -93,7 +93,7 @@ void CheckBox::draw(gcn::Graphics* graphics) void CheckBox::updateAlpha() { float alpha = std::max(config.getValue("guialpha", 0.8f), - (double)SkinLoader::instance()->getMinimumOpacity()); + (double) Theme::instance()->getMinimumOpacity()); if (mAlpha != alpha) { |