code reorganize

[chaz/openbox] / src / rootwindow.hh

diff --git a/src/rootwindow.hh b/src/rootwindow.hh
index 7d0a9c825042b86c75a92ce6657b33e7b8ba0d54..180f239c5baeb301d9c6422931556237c97ec748 100644 (file)
--- a/src/rootwindow.hh
+++ b/src/rootwindow.hh
@@ -2,7 +2,7 @@
 #ifndef   __rootwindow_hh
 #define   __rootwindow_hh
 
-/*! @file client.hh
+/*! @file rootwindow.hh
   @brief The OBClient class maintains the state of a client window by handling
   property changes on the window and some client messages
 */
@@ -18,6 +18,7 @@ extern "C" {
 #include <string>
 #include <vector>
 
+#include "widget.hh"
 #include "otk/screeninfo.hh"
 #include "otk/eventhandler.hh"
 #include "otk/property.hh"
@@ -32,7 +33,7 @@ namespace ob {
   <p>
   OBRootWindow also manages client messages for the root window.
 */
-class OBRootWindow : public otk::OtkEventHandler {
+class OBRootWindow : public otk::OtkEventHandler, public OBWidget {
 private:
   //! Information about this screen
   const otk::ScreenInfo *_info;
@@ -52,18 +53,16 @@ public:
   //! Destroys the OBRootWindow object
   virtual ~OBRootWindow();
 
-  virtual void propertyHandler(const XPropertyEvent &e);
-
-  virtual void clientMessageHandler(const XClientMessageEvent &e);
-
-  virtual void mapRequestHandler(const XMapRequestEvent &);
-
   //! Sets the name of a desktop
   /*!
     @param i The index of the desktop to set the name for (base 0)
     @param name The name to set for the desktop
   */
   void setDesktopName(int i, const std::string &name);
+
+  virtual void propertyHandler(const XPropertyEvent &e);
+  virtual void clientMessageHandler(const XClientMessageEvent &e);
+  virtual void mapRequestHandler(const XMapRequestEvent &);
 };
 
 }