X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fimage.hh;h=ed99e12492b896f776a1f273a4903c6c25dca0c3;hb=7df3b620e21777dbefa24f381c1a95fafed1c16e;hp=881656060965caa1d828d3e8194be02ec1060a98;hpb=fa8cefef63feb1d559c40db3cf9407e5bd1ac4df;p=chaz%2Fopenbox

diff --git a/otk/image.hh b/otk/image.hh
index 88165606..ed99e124 100644
--- a/otk/image.hh
+++ b/otk/image.hh
@@ -9,9 +9,9 @@ extern "C" {
 
 #include <list>
 
-#include "timer.hh"
 #include "color.hh"
 #include "screeninfo.hh"
+#include "timer.hh"
 
 namespace otk {
 
@@ -66,7 +66,7 @@ public:
 };
 
 
-class BImageControl : public TimeoutHandler {
+class BImageControl {
 public:
   struct CachedImage {
     Pixmap pixmap;
@@ -75,7 +75,8 @@ public:
     unsigned long pixel1, pixel2, texture;
   };
 
-  BImageControl(const ScreenInfo *scrn,
+  BImageControl(OBTimerQueueManager *timermanager,
+                const ScreenInfo *scrn,
                 bool _dither= False, int _cpc = 4,
                 unsigned long cache_timeout = 300000l,
                 unsigned long cmax = 200l);
@@ -111,12 +112,12 @@ public:
   void setDither(bool d) { dither = d; }
   void setColorsPerChannel(int cpc);
 
-  virtual void timeout(void);
+  static void timeout(BImageControl *t);
 
 private:
   bool dither;
   const ScreenInfo *screeninfo;
-  BTimer *timer;
+  OBTimer *timer;
 
   Colormap colormap;