From 54dfa44cbecdb31cecb035e6ef8287007617b00c Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 20 Jul 2002 19:13:29 +0000 Subject: [PATCH] move the Strut struct from Screen.hh to Util.hh --- src/Screen.cc | 1 + src/Screen.hh | 7 +------ src/Util.hh | 6 ++++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Screen.cc b/src/Screen.cc index ab7003ad..f1ba429c 100644 --- 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 9f083419..f17c6f54 100644 --- 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 a0acd4cd..5453f225 100644 --- 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; -- 2.39.2