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, 7 insertions, 11 deletions

diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
index c7b2bd05..fb75e20d 100644
--- a/src/gui/itemshortcutwindow.cpp
+++ b/src/gui/itemshortcutwindow.cpp
@@ -44,11 +44,12 @@ ItemShortcutWindow::ItemShortcutWindow()
     setMaxWidth(mItems->getBoxWidth() * mItems->getMaxItems() + border);
     setMaxHeight(mItems->getBoxHeight() * mItems->getMaxItems() + border);
 
-    mInvenScroll = new ScrollArea(mItems);
-    mInvenScroll->setPosition(SCROLL_PADDING, SCROLL_PADDING);
-    mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScrollArea = new ScrollArea(mItems);
+    mScrollArea->setPosition(SCROLL_PADDING, SCROLL_PADDING);
+    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScrollArea->setOpaque(false);
 
-    add(mInvenScroll);
+    add(mScrollArea);
 
     loadWindowState("ItemShortcut");
 }
@@ -56,12 +57,7 @@ ItemShortcutWindow::ItemShortcutWindow()
 ItemShortcutWindow::~ItemShortcutWindow()
 {
     delete mItems;
-    delete mInvenScroll;
-}
-
-void ItemShortcutWindow::logic()
-{
-    Window::logic();
+    delete mScrollArea;
 }
 
 void ItemShortcutWindow::widgetResized(const gcn::Event &event)
@@ -70,7 +66,7 @@ void ItemShortcutWindow::widgetResized(const gcn::Event &event)
 
     const gcn::Rectangle &area = getChildrenArea();
 
-    mInvenScroll->setSize(
+    mScrollArea->setSize(
             area.width - SCROLL_PADDING,
             area.height - SCROLL_PADDING);
 }