Numerous things:

* Fixed two non-virtual destructor warnings showing up with GCC 4.
* Fixed OpenGL inventory text drawing that broke in last commit
* Removed glClear cause screen is redrawn completely anyway
* Fixed updating of buttons in inventory window
* Made items.xml be loaded through resource manager.

1 files changed, 2 insertions, 10 deletions

diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index a5c5542f..ad31ada8 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -277,26 +277,18 @@ void ScrollArea::drawRightButton(gcn::Graphics *graphics)
 
 void ScrollArea::drawVBar(gcn::Graphics *graphics)
 {
-    //int x, y;
     gcn::Rectangle dim = getVerticalBarDimension();
-    //getAbsolutePosition(x, y);
-
     graphics->setColor(gcn::Color(0, 0, 0, 32));
     graphics->fillRectangle(dim);
-    //((Graphics*)graphics)->drawImageRect(
-    //        x + dim.x, y + dim.y, dim.width, dim.height, background);
+    graphics->setColor(gcn::Color(255, 255, 255));
 }
 
 void ScrollArea::drawHBar(gcn::Graphics *graphics)
 {
-    //int x, y;
     gcn::Rectangle dim = getHorizontalBarDimension();
-    //getAbsolutePosition(x, y);
-
     graphics->setColor(gcn::Color(0, 0, 0, 32));
     graphics->fillRectangle(dim);
-    //((Graphics*)graphics)->drawImageRect(
-    //        x + dim.x, y + dim.y, dim.width, dim.height, background);
+    graphics->setColor(gcn::Color(255, 255, 255));
 }
 
 void ScrollArea::drawVMarker(gcn::Graphics *graphics)