diff options
Diffstat (limited to 'src/FbTk/Color.hh')
-rw-r--r-- | src/FbTk/Color.hh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/FbTk/Color.hh b/src/FbTk/Color.hh index 826c667..2b72e97 100644 --- a/src/FbTk/Color.hh +++ b/src/FbTk/Color.hh | |||
@@ -1,4 +1,4 @@ | |||
1 | // Color.hh for Fluxbox Window Manager | 1 | // Color.hh for Fluxbox Window Manager |
2 | // Copyright (c) 2002 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org) | 2 | // Copyright (c) 2002 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org) |
3 | // | 3 | // |
4 | // from Image.hh for Blackbox - an X11 Window manager | 4 | // from Image.hh for Blackbox - an X11 Window manager |
@@ -48,12 +48,12 @@ public: | |||
48 | void setPixel(unsigned long pixel) { m_pixel = pixel; } | 48 | void setPixel(unsigned long pixel) { m_pixel = pixel; } |
49 | 49 | ||
50 | Color &operator = (const Color &col_copy); | 50 | Color &operator = (const Color &col_copy); |
51 | 51 | ||
52 | inline bool isAllocated() const { return m_allocated; } | 52 | bool isAllocated() const { return m_allocated; } |
53 | inline unsigned short red() const { return m_red; } | 53 | unsigned short red() const { return m_red; } |
54 | inline unsigned short green() const { return m_green; } | 54 | unsigned short green() const { return m_green; } |
55 | inline unsigned short blue() const { return m_blue; } | 55 | unsigned short blue() const { return m_blue; } |
56 | inline unsigned long pixel() const { return m_pixel; } | 56 | unsigned long pixel() const { return m_pixel; } |
57 | 57 | ||
58 | /// @return true if the color name in color_string is resolved, else false | 58 | /// @return true if the color name in color_string is resolved, else false |
59 | static bool validColorString(const char *color_string, int screen); | 59 | static bool validColorString(const char *color_string, int screen); |
@@ -61,9 +61,9 @@ public: | |||
61 | private: | 61 | private: |
62 | void free(); | 62 | void free(); |
63 | void copy(const Color &col); | 63 | void copy(const Color &col); |
64 | void allocate(unsigned short red, unsigned short green, | 64 | void allocate(unsigned short red, unsigned short green, |
65 | unsigned short blue, int screen); | 65 | unsigned short blue, int screen); |
66 | inline void setAllocated(bool a) { m_allocated = a; } | 66 | void setAllocated(bool a) { m_allocated = a; } |
67 | void setRGB(unsigned short red, unsigned short green, unsigned short blue); | 67 | void setRGB(unsigned short red, unsigned short green, unsigned short blue); |
68 | 68 | ||
69 | 69 | ||