Made a label class derived from the guichan label class which utilizes

the palette colors. While technically, this can be accomplished through
other means, it's rather clumsy overall, and is prone to introducing in
programmer errors.

This commit finally catches every case where text is used, and applies
the text color from the color dialog to each of them appropriately.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index caae33c0..bae0b651 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -22,13 +22,12 @@
 
 #include <sstream>
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
 #include "chat.h"
 #include "inventorywindow.h"
 #include "item_amount.h"
 #include "itemcontainer.h"
+#include "label.h"
 #include "scrollarea.h"
 #include "textfield.h"
 #include "trade.h"
@@ -47,7 +46,7 @@
 #include "../utils/stringutils.h"
 
 TradeWindow::TradeWindow(Network *network):
-    Window(_("Trade: You")),
+    Window("Trade"),
     mNetwork(network),
     mMyInventory(new Inventory(INVENTORY_SIZE, 2)),
     mPartnerInventory(new Inventory(INVENTORY_SIZE, 2))
@@ -78,8 +77,8 @@ TradeWindow::TradeWindow(Network *network):
 
     mPartnerScroll = new ScrollArea(mPartnerItemContainer);
 
-    mMoneyLabel = new gcn::Label(strprintf(_("You get %d GP."), 0));
-    mMoneyLabel2 = new gcn::Label(_("You give:"));
+    mMoneyLabel = new Label(strprintf(_("You get %d GP."), 0));
+    mMoneyLabel2 = new Label(_("You give:"));
     mMoneyField = new TextField;
     mMoneyField->setWidth(50);