X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fblackbox.hh;h=00f70cb9325ec077ea5cc98863e102b77f5069c7;hb=d0b55be2c7afb5b25b42804c9eab4995e64dff52;hp=947c0a99b25641a3ca3a67eb50046310fbe329a4;hpb=373de009f7e98b0c6f3a78f31c1e5c120cd722ed;p=chaz%2Fopenbox

diff --git a/src/blackbox.hh b/src/blackbox.hh
index 947c0a99..00f70cb9 100644
--- a/src/blackbox.hh
+++ b/src/blackbox.hh
@@ -25,6 +25,7 @@ extern "C" {
 #include <map>
 #include <string>
 
+#include "otk/timer.hh"
 #include "openbox.hh"
 #include "configuration.hh"
 #include "timer.hh"
@@ -69,7 +70,7 @@ class Blackbox;
 class BlackboxWindow;
 class BWindowGroup;
 
-class Blackbox : public Openbox, public TimeoutHandler {
+class Blackbox : public Openbox {
 private:
   struct BCursor {
     Cursor session, move, ll_angle, lr_angle, ul_angle, ur_angle;
@@ -109,7 +110,7 @@ private:
 
   BScreen *active_screen;
   BlackboxWindow *focused_window, *changing_window;
-  OBTimer *timer;
+  otk::OBTimer *timer;
   Configuration config;
   XAtom *xatom;
 
@@ -213,7 +214,7 @@ public:
 
   virtual bool handleSignal(int sig);
 
-  virtual void timeout(void);
+  static void timeout(Blackbox *t);
 
   enum { B_AmericanDate = 1, B_EuropeanDate };
 };