From 85dccc86bb76ff9e81d92e311da4110d223c7e23 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Thu, 4 Aug 2011 21:09:45 +0000 Subject: Added provisionary close button to map, inventory and trade window, always show the trade window buy button, disable it if approriate. --- src/client/mapwindow.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/client/mapwindow.h') diff --git a/src/client/mapwindow.h b/src/client/mapwindow.h index d65e115..46fd8b1 100644 --- a/src/client/mapwindow.h +++ b/src/client/mapwindow.h @@ -9,6 +9,7 @@ #include "core/entity.h" #include "core/info.h" +#include "ui/iconbutton.h" #include "ui/label.h" #include "ui/modelview.h" #include "ui/scrollpane.h" @@ -33,10 +34,14 @@ public: /// show the map window virtual void show(); +protected: + /// called when the widget receives a key press virtual bool on_keypress(const int key, const unsigned int modifier); -protected: + /// called if the widget receives an emit evet + virtual bool on_emit(Widget *sender, const Event event, void *data); + virtual void resize(); virtual void draw(); @@ -54,6 +59,7 @@ private: ui::ModelView *mapwindow_modelview; ui::Label *mapwindow_targetlabel; ui::ScrollPane *mapwindow_scrollpane; + ui::IconButton *mapwindow_closebutton; const core::Entity *mapwindow_target; -- cgit v1.2.3