From 75906b43ecb9a04fdab365bd8b1a00fbdbc66918 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 3 Oct 2010 19:57:17 +0000 Subject: ui updates, removed impulse and jumpgte g_devel conditions, jumpdrive crash bugfix --- src/client/trademenu.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/client/trademenu.cc') diff --git a/src/client/trademenu.cc b/src/client/trademenu.cc index c0d1f03..f0030f5 100644 --- a/src/client/trademenu.cc +++ b/src/client/trademenu.cc @@ -17,7 +17,7 @@ namespace client { -TradeMenu::TradeMenu(ui::Widget *parent, const char * label) : ui::Window(parent) +TradeMenu::TradeMenu(ui::Widget *parent, const char * label) : ui::Widget(parent) { set_border(false); set_background(false); @@ -188,7 +188,7 @@ void TradeMenu::set_item(ui::ListItem *item) std::ostringstream str; str << "Price: " << std::setw(12) << (amount > 0 ? amount : 1) * trader_item->price() << '\n' - << "Volume: " << std::setw(12) << std::setprecision(2) << (float)(amount > 0 ? amount : 1) * trader_item->info()->volume(); + << "Volume: " << std::setw(12) << (float)(amount > 0 ? amount : 1) * trader_item->info()->volume(); menu_tradertext->set_text(str.str()); } else { menu_msgtext->set_text("^1Can not sell here"); @@ -244,7 +244,7 @@ void TradeMenu::set_item(ui::ListItem *item) std::ostringstream str; str << "Price: " << std::setw(12) << (amount > 0 ? amount : 1) * item->item()->price() << '\n' - << "Volume: " << std::setw(12) << std::setprecision(2) << (float) (amount > 0 ? amount : 1) * item->info()->volume(); + << "Volume: " << std::setw(12) << (float) (amount > 0 ? amount : 1) * item->info()->volume(); menu_tradertext->set_text(str.str()); } @@ -337,7 +337,7 @@ bool TradeMenu::on_emit(Widget *sender, const Event event, void *data) return true; } - return ui::Window::on_emit(sender, event, data); + return ui::Widget::on_emit(sender, event, data); } void TradeMenu::draw() @@ -361,7 +361,7 @@ void TradeMenu::draw() } menu_inventorytext->set_text(str.str()); - Window::draw(); + Widget::draw(); } bool TradeMenu::on_keypress(const int key, const unsigned int modifier) @@ -376,7 +376,7 @@ bool TradeMenu::on_keypress(const int key, const unsigned int modifier) break; } - return Window::on_keypress(key, modifier); + return Widget::on_keypress(key, modifier); } } // namespace client -- cgit v1.2.3