aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2011-02-22 14:18:20 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2011-02-22 14:18:20 (GMT)
commit84a81a1ac1cd24830fc68c7fc46aa10b6f01e6af (patch)
treee6cbca64fe0545f1d2deb7de0132ce4f3653ecbd
parent0569849c6d945257ab1d9d8f0c915103bf37fdb5 (diff)
downloadfluxbox-84a81a1ac1cd24830fc68c7fc46aa10b6f01e6af.zip
fluxbox-84a81a1ac1cd24830fc68c7fc46aa10b6f01e6af.tar.bz2
renamed Texture:DEFAULT_BEVEL to Texture::DEFAULT_LEVEL
-rw-r--r--src/FbTk/Texture.cc2
-rw-r--r--src/FbTk/Texture.hh2
-rw-r--r--src/FbTk/ThemeItems.cc2
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) {
87 else if (strstr(ts, "flat")) 87 else if (strstr(ts, "flat"))
88 addType(Texture::FLAT); 88 addType(Texture::FLAT);
89 else 89 else
90 addType(Texture::DEFAULT_BEVEL); 90 addType(Texture::DEFAULT_LEVEL);
91 91
92 if (! (type() & Texture::FLAT)) { 92 if (! (type() & Texture::FLAT)) {
93 if (strstr(ts, "bevel2")) 93 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:
41 FLAT = 0x00002, 41 FLAT = 0x00002,
42 SUNKEN = 0x00004, 42 SUNKEN = 0x00004,
43 RAISED = 0x00008, 43 RAISED = 0x00008,
44 DEFAULT_BEVEL = FLAT 44 DEFAULT_LEVEL = FLAT
45 }; 45 };
46 46
47 enum Textures { 47 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<Texture>::load(const string *o_name, const string *o_altname) {
242 242
243template <> 243template <>
244void ThemeItem<Texture>::setDefaultValue() { 244void ThemeItem<Texture>::setDefaultValue() {
245 m_value.setType(Texture::DEFAULT_BEVEL | Texture::DEFAULT_TEXTURE); 245 m_value.setType(Texture::DEFAULT_LEVEL | Texture::DEFAULT_TEXTURE);
246 load(); // one might forget to add line something: so we try to load something.*: too 246 load(); // one might forget to add line something: so we try to load something.*: too
247} 247}
248 248