diff options
author | fluxgen <fluxgen> | 2003-04-28 22:23:41 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-04-28 22:23:41 (GMT) |
commit | 7a643267c1024f0b95ac39f86bb16e1464ac6cc7 (patch) | |
tree | 1b66df8fbdb869f720b6daf102a3c857a1960638 /src/FbTk | |
parent | 678fe92bc2e0316cf14e17709cec12202b68741d (diff) | |
download | fluxbox_paul-7a643267c1024f0b95ac39f86bb16e1464ac6cc7.zip fluxbox_paul-7a643267c1024f0b95ac39f86bb16e1464ac6cc7.tar.bz2 |
added pixmap
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/Texture.hh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/FbTk/Texture.hh b/src/FbTk/Texture.hh index 903d01f..333e12d 100644 --- a/src/FbTk/Texture.hh +++ b/src/FbTk/Texture.hh | |||
@@ -1,5 +1,5 @@ | |||
1 | // Texture.hh for Fluxbox Window Manager | 1 | // Texture.hh for Fluxbox Window Manager |
2 | // Copyright (c) 2002 Henrik Kinnunen (fluxbox@linuxmail.org) | 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 |
5 | // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) | 5 | // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) |
@@ -22,12 +22,13 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Texture.hh,v 1.2 2002/12/01 13:42:14 rathnor Exp $ | 25 | // $Id: Texture.hh,v 1.3 2003/04/28 22:23:41 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef FBTK_TEXTURE_HH | 27 | #ifndef FBTK_TEXTURE_HH |
28 | #define FBTK_TEXTURE_HH | 28 | #define FBTK_TEXTURE_HH |
29 | 29 | ||
30 | #include "Color.hh" | 30 | #include "Color.hh" |
31 | #include "FbPixmap.hh" | ||
31 | 32 | ||
32 | namespace FbTk { | 33 | namespace FbTk { |
33 | 34 | ||
@@ -79,16 +80,19 @@ public: | |||
79 | Color &hiColor() { return m_hicolor; } | 80 | Color &hiColor() { return m_hicolor; } |
80 | Color &loColor() { return m_locolor; } | 81 | Color &loColor() { return m_locolor; } |
81 | 82 | ||
83 | FbPixmap &pixmap() { return m_pixmap; } | ||
84 | |||
82 | const Color &color() const { return m_color; } | 85 | const Color &color() const { return m_color; } |
83 | const Color &colorTo() const { return m_color_to; } | 86 | const Color &colorTo() const { return m_color_to; } |
84 | const Color &hiColor() const { return m_hicolor; } | 87 | const Color &hiColor() const { return m_hicolor; } |
85 | const Color &loColor() const { return m_locolor; } | 88 | const Color &loColor() const { return m_locolor; } |
86 | 89 | const FbTk::FbPixmap &pixmap() const { return m_pixmap; } | |
87 | inline unsigned long type() const { return m_type; } | 90 | inline unsigned long type() const { return m_type; } |
88 | 91 | ||
89 | 92 | ||
90 | private: | 93 | private: |
91 | FbTk::Color m_color, m_color_to, m_hicolor, m_locolor; | 94 | FbTk::Color m_color, m_color_to, m_hicolor, m_locolor; |
95 | FbTk::FbPixmap m_pixmap; | ||
92 | unsigned long m_type; | 96 | unsigned long m_type; |
93 | }; | 97 | }; |
94 | 98 | ||