X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=otk%2Feventhandler.cc;h=6539d58790d435afca95de406ba0cd2f33549c50;hb=ad44e8a708b6836c9d84be7205457cfa82800a65;hp=7e1ad745c2ad37ef1726ee6716164496f0b78dca;hpb=345d957e1ea577480f807b892b73c3f52fe913d2;p=chaz%2Fopenbox

diff --git a/otk/eventhandler.cc b/otk/eventhandler.cc
index 7e1ad745..6539d587 100644
--- a/otk/eventhandler.cc
+++ b/otk/eventhandler.cc
@@ -1,25 +1,23 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
 
 #include "display.hh"
 #include "eventhandler.hh"
 
 namespace otk {
 
-OtkEventHandler::OtkEventHandler()
+EventHandler::EventHandler()
 {
 }
 
 
-OtkEventHandler::~OtkEventHandler()
+EventHandler::~EventHandler()
 {
 }
 
 
-void OtkEventHandler::handle(const XEvent &e)
+void EventHandler::handle(const XEvent &e)
 {
   switch(e.type){
   case KeyPress:
@@ -88,11 +86,11 @@ void OtkEventHandler::handle(const XEvent &e)
     return selectionRequestHandler(e.xselectionrequest);
   default:
 #ifdef    SHAPE
-    if (e.type == otk::OBDisplay::shapeEventBase())
+    if (e.type == display->shapeEventBase())
       return shapeHandler((*(XShapeEvent*)&e));
 #endif // SHAPE
 #ifdef    XKB
-    if (e.type == otk::OBDisplay::xkbEventBase())
+    if (e.type == display->xkbEventBase())
       return xkbHandler((*(XkbEvent*)&e));
 #endif // XKB
     ;
@@ -100,7 +98,7 @@ void OtkEventHandler::handle(const XEvent &e)
 }
 
 
-void OtkEventHandler::clientMessageHandler(const XClientMessageEvent &)
+void EventHandler::clientMessageHandler(const XClientMessageEvent &)
 {
   
 }