Added a secondary color for gradients

[chaz/openbox] / otk / imagecontrol.cc

diff --git a/otk/imagecontrol.cc b/otk/imagecontrol.cc
index 348e2343781cf8fbb87498f0448d14d7f5cc8e66..ab8f5c50ca2bd03caf250d5f1ebcf67227351333 100644 (file)
--- a/otk/imagecontrol.cc
+++ b/otk/imagecontrol.cc
@@ -41,11 +41,10 @@ static unsigned long bsqrt(unsigned long x) {
 
 ImageControl *ctrl = 0;
 
-ImageControl::ImageControl(TimerQueueManager *timermanager,
-                             const ScreenInfo *scrn,
-                             bool _dither, int _cpc,
-                             unsigned long cache_timeout,
-                             unsigned long cmax) {
+ImageControl::ImageControl(const ScreenInfo *scrn,
+                           bool _dither, int _cpc,
+                           unsigned long cache_timeout,
+                           unsigned long cmax) {
   if (! ctrl) ctrl = this;
 
   screeninfo = scrn;
@@ -53,13 +52,10 @@ ImageControl::ImageControl(TimerQueueManager *timermanager,
   setColorsPerChannel(_cpc);
 
   cache_max = cmax;
-  if (cache_timeout) {
-    timer = new Timer(timermanager, (TimeoutHandler)timeout, this);
-    timer->setTimeout(cache_timeout);
-    timer->start();
-  } else {
+  if (cache_timeout)
+    timer = new Timer(cache_timeout, (Timer::TimeoutHandler)timeout, this);
+  else
     timer = (Timer *) 0;
-  }
 
   colors = (XColor *) 0;
   ncolors = 0;
@@ -350,10 +346,8 @@ ImageControl::~ImageControl(void) {
     for (; it != end; ++it)
       XFreePixmap(**display, it->pixmap);
   }
-  if (timer) {
-    timer->stop();
+  if (timer)
     delete timer;
-  }
 }