From 84a81a1ac1cd24830fc68c7fc46aa10b6f01e6af Mon Sep 17 00:00:00 2001 From: Mathias Gumz Date: Tue, 22 Feb 2011 15:18:20 +0100 Subject: renamed Texture:DEFAULT_BEVEL to Texture::DEFAULT_LEVEL --- src/FbTk/Texture.cc | 2 +- src/FbTk/Texture.hh | 2 +- src/FbTk/ThemeItems.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FbTk/Texture.cc b/src/FbTk/Texture.cc index caada06..51ca2db 100644 --- a/src/FbTk/Texture.cc +++ b/src/FbTk/Texture.cc @@ -87,7 +87,7 @@ void Texture::setFromString(const char * const texture_str) { else if (strstr(ts, "flat")) addType(Texture::FLAT); else - addType(Texture::DEFAULT_BEVEL); + addType(Texture::DEFAULT_LEVEL); if (! (type() & Texture::FLAT)) { if (strstr(ts, "bevel2")) diff --git a/src/FbTk/Texture.hh b/src/FbTk/Texture.hh index 96953fd..91bf833 100644 --- a/src/FbTk/Texture.hh +++ b/src/FbTk/Texture.hh @@ -41,7 +41,7 @@ public: FLAT = 0x00002, SUNKEN = 0x00004, RAISED = 0x00008, - DEFAULT_BEVEL = FLAT + DEFAULT_LEVEL = FLAT }; enum Textures { diff --git a/src/FbTk/ThemeItems.cc b/src/FbTk/ThemeItems.cc index 56efb1b..e88ab55 100644 --- a/src/FbTk/ThemeItems.cc +++ b/src/FbTk/ThemeItems.cc @@ -242,7 +242,7 @@ void ThemeItem::load(const string *o_name, const string *o_altname) { template <> void ThemeItem::setDefaultValue() { - m_value.setType(Texture::DEFAULT_BEVEL | Texture::DEFAULT_TEXTURE); + m_value.setType(Texture::DEFAULT_LEVEL | Texture::DEFAULT_TEXTURE); load(); // one might forget to add line something: so we try to load something.*: too } -- cgit v0.11.2