merge the C branch into HEAD

[chaz/openbox] / otk / screeninfo.hh

diff --git a/otk/screeninfo.hh b/otk/screeninfo.hh
index 440573aa80058325df8c5afe18a64742769f6ff0..93e835facb1cb601bccf728a1fbfb890f7466056 100644 (file)
--- a/otk/screeninfo.hh
+++ b/otk/screeninfo.hh
@@ -16,34 +16,25 @@ namespace otk {
 
 class ScreenInfo {
 private:
-  Visual *_visual;
-  Window _root_window;
-  Colormap _colormap;
-
-  int _depth;
-  unsigned int _screen;
+  int _screen;
   std::string _display_string;
   Size _size;
-#ifdef XINERAMA
   std::vector<Rect> _xinerama_areas;
   bool _xinerama_active;
-#endif
 
 public:
-  ScreenInfo(unsigned int num);
+  ScreenInfo(int num);
 
   inline Visual *visual() const { return _visual; }
   inline Window rootWindow() const { return _root_window; }
   inline Colormap colormap() const { return _colormap; }
   inline int depth() const { return _depth; }
-  inline unsigned int screen() const { return _screen; }
+  inline int screen() const { return _screen; }
   inline const Size& size() const { return _size; }
   inline const std::string& displayString() const { return _display_string; }
-#ifdef XINERAMA
   inline const std::vector<Rect> &xineramaAreas() const
     { return _xinerama_areas; }
   inline bool isXineramaActive() const { return _xinerama_active; }
-#endif
 };
 
 }