set the log domain for each plugin properly

[chaz/openbox] / otk / rendertexture.hh

diff --git a/otk/rendertexture.hh b/otk/rendertexture.hh
index 3a80a45ee8f36072fc0ee49f4c6dd072c120b047..54fbd9c26d3ed480ed9b67519cc3b9077b0f4671 100644 (file)
--- a/otk/rendertexture.hh
+++ b/otk/rendertexture.hh
@@ -70,10 +70,10 @@ public:
   RenderTexture(int screen,
                 bool parent_relative, ReliefType relief, BevelType bevel,
                 bool border, GradientType gradient, bool interlaced,
-                const RenderColor::RGB &color,
-                const RenderColor::RGB &secondary_color,
-                const RenderColor::RGB &border_color,
-                const RenderColor::RGB &interlace_color)
+                const RGB &color,
+                const RGB &secondary_color,
+                const RGB &border_color,
+                const RGB &interlace_color)
     : _screen(screen),
       _parent_relative(parent_relative),
       _relief(relief),
@@ -109,16 +109,19 @@ public:
     }
     
     assert(_relief == Flat || (_bevel_dark_color && _bevel_light_color));
-    assert(!_border || _border_color);
-    assert(!_interlaced || _interlace_color);
+    //assert(!_border || _border_color);
+    //assert(!_interlaced || _interlace_color);
     assert(_color);
+    assert(_secondary_color);
+    assert(_border_color);
+    assert(_interlace_color);
   }
   
   virtual ~RenderTexture() {
     delete _color;
     delete _secondary_color;
     if (_bevel_dark_color) delete _bevel_dark_color;
-     if (_bevel_dark_color) delete _bevel_light_color;
+    if (_bevel_dark_color) delete _bevel_light_color;
     delete _border_color;
     delete _interlace_color;
   }