Merge branch 'master' into strippedstripped1.1.9.4

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/include/guichan/basiccontainer.hpp
	src/guichan/widgets/window.cpp

1 files changed, 7 insertions, 2 deletions

diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index b79f26226..91b674018 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -118,6 +118,9 @@ ItemContainer::ItemContainer(Inventory *inventory, bool forceQuantity):
     if (!mSelImg)
         logger->log1("Error: Unable to load selection.png");
 
+    mEquipedColor = Theme::getThemeColor(Theme::ITEM_EQUIPPED);
+    mUnEquipedColor = Theme::getThemeColor(Theme::ITEM_NOT_EQUIPPED);
+
     addKeyListener(this);
     addMouseListener(this);
     addWidgetListener(this);
@@ -204,15 +207,16 @@ void ItemContainer::draw(gcn::Graphics *graphics)
                 caption = "Eq.";
 
             if (item->isEquipped())
-                g->setColor(Theme::getThemeColor(Theme::ITEM_EQUIPPED));
+                g->setColor(mEquipedColor);
             else
-                g->setColor(gcn::Color(0, 0, 0));
+                g->setColor(mUnEquipedColor);
 
             g->drawText(caption, itemX + BOX_WIDTH / 2,
                         itemY + BOX_HEIGHT - 14, gcn::Graphics::CENTER);
         }
     }
 
+/*
     // Draw an orange box around the selected item
     if (isFocused() && mHighlightedIndex != -1 && mGridColumns)
     {
@@ -221,6 +225,7 @@ void ItemContainer::draw(gcn::Graphics *graphics)
         g->setColor(gcn::Color(255, 128, 0));
         g->drawRectangle(gcn::Rectangle(itemX, itemY, BOX_WIDTH, BOX_HEIGHT));
     }
+*/
 }
 
 void ItemContainer::selectNone()