X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=c810057f83fe9b097bde749742efa11533782fd8;hb=a77f0fb344978bb4dafd2ad4639f3de3e090bf7b;hp=18c0e85c3d1dfddfd82b865fdfef2b44a33dccbb;hpb=29d504e76cf90b9f3c27c91383889ce003b01728;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index 18c0e85c..c810057f 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -22,7 +22,8 @@ extern "C" {
 #include "otk/timerqueuemanager.hh"
 #include "otk/property.hh"
 #include "otk/configuration.hh"
-#include "xeventhandler.hh"
+#include "otk/eventdispatcher.hh"
+#include "otk/eventhandler.hh"
 #include "client.hh"
 
 namespace ob {
@@ -39,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.
@@ -102,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