aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/FbWindow.hh
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2008-08-14 05:52:39 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2008-08-14 05:52:39 (GMT)
commite169d33552c8e7070aa6e13da0187f2013b4cfc3 (patch)
treeae9e92c7e885791c7f47645184070cbcd441ab94 /src/FbTk/FbWindow.hh
parentc82e7c0080f8a5c14dcf95ec92dc42f59ea9dd8b (diff)
parent91ca3bc5c8e2b892a9a81b18246f72aba7deebfd (diff)
downloadfluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.zip
fluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.tar.bz2
Merge branch 'master' into to_push
Diffstat (limited to 'src/FbTk/FbWindow.hh')
-rw-r--r--src/FbTk/FbWindow.hh2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index e9f8e30..f212e50 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -177,6 +177,7 @@ public:
177 unsigned int width() const { return m_width; } 177 unsigned int width() const { return m_width; }
178 unsigned int height() const { return m_height; } 178 unsigned int height() const { return m_height; }
179 unsigned int borderWidth() const { return m_border_width; } 179 unsigned int borderWidth() const { return m_border_width; }
180 unsigned long borderColor() const { return m_border_color; }
180 unsigned int depth() const { return m_depth; } 181 unsigned int depth() const { return m_depth; }
181 unsigned char alpha() const; 182 unsigned char alpha() const;
182 int screenNumber() const; 183 int screenNumber() const;
@@ -225,6 +226,7 @@ private:
225 int m_x, m_y; ///< position of window 226 int m_x, m_y; ///< position of window
226 unsigned int m_width, m_height; ///< size of window 227 unsigned int m_width, m_height; ///< size of window
227 unsigned int m_border_width; ///< border size 228 unsigned int m_border_width; ///< border size
229 unsigned long m_border_color; ///< border color
228 unsigned int m_depth; ///< bit depth 230 unsigned int m_depth; ///< bit depth
229 bool m_destroy; ///< wheter the x window was created before 231 bool m_destroy; ///< wheter the x window was created before
230 std::auto_ptr<FbTk::Transparent> m_transparent; 232 std::auto_ptr<FbTk::Transparent> m_transparent;