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

diff --git a/src/Screen.cc b/src/Screen.cc
index ab7003a..f1ba429 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 9f08341..f17c6f5 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 a0acd4c..5453f22 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;