build fixes for member funcs

[chaz/openbox] / src / rootwindow.cc

diff --git a/src/rootwindow.cc b/src/rootwindow.cc
index bc62fdc55dbfdc9999f26b0deccacba8d9b47acf..364f614471d186a562544b7cc9200c677860a490 100644 (file)
--- a/src/rootwindow.cc
+++ b/src/rootwindow.cc
@@ -12,11 +12,12 @@
 namespace ob {
 
 OBRootWindow::OBRootWindow(int screen)
-  : _info(otk::OBDisplay::screenInfo(screen))
+  : OBWidget(OBWidget::Type_Root),
+    _info(otk::OBDisplay::screenInfo(screen))
 {
   updateDesktopNames();
 
-  Openbox::instance->registerHandler(_info->getRootWindow(), this);
+  Openbox::instance->registerHandler(_info->rootWindow(), this);
 }
 
 
@@ -33,7 +34,7 @@ void OBRootWindow::updateDesktopNames()
 
   unsigned long num = (unsigned) -1;
   
-  if (!property->get(_info->getRootWindow(),
+  if (!property->get(_info->rootWindow(),
                      otk::OBProperty::net_desktop_names,
                      otk::OBProperty::utf8, &num, &_names))
     _names.clear();
@@ -87,7 +88,7 @@ void OBRootWindow::setDesktopName(int i, const std::string &name)
   
   otk::OBProperty::StringVect newnames = _names;
   newnames[i] = name;
-  property->set(_info->getRootWindow(), otk::OBProperty::net_desktop_names,
+  property->set(_info->rootWindow(), otk::OBProperty::net_desktop_names,
                 otk::OBProperty::utf8, newnames);
 }
 
@@ -103,29 +104,8 @@ void OBRootWindow::mapRequestHandler(const XMapRequestEvent &e)
   if (client) {
     // XXX: uniconify and/or unshade the window
   } else {
-    Openbox::instance->screen(_info->getScreenNumber())->
-      manageWindow(e.window);
+    Openbox::instance->screen(_info->screen())->manageWindow(e.window);
   }
 }
 
-
-#include <stdio.h>
-void OBRootWindow::configureRequestHandler(const XConfigureRequestEvent &e)
-{
-  // when configure requests come to the root window, just pass them on
-  XWindowChanges xwc;
-
-  xwc.x = e.x;
-  xwc.y = e.y;
-  xwc.width = e.width;
-  xwc.height = e.height;
-  xwc.border_width = e.border_width;
-  xwc.sibling = e.above;
-  xwc.stack_mode = e.detail;
-
-  XConfigureWindow(otk::OBDisplay::display, e.window,
-                   e.value_mask, &xwc);
-}
-
-
 }