get the min/max sizes

[chaz/openbox] / src / screen.hh

diff --git a/src/screen.hh b/src/screen.hh
index b00e5fc7c52951e211c1e9d475a2d5b1f87dbb99..349635081eaa2bae437a4c284feb5823be3433e0 100644 (file)
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -24,15 +24,14 @@ extern "C" {
 #include "otk/font.hh"
 #include "otk/texture.hh"
 #include "otk/image.hh"
+#include "otk/strut.hh"
+#include "otk/property.hh"
 #include "timer.hh"
 #include "workspace.hh"
 #include "blackbox.hh"
 
 namespace ob {
 
-class OBAtom;
-struct Strut;
-
 enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify };
 
 struct PixmapMask {
@@ -66,7 +65,7 @@ private:
   Blackbox *blackbox;
   otk::BImageControl *image_control;
   Configuration *config;
-  OBAtom *xatom;
+  otk::OBProperty *xatom;
 
   BlackboxWindowList iconList, windowList;
 
@@ -83,7 +82,7 @@ private:
   RectList xineramaUsableArea;
 #endif // XINERAMA
 
-  typedef std::list<Strut*> StrutList;
+  typedef std::list<otk::Strut*> StrutList;
   StrutList strutList;
   typedef std::vector<Workspace*> WorkspaceList;
   WorkspaceList workspacesList;
@@ -270,8 +269,8 @@ public:
   const RectList& allAvailableAreas(void) const;
 #endif // XINERAMA
   void updateAvailableArea(void);
-  void addStrut(Strut *strut);
-  void removeStrut(Strut *strut);
+  void addStrut(otk::Strut *strut);
+  void removeStrut(otk::Strut *strut);
 
   unsigned int addWorkspace(void);
   unsigned int removeLastWorkspace(void);