put a header where it belongs

[chaz/openbox] / src / openbox.hh

diff --git a/src/openbox.hh b/src/openbox.hh
index b2598dc001dba873d1d6fcf725f541693251f69e..75a3a2e0a4adbcf16d8eb7c476efadae7b6a9e25 100644 (file)
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -8,7 +8,6 @@
 
 /*
   cuz girls look soooo goood.. on the end of my DICK
-  -- xOr
 */
 
 extern "C" {
@@ -23,12 +22,13 @@ extern "C" {
 #include "otk/timerqueuemanager.hh"
 #include "otk/property.hh"
 #include "otk/configuration.hh"
-#include "xeventhandler.hh"
-#include "client.hh"
+#include "otk/eventdispatcher.hh"
+#include "otk/eventhandler.hh"
 
 namespace ob {
 
 class OBScreen;
+class OBClient;
 
 //! The main class for the Openbox window manager.
 /*!
@@ -40,7 +40,7 @@ class OBScreen;
   not exit until the window manager is ready to be destroyed. Destruction of
   the Openbox class instance will shutdown the window manager.
 */
-class Openbox
+class Openbox : public otk::OtkEventDispatcher, public otk::OtkEventHandler
 {
 public:
   //! The single instance of the Openbox class for the application.
@@ -103,9 +103,6 @@ private:
   */
   otk::OBTimerQueueManager _timermanager;
 
-  //! The class which will handle raw XEvents
-  OBXEventHandler _xeventhandler;
-
   //! Cached atoms on the display
   /*!
     This is a pointer because the OBProperty class uses otk::OBDisplay::display