aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/FbPixmap.hh
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2008-01-14 22:27:00 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2008-01-14 22:27:00 (GMT)
commite1db89e2d7d56afca5335550ee1c9ff87fd54ba4 (patch)
tree779b52814dedd08eb56d1875cb2f97bbcdd39e8b /src/FbTk/FbPixmap.hh
parentc6099d777d844699fb8a4243921159898bc4f45c (diff)
downloadfluxbox-e1db89e2d7d56afca5335550ee1c9ff87fd54ba4.zip
fluxbox-e1db89e2d7d56afca5335550ee1c9ff87fd54ba4.tar.bz2
moved code a bit around, cleaned up some classes
Diffstat (limited to 'src/FbTk/FbPixmap.hh')
-rw-r--r--src/FbTk/FbPixmap.hh17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/FbTk/FbPixmap.hh b/src/FbTk/FbPixmap.hh
index 7b3c8de..5c2e2b8 100644
--- a/src/FbTk/FbPixmap.hh
+++ b/src/FbTk/FbPixmap.hh
@@ -23,22 +23,22 @@
23#define FBTK_FBPIXMAP_HH 23#define FBTK_FBPIXMAP_HH
24 24
25#include "FbDrawable.hh" 25#include "FbDrawable.hh"
26#include "Text.hh" 26#include "Text.hh" // for Orientation
27 27
28namespace FbTk { 28namespace FbTk {
29 29
30/// a wrapper for X Pixmap 30/// a wrapper for X Pixmap
31class FbPixmap:public FbDrawable { 31class FbPixmap:public FbDrawable {
32public: 32public:
33 FbPixmap(); 33 FbPixmap();
34 /// copy pixmap 34 /// copy pixmap
35 FbPixmap(const FbPixmap &copy); 35 FbPixmap(const FbPixmap &copy);
36 /// creates a FbPixmap from X pixmap 36 /// creates a FbPixmap from X pixmap
37 explicit FbPixmap(Pixmap pm); 37 explicit FbPixmap(Pixmap pm);
38 FbPixmap(const FbDrawable &src, 38 FbPixmap(const FbDrawable &src,
39 unsigned int width, unsigned int height, 39 unsigned int width, unsigned int height,
40 unsigned int depth); 40 unsigned int depth);
41 FbPixmap(Drawable src, 41 FbPixmap(Drawable src,
42 unsigned int width, unsigned int height, 42 unsigned int width, unsigned int height,
43 unsigned int depth); 43 unsigned int depth);
44 44
@@ -86,13 +86,6 @@ private:
86 // if pixmap not *owned* by this object (eg assigned from cache object) 86 // if pixmap not *owned* by this object (eg assigned from cache object)
87 bool m_dont_free; 87 bool m_dont_free;
88 88
89 /// Functions relating to the maintenance of root window pixmap caching
90 static void checkAtoms();
91
92 // array of pixmaps: 1 per screen
93 static Pixmap *m_root_pixmaps;
94 static const char *root_prop_ids[];
95 static Atom root_prop_atoms[];
96}; 89};
97 90
98} // end namespace FbTk 91} // end namespace FbTk