3 files changed, 12 insertions, 9 deletions
diff --git a/otk/renderstyle.cc b/otk/renderstyle.cc
index 28f4aa2d..a2cfae21 100644
--- a/otk/renderstyle.cc
+++ b/otk/renderstyle.cc
@@ -192,12 +192,12 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
                             data, 8, 8);
   }
   
-  _stick_mask = new PixmapMask();
-  _stick_mask->w = _stick_mask->h = 8;
+  _alldesk_mask = new PixmapMask();
+  _alldesk_mask->w = _alldesk_mask->h = 8;
   {
     //char data[] = { 0x00, 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00, 0x00 };
     char data[] = { 0x00, 0x66, 0x66, 0x00, 0x00, 0x66, 0x66, 0x00 };
-    _stick_mask->mask =
+    _alldesk_mask->mask =
       XCreateBitmapFromData(**display,
                             display->screenInfo(_screen)->rootWindow(),
                             data, 8, 8);
@@ -252,7 +252,7 @@ RenderStyle::~RenderStyle()
 
   delete _max_mask;
   delete _icon_mask;
-  delete _stick_mask;
+  delete _alldesk_mask;
   delete _close_mask;
 }
 
diff --git a/otk/renderstyle.hh b/otk/renderstyle.hh
index 7bebf418..d61c99da 100644
--- a/otk/renderstyle.hh
+++ b/otk/renderstyle.hh
@@ -63,7 +63,7 @@ private:
 
   PixmapMask *_max_mask;
   PixmapMask *_icon_mask;
-  PixmapMask *_stick_mask;
+  PixmapMask *_alldesk_mask;
   PixmapMask *_close_mask;
 
   int _handle_width;
@@ -120,7 +120,7 @@ public:
 
   inline PixmapMask *maximizeMask() const { return _max_mask; }
   inline PixmapMask *iconifyMask() const { return _icon_mask; }
-  inline PixmapMask *stickyMask() const { return _stick_mask; }
+  inline PixmapMask *alldesktopsMask() const { return _alldesk_mask; }
   inline PixmapMask *closeMask() const { return _close_mask; }
   
   inline int handleWidth() const { return _handle_width; }
diff --git a/otk/rendertexture.hh b/otk/rendertexture.hh
index 3a80a45e..8e588558 100644
--- a/otk/rendertexture.hh
+++ b/otk/rendertexture.hh
@@ -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;
   }