aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Texture.hh
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2007-12-29 21:38:53 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2007-12-29 21:38:53 (GMT)
commite1f362ae764884a4cd1e1673292cb37d5a85f89c (patch)
tree137430b26aee6f3638f27281d3757c2c75ef4b20 /src/FbTk/Texture.hh
parente90c3678d9e54bc9251619fdee2d7341f042167b (diff)
downloadfluxbox-e1f362ae764884a4cd1e1673292cb37d5a85f89c.zip
fluxbox-e1f362ae764884a4cd1e1673292cb37d5a85f89c.tar.bz2
'inline' in class declaration is implicitly inline
Diffstat (limited to 'src/FbTk/Texture.hh')
-rw-r--r--src/FbTk/Texture.hh12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/FbTk/Texture.hh b/src/FbTk/Texture.hh
index 35b628b..151b190 100644
--- a/src/FbTk/Texture.hh
+++ b/src/FbTk/Texture.hh
@@ -1,4 +1,4 @@
1// Texture.hh for Fluxbox Window Manager 1// Texture.hh for Fluxbox Window Manager
2// Copyright (c) 2002-2003 Henrik Kinnunen (fluxbox<at>users.sourceforge.net) 2// Copyright (c) 2002-2003 Henrik Kinnunen (fluxbox<at>users.sourceforge.net)
3// 3//
4// from Image.hh for Blackbox - an X11 Window manager 4// from Image.hh for Blackbox - an X11 Window manager
@@ -63,9 +63,9 @@ public:
63 PIPECROSS = 0x01000, 63 PIPECROSS = 0x01000,
64 ELLIPTIC = 0x02000 64 ELLIPTIC = 0x02000
65 }; 65 };
66 66
67 enum { 67 enum {
68 BEVEL1 = 0x04000, 68 BEVEL1 = 0x04000,
69 BEVEL2 = 0x08000, // bevel types 69 BEVEL2 = 0x08000, // bevel types
70 INVERT = 0x10000, ///< inverted image 70 INVERT = 0x10000, ///< inverted image
71 PARENTRELATIVE = 0x20000, 71 PARENTRELATIVE = 0x20000,
@@ -78,7 +78,7 @@ public:
78 void setType(unsigned long t) { m_type = t; } 78 void setType(unsigned long t) { m_type = t; }
79 void addType(unsigned long t) { m_type |= t; } 79 void addType(unsigned long t) { m_type |= t; }
80 void setFromString(const char * const str); 80 void setFromString(const char * const str);
81 81
82 Color &color() { return m_color; } 82 Color &color() { return m_color; }
83 Color &colorTo() { return m_color_to; } 83 Color &colorTo() { return m_color_to; }
84 Color &hiColor() { return m_hicolor; } 84 Color &hiColor() { return m_hicolor; }
@@ -93,8 +93,8 @@ public:
93 const Color &hiColor() const { return m_hicolor; } 93 const Color &hiColor() const { return m_hicolor; }
94 const Color &loColor() const { return m_locolor; } 94 const Color &loColor() const { return m_locolor; }
95 const FbTk::FbPixmap &pixmap() const { return m_pixmap; } 95 const FbTk::FbPixmap &pixmap() const { return m_pixmap; }
96 inline unsigned long type() const { return m_type; } 96 unsigned long type() const { return m_type; }
97 inline bool usePixmap() const { return !( type() == (FLAT | SOLID) && pixmap().drawable() == 0); } 97 bool usePixmap() const { return !( type() == (FLAT | SOLID) && pixmap().drawable() == 0); }
98 98
99private: 99private:
100 FbTk::Color m_color, m_color_to, m_hicolor, m_locolor; 100 FbTk::Color m_color, m_color_to, m_hicolor, m_locolor;