BScreen (ScreenInfo) now contains a size() instead of a getWidth/getHeight

[chaz/openbox] / src / BaseDisplay.h

diff --git a/src/BaseDisplay.h b/src/BaseDisplay.h
index 8504261ee9aa638bd624d68b5a75f2b716bcfa8b..1a44dddc6661e1cb25ad98bb41eef206f89c25d9 100644 (file)
--- a/src/BaseDisplay.h
+++ b/src/BaseDisplay.h
@@ -32,6 +32,7 @@ class ScreenInfo;
 
 #include "LinkedList.h"
 #include "Timer.h"
+#include "Geometry.h"
 
 #define AttribShaded      (1l << 0)
 #define AttribMaxHoriz    (1l << 1)
@@ -334,7 +335,7 @@ private:
   Colormap colormap;
 
   int depth, screen_number;
-  unsigned int width, height;
+  Size m_size;
 
 
 public:
@@ -349,8 +350,9 @@ public:
   inline const int &getDepth(void) const { return depth; }
   inline const int &getScreenNumber(void) const { return screen_number; }
 
-  inline const unsigned int &getWidth(void) const { return width; }
-  inline const unsigned int &getHeight(void) const { return height; }
+//  inline const unsigned int &getWidth(void) const { return width; }
+//  inline const unsigned int &getHeight(void) const { return height; }
+  inline const Size &size() const { return m_size; }
 };