diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/FbTk/Theme.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc index 1e2ea3a..1efc8a1 100644 --- a/src/FbTk/Theme.cc +++ b/src/FbTk/Theme.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: Theme.cc,v 1.1 2002/12/02 19:34:54 fluxgen Exp $ | 22 | // $Id: Theme.cc,v 1.2 2003/02/23 00:47:34 fluxgen Exp $ |
23 | 23 | ||
24 | #include "Theme.hh" | 24 | #include "Theme.hh" |
25 | 25 | ||
@@ -77,14 +77,16 @@ void ThemeItem<FbTk::Texture>::load() { | |||
77 | m_value.colorTo().setFromString(colorto_name.c_str(), m_tm.screenNum()); | 77 | m_value.colorTo().setFromString(colorto_name.c_str(), m_tm.screenNum()); |
78 | } | 78 | } |
79 | 79 | ||
80 | |||
80 | template <> | 81 | template <> |
81 | void ThemeItem<FbTk::Color>::setFromString(const char *str) { | 82 | void ThemeItem<FbTk::Color>::setDefaultValue() { |
82 | m_value.setFromString(str, m_tm.screenNum()); | 83 | m_value.setFromString("white", m_tm.screenNum()); |
83 | } | 84 | } |
84 | 85 | ||
85 | template <> | 86 | template <> |
86 | void ThemeItem<FbTk::Color>::setDefaultValue() { | 87 | void ThemeItem<FbTk::Color>::setFromString(const char *str) { |
87 | m_value.setPixel(0xFFFFFFFF); | 88 | if (!m_value.setFromString(str, m_tm.screenNum())) |
89 | setDefaultValue(); | ||
88 | } | 90 | } |
89 | 91 | ||
90 | // does nothing | 92 | // does nothing |