move the Strut struct from Screen.hh to Util.hh

diff --git a/src/Screen.cc b/src/Screen.cc
index ab7003ad2e6f556d928fdebf4102849ad75bc273..f1ba429c25048d4b098e1a61e2a2d8b644f5b0aa 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -85,6 +85,7 @@ using std::string;
 #include "Window.hh"
 #include "Workspace.hh"
 #include "Workspacemenu.hh"
+#include "Util.hh"
 #include "XAtom.hh"
 
 #ifndef   FONT_ELEMENT_SIZE

diff --git a/src/Screen.hh b/src/Screen.hh
index 9f0834192efd465c49512d9581ec3c3d6ca112f5..f17c6f5466f88d811cc7b6fc874edaa8261a1554 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -57,6 +57,7 @@ extern "C" {
 class Slit; // forward reference
 class BFont;
 class XAtom;
+struct Strut;
 
 enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify };
 
@@ -96,12 +97,6 @@ struct MenuStyle {
   int bullet, bullet_pos;
 };
 
-struct Strut {
-  unsigned int top, bottom, left, right;
-
-  Strut(void): top(0), bottom(0), left(0), right(0) {}
-};
-
 class BScreen : public ScreenInfo {
 private:
   bool root_colormap_installed, managed, geom_visible;

diff --git a/src/Util.hh b/src/Util.hh
index a0acd4cd758bcf3147225117e1ba5987a2a1db69..5453f225adfb0055190030c3e30d2e542117e9ba 100644 (file)
--- a/src/Util.hh
+++ b/src/Util.hh
@@ -76,6 +76,12 @@ private:
   int _x1, _y1, _x2, _y2;
 };
 
+struct Strut {
+  unsigned int top, bottom, left, right;
+
+  Strut(void): top(0), bottom(0), left(0), right(0) {}
+};
+
 /* XXX: this needs autoconf help */
 const unsigned int BSENTINEL = 65535;