signed ints instead of unsigned ints again. less pain. pain bad.

[chaz/openbox] / src / screen.hh

diff --git a/src/screen.hh b/src/screen.hh
index ab0bc25aea37841c0196fb186a9105ceec4739b1..9244bb2d594ad88593100ad83d56376939cb03e0 100644 (file)
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -10,8 +10,6 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include "widgetbase.hh"
-#include "otk/renderstyle.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/screeninfo.hh"
@@ -29,7 +27,7 @@ class Client;
 //! Manages a single screen
 /*!
 */
-class Screen : public otk::EventHandler, public WidgetBase {
+class Screen : public otk::EventHandler {
 public:
   //! Holds a list of otk::Strut objects
   typedef std::list<otk::Strut*> StrutList;
@@ -58,9 +56,6 @@ private:
   //! Information about this screen
   const otk::ScreenInfo *_info;
   
-  //! The style with which to render on the screen
-  otk::RenderStyle _style;
-
   //! Is the root colormap currently installed?
   bool _root_cmap_installed;
 
@@ -146,8 +141,6 @@ public:
   inline bool managed() const { return _managed; }
   //! Returns the area of the screen not reserved by applications' Struts
   inline const otk::Rect &area() const { return _area; }
-  //! Returns the style in use on the screen
-  inline const otk::RenderStyle *style() const { return &_style; }
   //!  An offscreen window which gets focus when nothing else has it
   inline Window focuswindow() const { return _focuswindow; }
   //! Returns the desktop being displayed