Merged revisions 4031-4044,4046-4058,4061-4062,4064,4066-4067,4069-4070,4072-4079,4082-4092,4094-4097,4099,4101-4109,4112-4115,4117-4129,4131-4150 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r4031 | the_enemy | 2008-04-03 14:53:00 +0200 (Thu, 03 Apr 2008) | 1 line
  
  Tweaked disconnect dialog to fix crash bug id=250
........
  r4050 | b_lindeijer | 2008-04-07 19:37:23 +0200 (Mon, 07 Apr 2008) | 2 lines
  
  Merged changes made for the 0.0.24.1 release (4046:4048 from 0.0.24 branch).
........
  r4066 | b_lindeijer | 2008-04-10 23:48:36 +0200 (Thu, 10 Apr 2008) | 2 lines
  
  Fixed compile warning.
........
  r4076 | b_lindeijer | 2008-04-12 20:36:15 +0200 (Sat, 12 Apr 2008) | 3 lines
  
  Fixed display of item shortcut container. gcn::Widget::setWidth is no longer
  virtual.
........
  r4079 | crush_tmw | 2008-04-14 09:50:25 +0200 (Mon, 14 Apr 2008) | 1 line
  
  Fixed multi-channel image dyeing (patch by fate)
........
  r4096 | b_lindeijer | 2008-04-16 10:39:59 +0200 (Wed, 16 Apr 2008) | 3 lines
  
  Restored the text wrapping in TextBox, since it was based on overriding a
  method that is no longer virtual in Guichan 0.8.0 (gcn::TextBox::setText()).
........
  r4097 | peaveydk | 2008-04-16 13:27:31 +0200 (Wed, 16 Apr 2008) | 1 line
  
  Fix a basic_string::at sometimes being out of range in BrowserBox::draw when checking for line separators.
........
  r4099 | peaveydk | 2008-04-16 13:50:12 +0200 (Wed, 16 Apr 2008) | 1 line
  
  Also fix potential out of range in BrowserBox::draw when checking for color codes.
........
  r4150 | b_lindeijer | 2008-04-20 21:24:33 +0200 (Sun, 20 Apr 2008) | 2 lines
  
  Forgot to remove the sound effects apparently, removed now.
........

1 files changed, 1 insertions, 31 deletions

diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 9c88f8e3..255aa2d8 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -165,14 +165,6 @@ void ScrollArea::logic()
 
 void ScrollArea::draw(gcn::Graphics *graphics)
 {
-    checkPolicies();
-
-    int alpha = getBaseColor().a;
-    gcn::Color highlightColor = getBaseColor() + 0x303030;
-    highlightColor.a = alpha;
-    gcn::Color shadowColor = getBaseColor() - 0x303030;
-    shadowColor.a = alpha;
-
     if (mVBarVisible)
     {
         drawUpButton(graphics);
@@ -198,29 +190,7 @@ void ScrollArea::draw(gcn::Graphics *graphics)
                     mScrollbarWidth));
     }
 
-    gcn::Widget *content = getContent();
-
-    if (content != NULL)
-    {
-        graphics->pushClipArea(getChildrenArea());
-
-        if (content->getFrameSize() > 0)
-        {
-            gcn::Rectangle rec = content->getDimension();
-            rec.x -= content->getFrameSize();
-            rec.y -= content->getFrameSize();
-            rec.width += 2 * content->getFrameSize();
-            rec.height += 2 * content->getFrameSize();
-            graphics->pushClipArea(rec);
-            content->drawFrame(graphics);
-            graphics->popClipArea();
-        }
-
-        graphics->pushClipArea(content->getDimension());
-        content->draw(graphics);
-        graphics->popClipArea();
-        graphics->popClipArea();
-    }
+    drawChildren(graphics);
 }
 
 void ScrollArea::drawFrame(gcn::Graphics *graphics)