Merge lp:~nha/widelands/signals into lp:widelands

[Nicolai Hähnle]

Testing on Windows and Mac OS X wanted!

It's 2011, it should be possible to replace our own homebrew and limited UI::Signal code by using the boost::signals library. The syntax is much nicer and the feature set broader. For example, no "set_id" hacks are needed to identify where a signal is coming from, because you can set that implicitly on connect() time, and multiple signal recipients become possible.

The only gotcha is that boost::signals is not headers-only, so this requires linking with a part of Boost, and that needs to work on all platforms.

For some reason, I have been unable to link boost::signals statically on Debian; it fails with an entirely cryptic error message. That is not a problem of Widelands: even a completely minimalistic test project fails to link statically. So, in this branch, the CMakeLists.txt is set up to link dynamically to Boost. I'd like some feedback on how things work on other platforms and how to deal with it.

[Nicolai Hähnle (nha)]

Note that dynamic linking on Ubuntu 11.04 does work. I don't have access to the other system right now, so I can't reproduce the exact error message. It may just be a problem with the packages on Debian, but it seems that if we default to static linking, we need to at least provide a build-time switch for that.

[SirVer (sirver)]

I will test this on mac os x and report back. I am also pro killing our own signal stuff; in this sweep it would be nice to also get rid of "CallbackButton" and subcalssing Button for clicks and use signals there as well.

[SirVer (sirver)]

okay, this is working on mac os x without any changes. If you want windows testing, you should poke tino directly - I do not think he follows development on launchpad.

Note that we must be a little careful with boost::signal. It is very well suited for replacing our UI Signals but it is said to be very slow. When we use it to signal inside the game logic very often we must take care.

review: Approve

[Tino (tino79)]

I follow, i follow ... ;)

I will test it on windows as soon i have some time at hand, i think tomorrow evening...
But I remember that i tried to compile Boost on win32 and failed horribly...

[Nicolai Hähnle (nha)]

Thank you Tino! I will wait for now until I hear back from you.

I like the idea of replacing Callback_Button and all the sub-classing. The former becomes redundant, and the latter is so terribly hackish.

I would also be careful with this inside the game logic. I stumbled across the issue due to the Observable work, and for that I hope it runs decently enough. Note that there is another potential pitfall with things like boost::signals in the game logic: the order in which slots are called is important. According to the docs, this is more or less clearly defined to be FIFO, but still it might be problematic to mix different versions of Boost across network games, if signals are used in the game logic.

[SirVer (sirver)]

Funny enough I just recently introduced Model and View classes into the UI in my Editor remodel. I am looking forward to replacing them/implementing them with boost::signals. I will wait for the moment till this is merged.

[Tino (tino79)]

Ok, i was able to compile this successfully on windows.
From my side nothing speaks against merging this...

review: Approve

[SirVer (sirver)]

Nicolai, will you merge this or is there something left to be done?

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-11-11 18:31:54 +0000
+++ CMakeLists.txt	2011-11-26 13:22:27 +0000
@@ -108,12 +108,12 @@
 if (WL_UNIT_TESTS)
   message(STATUS "Enabled unit tests")
 
-  set (BUILD_SHARED_LIBS OFF)
-  set (Boost_FIND_COMPONENTS unit_test_framework)
-  set (Boost_USE_STATIC_LIBS   ON)
+  #set (BUILD_SHARED_LIBS OFF)
+  set (Boost_FIND_COMPONENTS unit_test_framework signals)
+  set (Boost_USE_STATIC_LIBS   OFF)
   set (Boost_USE_MULTITHREADED ON)
   set (Boost_DETAILED_FAILURE_MSG ON)
-  find_package(Boost 1.35.0 COMPONENTS unit_test_framework REQUIRED)
+  find_package(Boost 1.35.0 COMPONENTS unit_test_framework signals REQUIRED)
 
   if (NOT DEFINED MSVC)
     string( REGEX MATCH ".a$" BOOST_STATIC_UNIT_TEST_LIB ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
@@ -136,7 +136,11 @@
   )
 else (WL_UNIT_TESTS)
   message(STATUS "Disabled Unit Tests")
-  find_package(Boost 1.35.0 REQUIRED)
+  set (Boost_FIND_COMPONENTS signals)
+  set (Boost_USE_STATIC_LIBS   ON)
+  set (Boost_USE_MULTITHREADED ON)
+  set (Boost_DETAILED_FAILURE_MSG ON)
+  find_package(Boost 1.35.0 COMPONENTS signals REQUIRED)
 endif (WL_UNIT_TESTS)
 
 option (WL_STRICT "If strict compilation mode is requested (almost every warning is an error)" OFF)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2011-09-28 07:37:12 +0000
+++ src/CMakeLists.txt	2011-11-26 13:22:27 +0000
@@ -116,7 +116,8 @@
 target_link_libraries(widelands_all ${GGZ_CORE_LIBRARY})
 target_link_libraries(widelands_all ${OPENGL_gl_LIBRARY})
 target_link_libraries(widelands_all ${GLEW_LIBRARY})
-if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") 
+target_link_libraries(widelands_all ${Boost_LIBRARIES})
+if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
   target_link_libraries(widelands_all ${EXECINFO_LIBRARY})
 endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 

=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc	2011-09-04 17:21:11 +0000
+++ src/editor/editorinteractive.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2003, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2002-2003, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -51,32 +51,38 @@
 m_need_save     (false),
 m_realtime      (WLApplication::get()->get_time()),
 
-#define INIT_BUTTON(picture, name, callback, tooltip)                         \
+#define INIT_BUTTON(picture, name, tooltip)                         \
  TOOLBAR_BUTTON_COMMON_PARAMETERS(name),                                      \
  g_gr->get_picture(PicMod_Game, "pics/" picture ".png"),                      \
- boost::bind(&Editor_Interactive::callback, boost::ref(*this)),               \
  tooltip                                                                      \
 
 m_toggle_main_menu
 	(INIT_BUTTON
-	 	("menu_toggle_menu", "menu", toggle_mainmenu, _("Menu"))),
+	 	("menu_toggle_menu", "menu", _("Menu"))),
 m_toggle_tool_menu
 	(INIT_BUTTON
-	 	("editor_menu_toggle_tool_menu", "tools", tool_menu_btn, _("Tools"))),
+	 	("editor_menu_toggle_tool_menu", "tools", _("Tools"))),
 m_toggle_toolsize_menu
 	(INIT_BUTTON
-	 	("editor_menu_set_toolsize_menu", "toolsize", toolsize_menu_btn,
+	 	("editor_menu_set_toolsize_menu", "toolsize",
 	 	 _("Toolsize"))),
 m_toggle_minimap
 	(INIT_BUTTON
-	 	("menu_toggle_minimap", "minimap", toggle_minimap, _("Minimap"))),
+	 	("menu_toggle_minimap", "minimap", _("Minimap"))),
 m_toggle_buildhelp
 	(INIT_BUTTON
-	 	("menu_toggle_buildhelp", "buildhelp", toggle_buildhelp, _("Buildhelp"))),
+	 	("menu_toggle_buildhelp", "buildhelp", _("Buildhelp"))),
 m_toggle_player_menu
 	(INIT_BUTTON
-	 	("editor_menu_player_menu", "players", toggle_playermenu, _("Players")))
+	 	("editor_menu_player_menu", "players", _("Players")))
 {
+	m_toggle_main_menu.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_mainmenu, this));
+	m_toggle_tool_menu.sigclicked.connect(boost::bind(&Editor_Interactive::tool_menu_btn, this));
+	m_toggle_toolsize_menu.sigclicked.connect(boost::bind(&Editor_Interactive::toolsize_menu_btn, this));
+	m_toggle_minimap.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_minimap, this));
+	m_toggle_buildhelp.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_buildhelp, this));
+	m_toggle_player_menu.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_playermenu, this));
+
 	m_toolbar.set_layout_toplevel(true);
 	m_toolbar.add(&m_toggle_main_menu,       UI::Box::AlignLeft);
 	m_toolbar.add(&m_toggle_tool_menu,       UI::Box::AlignLeft);
@@ -92,7 +98,7 @@
 	set_display_flag(Interactive_Base::dfDebug, true);
 #endif
 
-	fieldclicked.set(this, &Editor_Interactive::map_clicked);
+	fieldclicked.connect(boost::bind(&Editor_Interactive::map_clicked, this));
 }
 
 

=== modified file 'src/editor/editorinteractive.h'
--- src/editor/editorinteractive.h	2010-10-17 19:42:01 +0000
+++ src/editor/editorinteractive.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006-2008 by the Widelands Development Team
+ * Copyright (C) 2002, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -147,12 +147,12 @@
 	UI::UniqueWindow::Registry m_bobmenu;
 	UI::UniqueWindow::Registry m_resourcesmenu;
 
-	UI::Callback_Button m_toggle_main_menu;
-	UI::Callback_Button m_toggle_tool_menu;
-	UI::Callback_Button m_toggle_toolsize_menu;
-	UI::Callback_Button m_toggle_minimap;
-	UI::Callback_Button m_toggle_buildhelp;
-	UI::Callback_Button m_toggle_player_menu;
+	UI::Button m_toggle_main_menu;
+	UI::Button m_toggle_tool_menu;
+	UI::Button m_toggle_toolsize_menu;
+	UI::Button m_toggle_minimap;
+	UI::Button m_toggle_buildhelp;
+	UI::Button m_toggle_player_menu;
 };
 
 #endif

=== modified file 'src/editor/tools/editor_tool.h'
--- src/editor/tools/editor_tool.h	2009-11-22 23:03:13 +0000
+++ src/editor/tools/editor_tool.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2008 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,6 +22,8 @@
 
 #define MAX_TOOL_AREA 9
 
+#include <boost/noncopyable.hpp>
+
 #include "logic/widelands_geometry.h"
 
 struct Editor_Interactive;
@@ -33,7 +35,7 @@
  * one function (like delete_building, place building, modify building are 3
  * tools).
  */
-struct Editor_Tool {
+struct Editor_Tool : boost::noncopyable {
 	Editor_Tool(Editor_Tool & second, Editor_Tool & third) :
 	m_second(second), m_third(third)
 	{}

=== modified file 'src/editor/ui_menus/editor_main_menu.cc'
--- src/editor/ui_menus/editor_main_menu.cc	2010-10-17 19:32:07 +0000
+++ src/editor/ui_menus/editor_main_menu.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -52,45 +52,46 @@
 		(this, "new_map",
 		 hmargin, vmargin + 0 * (height + vspacing), width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Editor_Main_Menu::new_map_btn, boost::ref(*this)),
 		 _("New Map")),
 	m_button_new_random_map
 		(this, "new_random_map",
 		 hmargin, vmargin + 1 * (height + vspacing), width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Editor_Main_Menu::new_random_map_btn, boost::ref(*this)),
 		 _("New Random Map")),
 	m_button_load_map
 		(this, "load_map",
 		 hmargin, vmargin + 2 * (height + vspacing), width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Editor_Main_Menu::load_btn, boost::ref(*this)),
 		 _("Load Map")),
 	m_button_save_map
 		(this, "save_map",
 		 hmargin, vmargin + 3 * (height + vspacing), width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Editor_Main_Menu::save_btn, boost::ref(*this)),
 		 _("Save Map")),
 	m_button_map_options
 		(this, "map_options",
 		 hmargin, vmargin + 4 * (height + vspacing), width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Editor_Main_Menu::map_options_btn, boost::ref(*this)),
 		 _("Map Options")),
 	m_button_view_readme
 		(this, "readme",
 		 hmargin, vmargin + 5 * (height + vspacing), width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Editor_Main_Menu::readme_btn, boost::ref(*this)),
 		 _("View Readme")),
 	m_button_exit_editor
 		(this, "exit",
 		 hmargin, vmargin + 6 * (height + vspacing), width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Editor_Main_Menu::exit_btn, boost::ref(*this)),
 		 _("Exit Editor"))
 {
+	m_button_new_map.sigclicked.connect(boost::bind(&Editor_Main_Menu::new_map_btn, this));
+	m_button_new_random_map.sigclicked.connect(boost::bind(&Editor_Main_Menu::new_random_map_btn, this));
+	m_button_load_map.sigclicked.connect(boost::bind(&Editor_Main_Menu::load_btn, this));
+	m_button_save_map.sigclicked.connect(boost::bind(&Editor_Main_Menu::save_btn, this));
+	m_button_map_options.sigclicked.connect(boost::bind(&Editor_Main_Menu::map_options_btn, this));
+	m_button_view_readme.sigclicked.connect(boost::bind(&Editor_Main_Menu::readme_btn, this));
+	m_button_exit_editor.sigclicked.connect(boost::bind(&Editor_Main_Menu::exit_btn, this));
+
 	// Put in the default position, if necessary
 	if (get_usedefaultpos())
 		center_to_parent();

=== modified file 'src/editor/ui_menus/editor_main_menu.h'
--- src/editor/ui_menus/editor_main_menu.h	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_main_menu.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2008-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2008-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -33,13 +33,13 @@
 
 private:
 	Editor_Interactive & eia();
-	UI::Callback_Button m_button_new_map;
-	UI::Callback_Button m_button_new_random_map;
-	UI::Callback_Button m_button_load_map;
-	UI::Callback_Button m_button_save_map;
-	UI::Callback_Button m_button_map_options;
-	UI::Callback_Button m_button_view_readme;
-	UI::Callback_Button m_button_exit_editor;
+	UI::Button m_button_new_map;
+	UI::Button m_button_new_random_map;
+	UI::Button m_button_load_map;
+	UI::Button m_button_save_map;
+	UI::Button m_button_map_options;
+	UI::Button m_button_view_readme;
+	UI::Button m_button_exit_editor;
 
 	UI::UniqueWindow::Registry m_window_readme;
 

=== modified file 'src/editor/ui_menus/editor_main_menu_load_map.cc'
--- src/editor/ui_menus/editor_main_menu_load_map.cc	2010-11-03 01:04:47 +0000
+++ src/editor/ui_menus/editor_main_menu_load_map.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -59,8 +59,8 @@
 		(this,
 		 posx, posy,
 		 get_inner_w() / 2 - spacing, get_inner_h() - spacing - offsy - 40);
-	m_ls->selected.set(this, &Main_Menu_Load_Map::selected);
-	m_ls->double_clicked.set(this, &Main_Menu_Load_Map::double_clicked);
+	m_ls->selected.connect(boost::bind(&Main_Menu_Load_Map::selected, this, _1));
+	m_ls->double_clicked.connect(boost::bind(&Main_Menu_Load_Map::double_clicked, this, _1));
 
 	posx = get_inner_w() / 2 + spacing;
 	posy += 20;
@@ -113,21 +113,21 @@
 	posx = 5;
 	posy = get_inner_h() - 30;
 
-	m_ok_btn = new UI::Callback_Button
+	m_ok_btn = new UI::Button
 		(this, "ok",
 		 get_inner_w() / 2 - spacing - 80, posy, 80, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Main_Menu_Load_Map::clicked_ok, boost::ref(*this)),
 		 _("OK"),
 		 std::string(),
 		 false);
+	m_ok_btn->sigclicked.connect(boost::bind(&Main_Menu_Load_Map::clicked_ok, this));
 
-	new UI::Callback_Button
+	UI::Button * cancelbtn = new UI::Button
 		(this, "cancel",
 		 get_inner_w() / 2 + spacing, posy, 80, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Main_Menu_Load_Map::die, boost::ref(*this)),
 		 _("Cancel"));
+	cancelbtn->sigclicked.connect(boost::bind(&Main_Menu_Load_Map::die, this));
 
 	m_basedir = "maps";
 	m_curdir  = "maps";

=== modified file 'src/editor/ui_menus/editor_main_menu_load_map.h'
--- src/editor/ui_menus/editor_main_menu_load_map.h	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_main_menu_load_map.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006, 2008-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006, 2008-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,11 +26,10 @@
 
 struct Editor_Interactive;
 namespace UI {
-struct EditBox;
+struct Button;
 template <typename T> struct Listselect;
 struct Textarea;
 struct Multiline_Textarea;
-struct Callback_Button;
 };
 
 /**
@@ -49,7 +48,7 @@
 	UI::Textarea * m_name, * m_author, * m_size, * m_world, * m_nrplayers;
 	UI::Multiline_Textarea * m_descr;
 	UI::Listselect<const char *> * m_ls;
-	UI::Callback_Button * m_ok_btn;
+	UI::Button * m_ok_btn;
 
 	std::string m_basedir;
 	std::string m_curdir;

=== modified file 'src/editor/ui_menus/editor_main_menu_map_options.cc'
--- src/editor/ui_menus/editor_main_menu_map_options.cc	2010-04-24 20:03:07 +0000
+++ src/editor/ui_menus/editor_main_menu_map_options.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -36,20 +36,6 @@
 }
 
 
-Main_Menu_Map_Options::Enable_Set_Origin_Tool_Button::
-Enable_Set_Origin_Tool_Button(Main_Menu_Map_Options & parent)
-	:
-	UI::Button
-		(&parent, "set_origin",
-		 5, parent.get_inner_h() - 25, parent.get_inner_w() - 10, 20,
-		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 _("Set origin"),
-		 _
-		 	("Set the position that will have the coordinates (0, 0). This will "
-		 	 "be the top-left corner of a generated minimap."))
-{}
-
-
 /**
  * Create all the buttons etc...
 */
@@ -58,8 +44,7 @@
 	UI::Window
 		(&parent, "map_options",
 		 (parent.get_w() - 200) / 2, (parent.get_h() - 300) / 2, 200, 305,
-		 _("Map Options")),
-	m_enable_set_origin_tool(*this)
+		 _("Map Options"))
 {
 
 	int32_t const offsx   =  5;
@@ -74,8 +59,8 @@
 			(this,
 			 posx + ta->get_w() + spacing, posy,
 			 get_inner_w() - (posx + ta->get_w() + spacing) - spacing, 20,
-			 g_gr->get_picture(PicMod_UI, "pics/but1.png"), 0);
-	m_name->changedid.set(this, &Main_Menu_Map_Options::changed);
+			 g_gr->get_picture(PicMod_UI, "pics/but1.png"));
+	m_name->changed.connect(boost::bind(&Main_Menu_Map_Options::changed, this, 0));
 	posy += height + spacing;
 	ta = new UI::Textarea(this, posx, posy - 2, _("Size:"));
 	m_size =
@@ -97,8 +82,8 @@
 			(this,
 			 posx + ta->get_w() + spacing, posy,
 			 get_inner_w() - (posx + ta->get_w() + spacing) - spacing, 20,
-			 g_gr->get_picture(PicMod_UI, "pics/but1.png"), 1);
-	m_author->changedid.set(this, &Main_Menu_Map_Options::changed);
+			 g_gr->get_picture(PicMod_UI, "pics/but1.png"));
+	m_author->changed.connect(boost::bind(&Main_Menu_Map_Options::changed, this, 1));
 	posy += height + spacing;
 	m_descr =
 		new UI::Multiline_Editbox
@@ -106,7 +91,22 @@
 			 posx, posy,
 			 get_inner_w() - spacing - posx, get_inner_h() - 25 - spacing - posy,
 			 parent.egbase().map().get_description());
-	m_descr->changed.set(this, &Main_Menu_Map_Options::editbox_changed);
+	m_descr->changed.connect(boost::bind(&Main_Menu_Map_Options::editbox_changed, this));
+
+	UI::Button * btn =
+		new UI::Button
+			(this, "set_origin",
+			 5, get_inner_h() - 25, get_inner_w() - 10, 20,
+			 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
+			 _("Set origin"),
+			 _
+				("Set the position that will have the coordinates (0, 0). This will "
+				 "be the top-left corner of a generated minimap."));
+	btn->sigclicked.connect
+		(boost::bind
+		 (&Editor_Interactive::select_tool, &parent,
+		  boost::ref(parent.tools.set_origin), Editor_Tool::First));
+
 	update();
 }
 
@@ -149,10 +149,3 @@
 void Main_Menu_Map_Options::editbox_changed() {
 	eia().egbase().map().set_description(m_descr->get_text().c_str());
 }
-
-
-void Main_Menu_Map_Options::Enable_Set_Origin_Tool_Button::clicked() {
-	Editor_Interactive & eia =
-		ref_cast<Main_Menu_Map_Options, UI::Panel>(*get_parent()).eia();
-	eia.select_tool(eia.tools.set_origin, Editor_Tool::First);
-}

=== modified file 'src/editor/ui_menus/editor_main_menu_map_options.h'
--- src/editor/ui_menus/editor_main_menu_map_options.h	2009-11-30 21:33:46 +0000
+++ src/editor/ui_menus/editor_main_menu_map_options.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -45,10 +45,6 @@
 	UI::Multiline_Editbox * m_descr;
 	UI::Textarea * m_world, * m_nrplayers, * m_size;
 	UI::EditBox * m_name, * m_author;
-	struct Enable_Set_Origin_Tool_Button : UI::Button {
-		Enable_Set_Origin_Tool_Button(Main_Menu_Map_Options &);
-		void clicked();
-	} m_enable_set_origin_tool;
 	void update();
 };
 

=== modified file 'src/editor/ui_menus/editor_main_menu_new_map.cc'
--- src/editor/ui_menus/editor_main_menu_new_map.cc	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_main_menu_new_map.cc	2011-11-26 13:22:27 +0000
@@ -65,19 +65,19 @@
 		(buffer, sizeof(buffer), _("Width: %u"), Widelands::MAP_DIMENSIONS[m_w]);
 	m_width = new UI::Textarea(this, posx + spacing + 20, posy, buffer);
 
-	new UI::Callback_Button
+	UI::Button * widthupbtn = new UI::Button
 		(this, "width_up",
 		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Main_Menu_New_Map::button_clicked, boost::ref(*this), 0));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
+	widthupbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 0));
 
-	new UI::Callback_Button
+	UI::Button * widthdownbtn = new UI::Button
 		(this, "width_down",
 		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
-		 boost::bind(&Main_Menu_New_Map::button_clicked, boost::ref(*this), 1));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
+	widthdownbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 1));
 
 	posy += 20 + spacing + spacing;
 
@@ -86,19 +86,19 @@
 		 _("Height: %u"), Widelands::MAP_DIMENSIONS[m_h]);
 	m_height = new UI::Textarea(this, posx + spacing + 20, posy, buffer);
 
-	new UI::Callback_Button
+	UI::Button * heightupbtn = new UI::Button
 		(this, "height_up",
 		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Main_Menu_New_Map::button_clicked, boost::ref(*this), 2));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
+	heightupbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 2));
 
-	new UI::Callback_Button
+	UI::Button * heightdownbtn = new UI::Button
 		(this, "height_down",
 		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
-		 boost::bind(&Main_Menu_New_Map::button_clicked, boost::ref(*this), 3));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
+	heightdownbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 3));
 
 	posy += 20 + spacing + spacing;
 
@@ -108,21 +108,21 @@
 	while (strcmp(map.get_world_name(), m_worlds[m_currentworld].c_str()))
 		++m_currentworld;
 
-	m_world = new UI::Callback_Button
+	m_world = new UI::Button
 		(this, "world",
 		 posx, posy, width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Main_Menu_New_Map::button_clicked, boost::ref(*this), 4),
 		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
+	m_world->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 4));
 
 	posy += height + spacing + spacing + spacing;
 
-	new UI::Callback_Button
+	UI::Button * createbtn = new UI::Button
 		(this, "create_map",
 		 posx, posy, width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Main_Menu_New_Map::clicked_create_map, boost::ref(*this)),
 		 _("Create Map"));
+	createbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::clicked_create_map, this));
 
 	posy += height + spacing;
 }

=== modified file 'src/editor/ui_menus/editor_main_menu_new_map.h'
--- src/editor/ui_menus/editor_main_menu_new_map.h	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_main_menu_new_map.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,7 +26,7 @@
 
 struct Editor_Interactive;
 namespace UI {
-struct Callback_Button;
+struct Button;
 struct Textarea;
 }
 
@@ -40,7 +40,7 @@
 
 private:
 	UI::Textarea * m_width, * m_height;
-	UI::Callback_Button * m_world;
+	UI::Button * m_world;
 	int32_t m_w, m_h;
 	std::vector<std::string>::size_type m_currentworld;
 	std::vector<std::string> m_worlds;

=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc'
--- src/editor/ui_menus/editor_main_menu_random_map.cc	2010-11-01 22:30:23 +0000
+++ src/editor/ui_menus/editor_main_menu_random_map.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -74,9 +74,9 @@
 			(this,
 			 posx, posy,
 			 width, 20,
-			 g_gr->get_picture(PicMod_UI, "pics/but1.png"), 0);
-	m_nrEditbox->changed.set
-		(this, & Main_Menu_New_Random_Map::nr_edit_box_changed);
+			 g_gr->get_picture(PicMod_UI, "pics/but1.png"));
+	m_nrEditbox->changed.connect
+		(boost::bind(&Main_Menu_New_Random_Map::nr_edit_box_changed, this));
 	RNG rng;
 	rng.seed(clock());
 	rng.rand();
@@ -98,19 +98,21 @@
 		for (m_h = 0; Widelands::MAP_DIMENSIONS[m_h] < map_extent.h; ++m_h) {}
 	}
 
-	new UI::Callback_Button
+	UI::Button * widthupbtn = new UI::Button
 		(this, "width_up",
 		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), MAP_W_PLUS));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
+	widthupbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, MAP_W_PLUS));
 
-	new UI::Callback_Button
+	UI::Button * widthdownbtn = new UI::Button
 		(this, "width_down",
 		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), MAP_W_MINUS));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
+	widthdownbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, MAP_W_MINUS));
 
 	snprintf
 		(buffer, sizeof(buffer), _("Width: %u"), Widelands::MAP_DIMENSIONS[m_w]);
@@ -126,38 +128,42 @@
 		 _("Height: %u"), Widelands::MAP_DIMENSIONS[m_h]);
 	m_height = new UI::Textarea(this, posx + spacing + 20, posy, buffer);
 
-	new UI::Callback_Button
+	UI::Button * heightupbtn = new UI::Button
 		(this, "height_up",
 		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), MAP_H_PLUS));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
+	heightupbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, MAP_H_PLUS));
 
-	new UI::Callback_Button
+	UI::Button * heightdownbtn = new UI::Button
 		(this, "height_down",
 		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), MAP_H_MINUS));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
+	heightdownbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, MAP_H_MINUS));
 
 	posy += 20 + spacing + spacing;
 
 
 	// ---------- Water -----------
 
-	new UI::Callback_Button
+	UI::Button * waterupbtn = new UI::Button
 		(this, "water_up",
 		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), WATER_PLUS));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
+	waterupbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, WATER_PLUS));
 
-	new UI::Callback_Button
+	UI::Button * waterdownbtn = new UI::Button
 		(this, "water_down",
 		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), WATER_MINUS));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
+	waterdownbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, WATER_MINUS));
 
 	snprintf(buffer, sizeof(buffer), _("Water: %u %%"), m_waterval);
 	m_water = new UI::Textarea(this, posx + spacing + 20, posy, buffer);
@@ -168,19 +174,21 @@
 
 	// ---------- Land -----------
 
-	new UI::Callback_Button
+	UI::Button * landupbtn = new UI::Button
 		(this, "land_up",
 		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), LAND_PLUS));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
+	landupbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, LAND_PLUS));
 
-	new UI::Callback_Button
+	UI::Button * landdownbtn = new UI::Button
 		(this, "land_down",
 		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), LAND_MINUS));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
+	landdownbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, LAND_MINUS));
 
 	snprintf
 		(buffer, sizeof(buffer), _("Land: %u %%"), m_landval);
@@ -192,19 +200,21 @@
 
 	// ---------- Wasteland -----------
 
-	new UI::Callback_Button
+	UI::Button * wastelandupbtn = new UI::Button
 		(this, "wasteland_up",
 		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), WASTE_PLUS));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
+	wastelandupbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, WASTE_PLUS));
 
-	new UI::Callback_Button
+	UI::Button * wastelanddownbtn = new UI::Button
 		(this, "wasteland_down",
 		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), WASTE_MINUS));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
+	wastelanddownbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, WASTE_MINUS));
 
 	snprintf
 		(buffer, sizeof(buffer), _("Wasteland: %u %%"), m_wastelandval);
@@ -230,9 +240,8 @@
 	Point pos(get_inner_w() - spacing - 20, posy);
 	m_island_mode = new UI::Checkbox(this, pos);
 	m_island_mode->set_state(true);
-	m_island_mode->set_id(SWITCH_ISLAND_MODE);
-	m_island_mode->changed.set
-		(this, & Main_Menu_New_Random_Map::nr_edit_box_changed);
+	m_island_mode->changed.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, SWITCH_ISLAND_MODE));
 
 	new UI::Textarea(this, posx, posy, _("Island mode:"));
 	posy += height + spacing;
@@ -250,12 +259,12 @@
 
 	m_res_amount = 2;
 
-	m_res = new UI::Callback_Button
+	m_res = new UI::Button
 		(this, "resources",
 		 posx, posy, width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), SWITCH_RES),
 		 m_res_amounts[m_res_amount].c_str());
+	m_res->sigclicked.connect(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, SWITCH_RES));
 
 	posy += height + spacing + spacing + spacing;
 
@@ -269,12 +278,13 @@
 	while (strcmp(map.get_world_name(), m_worlds[m_currentworld].c_str()))
 		++m_currentworld;
 
-	m_world = new UI::Callback_Button
+	m_world = new UI::Button
 		(this, "world",
 		 posx, posy, width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), SWITCH_WORLD),
 		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
+	m_world->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, SWITCH_WORLD));
 
 	posy += height + spacing + spacing + spacing;
 
@@ -290,29 +300,31 @@
 			(this,
 			 posx, posy,
 			 width, 20,
-			 g_gr->get_picture(PicMod_UI, "pics/but1.png"), 0);
+			 g_gr->get_picture(PicMod_UI, "pics/but1.png"));
 	m_idEditbox->setText("abcd-efgh-ijkl-mnop");
-	m_idEditbox->changed.set
-		(this, & Main_Menu_New_Random_Map::id_edit_box_changed);
+	m_idEditbox->changed.connect
+		(boost::bind(&Main_Menu_New_Random_Map::id_edit_box_changed, this));
 	posy += height + spacing + spacing + spacing;
 
 
 
 	// ---------- Players -----------
 
-	new UI::Callback_Button
+	UI::Button * playerupbtn = new UI::Button
 		(this, "player_up",
 		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), PLAYER_PLUS));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
+	playerupbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, PLAYER_PLUS));
 
-	new UI::Callback_Button
+	UI::Button * playerdownbtn = new UI::Button
 		(this, "player_down",
 		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::button_clicked, boost::ref(*this), PLAYER_MINUS));
+		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
+	playerdownbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, PLAYER_MINUS));
 
 	snprintf(buffer, sizeof(buffer), _("Players: %u"), m_pn);
 	m_players = new UI::Textarea(this, posx + spacing + 20, posy, buffer);
@@ -323,12 +335,12 @@
 
 	// ---------- "Generate Map" button ----------
 
-	m_goButton = new UI::Callback_Button
+	m_goButton = new UI::Button
 		(this, "generate_map",
 		 posx, posy, width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Main_Menu_New_Random_Map::clicked_create_map, boost::ref(*this)),
 		 _("Generate Map"));
+	m_goButton->sigclicked.connect(boost::bind(&Main_Menu_New_Random_Map::clicked_create_map, this));
 	posy += height + spacing;
 
 	set_inner_size(get_inner_w(), posy);

=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.h'
--- src/editor/ui_menus/editor_main_menu_random_map.h	2010-11-05 19:36:57 +0000
+++ src/editor/ui_menus/editor_main_menu_random_map.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -65,10 +65,10 @@
 private:
 	UI::Textarea * m_width, * m_height, * m_land;
 	UI::Textarea * m_water, * m_mountains, * m_wasteland, * m_players;
-	UI::Callback_Button * m_res;
-	UI::Callback_Button * m_world;
+	UI::Button * m_res;
+	UI::Button * m_world;
 	UI::Checkbox * m_island_mode;
-	UI::Callback_Button * m_goButton;
+	UI::Button * m_goButton;
 	int32_t m_w, m_h, m_landval, m_waterval, m_wastelandval;
 	uint8_t m_pn;
 	uint32_t m_mapNumber;

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map.cc'
--- src/editor/ui_menus/editor_main_menu_save_map.cc	2010-11-03 01:04:47 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -65,17 +65,16 @@
 			(this,
 			 posx, posy,
 			 get_inner_w() / 2 - spacing, get_inner_h() - spacing - offsy - 60);
-	m_ls->clicked       .set(this, &Main_Menu_Save_Map::       clicked_item);
-	m_ls->double_clicked.set(this, &Main_Menu_Save_Map::double_clicked_item);
+	m_ls->clicked.connect(boost::bind(&Main_Menu_Save_Map::clicked_item, this, _1));
+	m_ls->double_clicked.connect(boost::bind(&Main_Menu_Save_Map::double_clicked_item, this, _1));
 	m_editbox =
 		new UI::EditBox
 			(this,
 			 posx, posy + get_inner_h() - spacing - offsy - 60 + 3,
 			 get_inner_w() / 2 - spacing, 20,
-			 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-			 0);
+			 g_gr->get_picture(PicMod_UI, "pics/but1.png"));
 	m_editbox->setText(parent.egbase().map().get_name());
-	m_editbox->changed.set(this, &Main_Menu_Save_Map::edit_box_changed);
+	m_editbox->changed.connect(boost::bind(&Main_Menu_Save_Map::edit_box_changed, this));
 
 	posx = get_inner_w() / 2 + spacing;
 	posy += 20;
@@ -128,26 +127,27 @@
 	posx = 5;
 	posy = get_inner_h() - 30;
 
-	m_ok_btn = new UI::Callback_Button
+	m_ok_btn = new UI::Button
 		(this, "ok",
 		 get_inner_w() / 2 - spacing - 80, posy, 80, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Main_Menu_Save_Map::clicked_ok, boost::ref(*this)),
 		 _("OK"));
+	m_ok_btn->sigclicked.connect(boost::bind(&Main_Menu_Save_Map::clicked_ok, boost::ref(*this)));
 
-	new UI::Callback_Button
+	UI::Button * cancelbtn = new UI::Button
 		(this, "cancel",
 		 get_inner_w() / 2 + spacing, posy, 80, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Main_Menu_Save_Map::die, boost::ref(*this)),
 		 _("Cancel"));
+	cancelbtn->sigclicked.connect(boost::bind(&Main_Menu_Save_Map::die, boost::ref(*this)));
 
-	new UI::Callback_Button
+	UI::Button * make_directorybtn = new UI::Button
 		(this, "make_directory",
 		 spacing, posy, 120, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Main_Menu_Save_Map::clicked_make_directory, boost::ref(*this)),
 		 _("Make Directory"));
+	make_directorybtn->sigclicked.connect
+		(boost::bind(&Main_Menu_Save_Map::clicked_make_directory, boost::ref(*this)));
 
 
 	m_basedir = "maps";

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map.h'
--- src/editor/ui_menus/editor_main_menu_save_map.h	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map.h	2011-11-26 13:22:27 +0000
@@ -26,7 +26,7 @@
 
 struct Editor_Interactive;
 namespace UI {
-struct Callback_Button;
+struct Button;
 struct EditBox;
 template <typename T> struct Listselect;
 struct Multiline_Textarea;
@@ -54,7 +54,7 @@
 	UI::Textarea * m_name, * m_author, * m_size, * m_world, * m_nrplayers;
 	UI::Multiline_Textarea * m_descr;
 	UI::Listselect<const char *> * m_ls;
-	UI::Callback_Button * m_ok_btn;
+	UI::Button * m_ok_btn;
 
 	std::string   m_basedir;
 	std::string   m_curdir;

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc'
--- src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc	2011-11-20 12:32:35 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc	2011-11-26 13:22:27 +0000
@@ -42,29 +42,31 @@
 	m_edit =
 		new UI::EditBox
 			(this, spacing, posy, get_inner_w() - 2 * spacing, 20,
-			 g_gr->get_picture(PicMod_UI, "pics/but1.png"), 0);
+			 g_gr->get_picture(PicMod_UI, "pics/but1.png"));
 	m_edit->setText(dirname);
 	m_dirname = dirname;
-	m_edit->changed.set(this, &Main_Menu_Save_Map_Make_Directory::edit_changed);
+	m_edit->changed.connect(boost::bind(&Main_Menu_Save_Map_Make_Directory::edit_changed, this));
 
 	posy = get_inner_h() - 30;
 
 	m_ok_button = new
-		UI::Callback_Button
+		UI::Button
 		(this, "ok",
 		 get_inner_w() / 2 - spacing - 80, posy, 80, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Main_Menu_Save_Map_Make_Directory::end_modal, boost::ref(*this), 1),
 		 _("OK"),
 		 std::string(),
 		 m_dirname.size());
+	m_ok_button->sigclicked.connect
+		(boost::bind(&Main_Menu_Save_Map_Make_Directory::end_modal, boost::ref(*this), 1));
 
-	new UI::Callback_Button
+	UI::Button * cancelbtn = new UI::Button
 		(this, "cancel",
 		 get_inner_w() / 2 + spacing, posy, 80, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Main_Menu_Save_Map_Make_Directory::end_modal, boost::ref(*this), 0),
 		 _("Cancel"));
+	cancelbtn->sigclicked.connect
+		(boost::bind(&Main_Menu_Save_Map_Make_Directory::end_modal, boost::ref(*this), 0));
 
 	center_to_parent();
 }

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map_make_directory.h'
--- src/editor/ui_menus/editor_main_menu_save_map_make_directory.h	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map_make_directory.h	2011-11-26 13:22:27 +0000
@@ -27,7 +27,7 @@
 
 namespace UI {
 struct EditBox;
-struct Callback_Button;
+struct Button;
 }
 
 /**
@@ -44,7 +44,7 @@
 private:
 	std::string               m_dirname;
 	UI::EditBox             * m_edit;
-	UI::Callback_Button * m_ok_button;
+	UI::Button * m_ok_button;
 	void edit_changed();
 };
 

=== modified file 'src/editor/ui_menus/editor_player_menu.cc'
--- src/editor/ui_menus/editor_player_menu.cc	2011-03-19 15:09:21 +0000
+++ src/editor/ui_menus/editor_player_menu.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -45,7 +45,6 @@
 		 5, 5, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Editor_Player_Menu::clicked_add_player, boost::ref(*this)),
 		 _("Add player"),
 		 parent.egbase().map().get_nrplayers() < MAX_PLAYERS),
 	m_remove_last_player
@@ -53,10 +52,13 @@
 		 get_inner_w() - 5 - 20, 5, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
-		 boost::bind(&Editor_Player_Menu::clicked_remove_last_player, boost::ref(*this)),
 		 _("Remove last player"),
 		 1 < parent.egbase().map().get_nrplayers())
 {
+	m_add_player.sigclicked.connect(boost::bind(&Editor_Player_Menu::clicked_add_player, boost::ref(*this)));
+	m_remove_last_player.sigclicked.connect
+		(boost::bind(&Editor_Player_Menu::clicked_remove_last_player, boost::ref(*this)));
+
 	int32_t const spacing = 5;
 	int32_t const width   = 20;
 	int32_t       posy    = 0;
@@ -138,21 +140,22 @@
 			m_plr_names[p - 1] =
 				new UI::EditBox
 					(this, posx, posy, 140, size,
-					 g_gr->get_picture(PicMod_UI, "pics/but0.png"), p - 1);
-			m_plr_names[p - 1]->changedid.set
-				(this, &Editor_Player_Menu::name_changed);
+					 g_gr->get_picture(PicMod_UI, "pics/but0.png"));
+			m_plr_names[p - 1]->changed.connect
+				(boost::bind(&Editor_Player_Menu::name_changed, this, p - 1));
 			posx += 140 + spacing;
 			m_plr_names[p - 1]->setText(map.get_scenario_player_name(p));
 		}
 
 		if (!m_plr_set_tribes_buts[p - 1]) {
 			m_plr_set_tribes_buts[p - 1] =
-				new UI::Callback_Button
+				new UI::Button
 					(this, "tribe",
 					 posx, posy, 140, size,
 					 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-					 boost::bind(&Editor_Player_Menu::player_tribe_clicked, boost::ref(*this), p - 1),
 					 std::string());
+			m_plr_set_tribes_buts[p - 1]->sigclicked.connect
+				(boost::bind(&Editor_Player_Menu::player_tribe_clicked, boost::ref(*this), p - 1));
 			posx += 140 + spacing;
 		}
 		if (map.get_scenario_player_tribe(p) != "<undefined>")
@@ -170,13 +173,14 @@
 		//  Set Starting pos button.
 		if (!m_plr_set_pos_buts[p - 1]) {
 			m_plr_set_pos_buts[p - 1] =
-				new UI::Callback_Button
+				new UI::Button
 					(this, "starting_pos",
 					 posx, posy, size, size,
 					 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-					 g_gr->get_no_picture(), //  set below
-					 boost::bind(&Editor_Player_Menu::set_starting_pos_clicked, boost::ref(*this), p),
+					 g_gr->get_no_picture(),
 					 std::string());
+			m_plr_set_pos_buts[p - 1]->sigclicked.connect
+				(boost::bind(&Editor_Player_Menu::set_starting_pos_clicked, boost::ref(*this), p));
 			posx += size + spacing;
 		}
 		char text[] = "pics/fsel_editor_set_player_00_pos.png";

=== modified file 'src/editor/ui_menus/editor_player_menu.h'
--- src/editor/ui_menus/editor_player_menu.h	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_player_menu.h	2011-11-26 13:22:27 +0000
@@ -35,7 +35,7 @@
 namespace UI {
 struct Textarea;
 struct EditBox;
-struct Callback_Button;
+struct Button;
 }
 
 struct Editor_Player_Menu : public UI::UniqueWindow {
@@ -47,9 +47,9 @@
 	UI::UniqueWindow::Registry m_allow_buildings_menu;
 	UI::Textarea * m_nr_of_players_ta;
 	UI::EditBox * m_plr_names[MAX_PLAYERS];
-	UI::Callback_Button
+	UI::Button
 		m_add_player, m_remove_last_player;
-	UI::Callback_Button
+	UI::Button
 		* m_plr_make_infrastructure_buts[MAX_PLAYERS],
 		* m_plr_set_pos_buts            [MAX_PLAYERS],
 		* m_plr_set_tribes_buts         [MAX_PLAYERS];

=== modified file 'src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.cc'
--- src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.cc	2010-10-17 19:32:07 +0000
+++ src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2008, 2010 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2008, 2010-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -80,7 +80,6 @@
 		 + (list_height - middle_button_height * 2 - vspacing) / 2,
 		 middle_button_width, middle_button_height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::clicked, boost::ref(*this), false),
 		 ("->"),
 		 _("Forbid"),
 		 false),
@@ -90,21 +89,23 @@
 		 m_forbid_button.get_y() + middle_button_height + vspacing,
 		 middle_button_width, middle_button_height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::clicked, boost::ref(*this), true),
 		 _("<-"),
 		 _("Allow"),
 		 false)
 {
-	m_allowed.selected.set
-		(this, &Editor_Player_Menu_Allowed_Buildings_Menu::allowed_selected);
-	m_allowed.double_clicked.set
-		(this,
-		 &Editor_Player_Menu_Allowed_Buildings_Menu::allowed_double_clicked);
-	m_forbidden.selected.set
-		(this, &Editor_Player_Menu_Allowed_Buildings_Menu::forbidden_selected);
-	m_forbidden.double_clicked.set
-		(this, &Editor_Player_Menu_Allowed_Buildings_Menu::
-		 forbidden_double_clicked);
+	m_forbid_button.sigclicked.connect
+		(boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::clicked, boost::ref(*this), false));
+	m_allow_button.sigclicked.connect
+		(boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::clicked, boost::ref(*this), true));
+
+	m_allowed.selected.connect
+		(boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::allowed_selected, this, _1));
+	m_allowed.double_clicked.connect
+		(boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::allowed_double_clicked, this, _1));
+	m_forbidden.selected.connect
+		(boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::forbidden_selected, this, _1));
+	m_forbidden.double_clicked.connect
+		(boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::forbidden_double_clicked, this, _1));
 
 	Widelands::Tribe_Descr const & tribe = player.tribe();
 	Building_Index const nr_buildings = tribe.get_nrbuildings();

=== modified file 'src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.h'
--- src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.h	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.h	2011-11-26 13:22:27 +0000
@@ -43,7 +43,7 @@
 	Widelands::Player & m_player;
 	UI::Textarea              m_allowed_label, m_forbidden_label;
 	UI::Listselect<Widelands::Building_Index> m_allowed, m_forbidden;
-	UI::Callback_Button   m_forbid_button, m_allow_button;
+	UI::Button   m_forbid_button, m_allow_button;
 	void allowed_selected        (uint32_t);
 	void forbidden_selected      (uint32_t);
 	void allowed_double_clicked  (uint32_t);

=== modified file 'src/editor/ui_menus/editor_tool_change_height_options_menu.cc'
--- src/editor/ui_menus/editor_tool_change_height_options_menu.cc	2010-10-17 19:32:07 +0000
+++ src/editor/ui_menus/editor_tool_change_height_options_menu.cc	2011-11-26 13:22:27 +0000
@@ -50,7 +50,6 @@
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Editor_Tool_Change_Height_Options_Menu::clicked_change_by_increment, boost::ref(*this)),
 		 std::string(),
 		 increase_tool.get_change_by() < MAX_FIELD_HEIGHT_DIFF),
 	m_change_by_decrease
@@ -59,7 +58,6 @@
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
-		 boost::bind(&Editor_Tool_Change_Height_Options_Menu::clicked_change_by_decrement, boost::ref(*this)),
 		 std::string(),
 		 1 < increase_tool.get_change_by()),
 	m_change_by_value
@@ -86,7 +84,6 @@
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Editor_Tool_Change_Height_Options_Menu::clicked_setto_increment, boost::ref(*this)),
 		 std::string(),
 		 increase_tool.set_tool().get_interval().min < MAX_FIELD_HEIGHT),
 	m_set_to_decrease
@@ -94,7 +91,6 @@
 		 m_change_by_decrease.get_x(), m_set_to_increase.get_y(), width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
-		 boost::bind(&Editor_Tool_Change_Height_Options_Menu::clicked_setto_decrement, boost::ref(*this)),
 		 std::string(),
 		 0 < increase_tool.set_tool().get_interval().min),
 	m_set_to_value
@@ -103,6 +99,17 @@
 		 m_change_by_value.get_w(), height,
 		 UI::Align_BottomCenter)
 {
+	m_change_by_increase.sigclicked.connect
+		(boost::bind
+		 (&Editor_Tool_Change_Height_Options_Menu::clicked_change_by_increment, boost::ref(*this)));
+	m_change_by_decrease.sigclicked.connect
+		(boost::bind
+		 (&Editor_Tool_Change_Height_Options_Menu::clicked_change_by_decrement, boost::ref(*this)));
+	m_set_to_increase.sigclicked.connect
+		(boost::bind(&Editor_Tool_Change_Height_Options_Menu::clicked_setto_increment, boost::ref(*this)));
+	m_set_to_decrease.sigclicked.connect
+		(boost::bind(&Editor_Tool_Change_Height_Options_Menu::clicked_setto_decrement, boost::ref(*this)));
+
 	m_change_by_increase.set_repeating(true);
 	m_change_by_decrease.set_repeating(true);
 	m_set_to_increase   .set_repeating(true);

=== modified file 'src/editor/ui_menus/editor_tool_change_height_options_menu.h'
--- src/editor/ui_menus/editor_tool_change_height_options_menu.h	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_tool_change_height_options_menu.h	2011-11-26 13:22:27 +0000
@@ -39,10 +39,10 @@
 private:
 	Editor_Increase_Height_Tool & m_increase_tool;
 	UI::Textarea                  m_change_by_label;
-	UI::Callback_Button       m_change_by_increase, m_change_by_decrease;
+	UI::Button       m_change_by_increase, m_change_by_decrease;
 	UI::Textarea                  m_change_by_value;
 	UI::Textarea                  m_set_to_label;
-	UI::Callback_Button       m_set_to_increase, m_set_to_decrease;
+	UI::Button       m_set_to_increase, m_set_to_decrease;
 	UI::Textarea                  m_set_to_value;
 
 	void clicked_change_by_decrement();

=== modified file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/editor_tool_change_resources_options_menu.cc	2010-11-06 16:31:40 +0000
+++ src/editor/ui_menus/editor_tool_change_resources_options_menu.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -52,21 +52,13 @@
 		 m_change_by_label.get_y() + m_change_by_label.get_h() + spacing(),
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_up.png"),
-		 boost::bind
-			(&Editor_Tool_Change_Resources_Options_Menu::clicked_button,
-			 boost::ref(*this),
-			 Change_By_Increase)),
+		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_up.png")),
 	m_change_by_decrease
 		(this, "decr_change_by",
 		 get_inner_w() - hmargin() - width, m_change_by_increase.get_y(),
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png"),
-		 boost::bind
-			(&Editor_Tool_Change_Resources_Options_Menu::clicked_button,
-			 boost::ref(*this),
-			 Change_By_Decrease)),
+		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png")),
 	m_change_by_value
 		(this,
 		 m_change_by_increase.get_x() + m_change_by_increase.get_w() +
@@ -89,20 +81,12 @@
 		 hmargin(), m_set_to_label.get_y() + m_set_to_label.get_h() + vspacing(),
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_up.png"),
-		 boost::bind
-			(&Editor_Tool_Change_Resources_Options_Menu::clicked_button,
-			 boost::ref(*this),
-			 Set_To_Increase)),
+		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_up.png")),
 	m_set_to_decrease
 		(this, "decr_set_to",
 		 m_change_by_decrease.get_x(), m_set_to_increase.get_y(), width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png"),
-		 boost::bind
-			(&Editor_Tool_Change_Resources_Options_Menu::clicked_button,
-			 boost::ref(*this),
-			 Set_To_Decrease)),
+		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png")),
 	m_set_to_value
 		(this,
 		 m_change_by_value.get_x(), m_set_to_increase.get_y(),
@@ -111,6 +95,27 @@
 	m_cur_selection(this, 0, 0, _("Current Selection"), UI::Align_BottomCenter),
 	m_increase_tool(increase_tool)
 {
+	m_change_by_increase.sigclicked.connect
+		(boost::bind
+			(&Editor_Tool_Change_Resources_Options_Menu::clicked_button,
+			 boost::ref(*this),
+			 Change_By_Increase));
+	m_change_by_decrease.sigclicked.connect
+		(boost::bind
+			(&Editor_Tool_Change_Resources_Options_Menu::clicked_button,
+			 boost::ref(*this),
+			 Change_By_Decrease));
+	m_set_to_increase.sigclicked.connect
+		(boost::bind
+			(&Editor_Tool_Change_Resources_Options_Menu::clicked_button,
+			 boost::ref(*this),
+			 Set_To_Increase));
+	m_set_to_decrease.sigclicked.connect
+		(boost::bind
+			(&Editor_Tool_Change_Resources_Options_Menu::clicked_button,
+			 boost::ref(*this),
+			 Set_To_Decrease));
+
 	m_change_by_increase.set_repeating(true);
 	m_change_by_decrease.set_repeating(true);
 	m_set_to_increase   .set_repeating(true);
@@ -136,10 +141,10 @@
 		/
 		(resource_pic_max_width + spacing());
 
-	m_radiogroup.changed.set
-		(this, &Editor_Tool_Change_Resources_Options_Menu::selected);
-	m_radiogroup.clicked.set
-		(this, &Editor_Tool_Change_Resources_Options_Menu::selected);
+	m_radiogroup.changed.connect
+		(boost::bind(&Editor_Tool_Change_Resources_Options_Menu::selected, this));
+	m_radiogroup.clicked.connect
+		(boost::bind(&Editor_Tool_Change_Resources_Options_Menu::selected, this));
 
 	uint32_t cur_x = 0;
 	Point pos

=== modified file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.h'
--- src/editor/ui_menus/editor_tool_change_resources_options_menu.h	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_tool_change_resources_options_menu.h	2011-11-26 13:22:27 +0000
@@ -46,10 +46,10 @@
 	void clicked_button(Button);
 	void update();
 	UI::Textarea                     m_change_by_label;
-	UI::Callback_Button          m_change_by_increase, m_change_by_decrease;
+	UI::Button          m_change_by_increase, m_change_by_decrease;
 	UI::Textarea                     m_change_by_value;
 	UI::Textarea                     m_set_to_label;
-	UI::Callback_Button          m_set_to_increase,    m_set_to_decrease;
+	UI::Button          m_set_to_increase,    m_set_to_decrease;
 	UI::Textarea                     m_set_to_value;
 	UI::Textarea                     m_cur_selection;
 	UI::Radiogroup m_radiogroup;

=== modified file 'src/editor/ui_menus/editor_tool_menu.cc'
--- src/editor/ui_menus/editor_tool_menu.cc	2010-04-24 20:03:07 +0000
+++ src/editor/ui_menus/editor_tool_menu.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -84,8 +84,8 @@
 			 0);
 	}
 
-	m_radioselect.changed.set(this, &Editor_Tool_Menu::changed_to);
-	m_radioselect.clicked.set(this, &Editor_Tool_Menu::changed_to);
+	m_radioselect.changed.connect(boost::bind(&Editor_Tool_Menu::changed_to, this));
+	m_radioselect.clicked.connect(boost::bind(&Editor_Tool_Menu::changed_to, this));
 
 	if (get_usedefaultpos())
 		center_to_parent();

=== modified file 'src/editor/ui_menus/editor_tool_noise_height_options_menu.cc'
--- src/editor/ui_menus/editor_tool_noise_height_options_menu.cc	2010-11-01 15:03:31 +0000
+++ src/editor/ui_menus/editor_tool_noise_height_options_menu.cc	2011-11-26 13:22:27 +0000
@@ -59,7 +59,6 @@
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_lower_increase, boost::ref(*this)),
 		 std::string(),
 		 noise_tool.get_interval().min < MAX_FIELD_HEIGHT),
 	m_lower_decrease
@@ -69,7 +68,6 @@
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"),
-		 boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_lower_decrease, boost::ref(*this)),
 		 std::string(),
 		 0 < noise_tool.get_interval().min),
 	m_upper_increase
@@ -82,7 +80,6 @@
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"),
-		 boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_upper_increase, boost::ref(*this)),
 		 std::string(),
 		 noise_tool.get_interval().max < MAX_FIELD_HEIGHT),
 	m_upper_decrease
@@ -92,7 +89,6 @@
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
 		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png"),
-		 boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_upper_decrease, boost::ref(*this)),
 		 std::string(),
 		 0 < noise_tool.get_interval().max),
 	m_setto_increase
@@ -102,7 +98,6 @@
 		 width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_up.png"),
-		 boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_setto_increase, boost::ref(*this)),
 		 std::string(),
 		 noise_tool.set_tool().get_interval().max < MAX_FIELD_HEIGHT),
 	m_setto_decrease
@@ -110,7 +105,6 @@
 		 get_inner_w() / 2, m_setto_increase.get_y(), width, height,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png"),
-		 boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_setto_decrease, boost::ref(*this)),
 		 std::string(),
 		 0 < noise_tool.set_tool().get_interval().min),
 	m_set_label
@@ -120,6 +114,19 @@
 		 get_inner_w() - 2 * hspacing(), height,
 		 UI::Align_BottomCenter)
 {
+	m_lower_increase.sigclicked.connect
+		(boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_lower_increase, boost::ref(*this)));
+	m_lower_decrease.sigclicked.connect
+		(boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_lower_decrease, boost::ref(*this)));
+	m_upper_increase.sigclicked.connect
+		(boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_upper_increase, boost::ref(*this)));
+	m_upper_decrease.sigclicked.connect
+		(boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_upper_decrease, boost::ref(*this)));
+	m_setto_increase.sigclicked.connect
+		(boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_setto_increase, boost::ref(*this)));
+	m_setto_decrease.sigclicked.connect
+		(boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_setto_decrease, boost::ref(*this)));
+
 	m_lower_increase.set_repeating(true);
 	m_lower_decrease.set_repeating(true);
 	m_upper_increase.set_repeating(true);

=== modified file 'src/editor/ui_menus/editor_tool_noise_height_options_menu.h'
--- src/editor/ui_menus/editor_tool_noise_height_options_menu.h	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_tool_noise_height_options_menu.h	2011-11-26 13:22:27 +0000
@@ -37,7 +37,7 @@
 private:
 	Editor_Noise_Height_Tool & m_noise_tool;
 	UI::Textarea m_lower_label, m_upper_label;
-	UI::Callback_Button
+	UI::Button
 		m_lower_increase, m_lower_decrease, m_upper_increase, m_upper_decrease,
 		m_setto_increase, m_setto_decrease;
 	UI::Textarea m_set_label;

=== modified file 'src/editor/ui_menus/editor_tool_place_bob_options_menu.cc'
--- src/editor/ui_menus/editor_tool_place_bob_options_menu.cc	2010-05-24 18:57:38 +0000
+++ src/editor/ui_menus/editor_tool_place_bob_options_menu.cc	2011-11-26 13:22:27 +0000
@@ -46,7 +46,8 @@
 Editor_Tool_Options_Menu(parent, registry, 100, 100, _("Bobs Menu")),
 
 m_tabpanel          (this, 0, 0, g_gr->get_picture(PicMod_UI, "pics/but1.png")),
-m_pit               (pit)
+m_pit               (pit),
+m_click_recursion_protect(false)
 {
 	int32_t const space  =  5;
 	Widelands::World const & world = parent.egbase().map().world();
@@ -96,9 +97,8 @@
 			 critter_descr ? critter_descr->descname() : std::string());
 
 		cb.set_desired_size(width, height);
-		cb.set_id(i);
 		cb.set_state(m_pit.is_enabled(i));
-		cb.changedtoid.set(this, &Editor_Tool_Place_Bob_Options_Menu::clicked);
+		cb.changedto.connect(boost::bind(&Editor_Tool_Place_Bob_Options_Menu::clicked, this, i, _1));
 		m_checkboxes.push_back(&cb);
 		box->add(&cb, UI::Align_Left);
 		box->add_space(space);
@@ -117,6 +117,9 @@
 void Editor_Tool_Place_Bob_Options_Menu::clicked
 	(int32_t const n, bool const t)
 {
+	if (m_click_recursion_protect)
+		return;
+
 	//  FIXME This code is erroneous. It checks the current key state. What it
 	//  FIXME needs is the key state at the time the mouse was clicked. See the
 	//  FIXME usage comment for get_key_state.
@@ -129,22 +132,14 @@
 
 	if (not multiselect) {
 		for (uint32_t i = 0; m_pit.get_nr_enabled(); ++i) m_pit.enable(i, false);
+
 		//  disable all checkboxes
-		//  TODO The uint32_t cast is ugly!
-		for
-			(uint32_t i = 0;
-			 i < m_checkboxes.size();
-			 ++i, i += i == static_cast<uint32_t>(n))
-			{
-				m_checkboxes[i]->changedtoid.set
-					(this,
-					 static_cast
-					 <void (Editor_Tool_Place_Bob_Options_Menu::*)(int32_t, bool)>
-					 (0));
+		m_click_recursion_protect = true;
+		for (uint32_t i = 0; i < m_checkboxes.size(); ++i) {
+			if (i != static_cast<uint32_t>(n))
 				m_checkboxes[i]->set_state(false);
-				m_checkboxes[i]->changedtoid.set
-					(this, &Editor_Tool_Place_Bob_Options_Menu::clicked);
-			}
+		}
+		m_click_recursion_protect = false;
 	}
 
 	m_pit.enable(n, t);

=== modified file 'src/editor/ui_menus/editor_tool_place_bob_options_menu.h'
--- src/editor/ui_menus/editor_tool_place_bob_options_menu.h	2009-09-30 18:31:29 +0000
+++ src/editor/ui_menus/editor_tool_place_bob_options_menu.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2008 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -40,6 +40,7 @@
 	std::vector<UI::Checkbox *> m_checkboxes;
 	Editor_Place_Bob_Tool     & m_pit;
 	void clicked(int32_t, bool);
+	bool m_click_recursion_protect;
 };
 
 #endif

=== modified file 'src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc'
--- src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc	2010-11-01 22:30:23 +0000
+++ src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc	2011-11-26 13:22:27 +0000
@@ -44,7 +44,8 @@
 :
 Editor_Tool_Options_Menu(parent, registry, 100, 100, _("Immovable Bobs Menu")),
 m_tabpanel(this, 0, 0, g_gr->get_picture(PicMod_UI, "pics/but1.png")),
-m_pit     (pit)
+m_pit     (pit),
+m_click_recursion_protect(false)
 {
 	int32_t const space  =  5;
 	Widelands::World const & world = parent.egbase().map().world();
@@ -94,10 +95,9 @@
 			 	(PicMod_Game, world.get_immovable_descr(i)->get_picture()));
 
 		cb.set_desired_size(width, height);
-		cb.set_id(i);
 		cb.set_state(m_pit.is_enabled(i));
-		cb.changedtoid.set
-			(this, &Editor_Tool_Place_Immovable_Options_Menu::clicked);
+		cb.changedto.connect
+			(boost::bind(&Editor_Tool_Place_Immovable_Options_Menu::clicked, this, i, _1));
 		m_checkboxes.push_back(&cb);
 		box->add(&cb, UI::Align_Left);
 		box->add_space(space);
@@ -118,7 +118,11 @@
 /**
  * Called when one of the state boxes is toggled
 */
-void Editor_Tool_Place_Immovable_Options_Menu::clicked(int32_t n, bool t) {
+void Editor_Tool_Place_Immovable_Options_Menu::clicked(int32_t n, bool t)
+{
+	if (m_click_recursion_protect)
+		return;
+
 	//  FIXME This code is erroneous. It checks the current key state. What it
 	//  FIXME needs is the key state at the time the mouse was clicked. See the
 	//  FIXME usage comment for get_key_state.
@@ -131,20 +135,13 @@
 			for (uint32_t i = 0; m_pit.get_nr_enabled(); ++i)
 				m_pit.enable(i, false);
 			//  Disable all checkboxes
-			const uint32_t size = m_checkboxes.size();
-			//TODO: the uint32_t cast is ugly!
-			for (uint32_t i = 0; i < size; ++i, i += i == static_cast<uint32_t>(n))
-			{
-				m_checkboxes[i]->changedtoid.set
-					(this,
-					 static_cast
-					 <void (Editor_Tool_Place_Immovable_Options_Menu::*)
-					 (int32_t, bool)>
-					 (0));
-				m_checkboxes[i]->set_state(false);
-				m_checkboxes[i]->changedtoid.set
-					(this, &Editor_Tool_Place_Immovable_Options_Menu::clicked);
+			const int32_t size = m_checkboxes.size();
+			m_click_recursion_protect = true;
+			for (int32_t i = 0; i < size; ++i) {
+				if (i != n)
+					m_checkboxes[i]->set_state(false);
 			}
+			m_click_recursion_protect = false;
 		}
 
 		m_pit.enable(n, t);

=== modified file 'src/editor/ui_menus/editor_tool_place_immovable_options_menu.h'
--- src/editor/ui_menus/editor_tool_place_immovable_options_menu.h	2010-03-30 00:28:31 +0000
+++ src/editor/ui_menus/editor_tool_place_immovable_options_menu.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2008, 2010 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2008, 2010-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -44,6 +44,7 @@
 	UI::Tab_Panel m_tabpanel;
 	Editor_Place_Immovable_Tool & m_pit;
 	void clicked(int32_t, bool);
+	bool m_click_recursion_protect;
 };
 
 #endif

=== modified file 'src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc'
--- src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc	2010-11-27 13:30:37 +0000
+++ src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -45,7 +45,8 @@
 	:
 	Editor_Tool_Options_Menu(parent, registry, 0, 0, _("Terrain Select")),
 	m_cur_selection         (this, 0, 0, 0, 20, UI::Align_Center),
-	m_tool                  (tool)
+	m_tool                  (tool),
+	m_select_recursion_protect(false)
 {
 	Widelands::World & world = parent.egbase().map().world();
 	Widelands::Terrain_Index const nr_terrains = world.get_nr_terrains();
@@ -155,10 +156,9 @@
 
 			UI::Checkbox & cb = *new UI::Checkbox(this, pos, picture);
 			cb.set_size(TEXTURE_WIDTH + 1, TEXTURE_HEIGHT + 1);
-			cb.set_id(i);
 			cb.set_state(m_tool.is_enabled(i));
-			cb.changedtoid.set
-				(this, &Editor_Tool_Set_Terrain_Options_Menu::selected);
+			cb.changedto.connect
+				(boost::bind(&Editor_Tool_Set_Terrain_Options_Menu::selected, this, i, _1));
 			m_checkboxes[i] = &cb;
 
 			pos.x += TEXTURE_WIDTH + hspacing();
@@ -193,6 +193,9 @@
 void Editor_Tool_Set_Terrain_Options_Menu::selected
 	(int32_t const n, bool const t)
 {
+	if (m_select_recursion_protect)
+		return;
+
 	//  FIXME This code is erroneous. It checks the current key state. What it
 	//  FIXME needs is the key state at the time the mouse was clicked. See the
 	//  FIXME usage comment for get_key_state.
@@ -205,22 +208,13 @@
 			for (uint32_t i = 0; m_tool.get_nr_enabled(); ++i)
 				m_tool.enable(i, false);
 			//  disable all checkboxes
-			const uint32_t size = m_checkboxes.size();
-			//TODO: the uint32_t cast is ugly!
-			for
-				(uint32_t i = 0; i < size;
-				 ++i, i += i == static_cast<uint32_t>(n))
-			{
-				m_checkboxes[i]->changedtoid.set
-					(this,
-					 static_cast
-					 	<void (Editor_Tool_Set_Terrain_Options_Menu::*)
-					 	(int32_t, bool)>
-					 	(0));
-				m_checkboxes[i]->set_state(false);
-				m_checkboxes[i]->changedtoid.set
-					(this, &Editor_Tool_Set_Terrain_Options_Menu::selected);
+			m_select_recursion_protect = true;
+			const int32_t size = m_checkboxes.size();
+			for (int32_t i = 0; i < size; ++i) {
+				if (i != n)
+					m_checkboxes[i]->set_state(false);
 			}
+			m_select_recursion_protect = false;
 		}
 
 		m_tool.enable(n, t);

=== modified file 'src/editor/ui_menus/editor_tool_set_terrain_options_menu.h'
--- src/editor/ui_menus/editor_tool_set_terrain_options_menu.h	2009-12-10 21:52:37 +0000
+++ src/editor/ui_menus/editor_tool_set_terrain_options_menu.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -43,6 +43,7 @@
 	Editor_Set_Terrain_Tool   & m_tool;
 	void selected(int32_t, bool);
 	std::vector<UI::Checkbox *> m_checkboxes;
+	bool m_select_recursion_protect;
 };
 
 

=== modified file 'src/editor/ui_menus/editor_toolsize_menu.cc'
--- src/editor/ui_menus/editor_toolsize_menu.cc	2010-10-17 19:32:07 +0000
+++ src/editor/ui_menus/editor_toolsize_menu.cc	2011-11-26 13:22:27 +0000
@@ -44,7 +44,6 @@
 		 60, 25, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
 		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_up.png"),
-		 boost::bind(&Editor_Toolsize_Menu::increase_radius, boost::ref(*this)),
 		 std::string(),
 		 parent.get_sel_radius() < MAX_TOOL_AREA),
 	m_decrease
@@ -52,10 +51,12 @@
 		 80, 25, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
 		 g_gr->get_picture(PicMod_Game, "pics/scrollbar_down.png"),
-		 boost::bind(&Editor_Toolsize_Menu::decrease_radius, boost::ref(*this)),
 		 std::string(),
 		 0 < parent.get_sel_radius())
 {
+	m_increase.sigclicked.connect(boost::bind(&Editor_Toolsize_Menu::increase_radius, boost::ref(*this)));
+	m_decrease.sigclicked.connect(boost::bind(&Editor_Toolsize_Menu::decrease_radius, boost::ref(*this)));
+
 	m_increase.set_repeating(true);
 	m_decrease.set_repeating(true);
 	update(parent.get_sel_radius());

=== modified file 'src/editor/ui_menus/editor_toolsize_menu.h'
--- src/editor/ui_menus/editor_toolsize_menu.h	2010-10-17 19:42:01 +0000
+++ src/editor/ui_menus/editor_toolsize_menu.h	2011-11-26 13:22:27 +0000
@@ -39,7 +39,7 @@
 	void increase_radius();
 
 	UI::Textarea                                   m_textarea;
-	UI::Callback_Button m_increase, m_decrease;
+	UI::Button m_increase, m_decrease;
 };
 
 

=== modified file 'src/logic/constructionsite.cc'
--- src/logic/constructionsite.cc	2011-11-06 14:51:46 +0000
+++ src/logic/constructionsite.cc	2011-11-26 13:22:27 +0000
@@ -24,7 +24,6 @@
 #include "upcast.h"
 #include "wexception.h"
 
-#include "ui_basic/object.h" //only needed for i18n function _()
 #include "graphic/animation.h"
 #include "economy/wares_queue.h"
 #include "game.h"

=== modified file 'src/logic/dismantlesite.cc'
--- src/logic/dismantlesite.cc	2011-11-06 23:12:36 +0000
+++ src/logic/dismantlesite.cc	2011-11-26 13:22:27 +0000
@@ -31,7 +31,6 @@
 #include "i18n.h"
 #include "sound/sound_handler.h"
 #include "tribe.h"
-#include "ui_basic/object.h" //only needed for i18n function _()
 #include "worker.h"
 
 #include "dismantlesite.h"

=== modified file 'src/network/nethost.cc'
--- src/network/nethost.cc	2011-11-07 21:55:54 +0000
+++ src/network/nethost.cc	2011-11-26 13:22:27 +0000
@@ -2627,7 +2627,7 @@
 		++part;
 		if (part % 100 == 0)
 			sendSystemChat
-				(_("Sending part %u/%lu of file %s to %s"),
+				(_("Sending part %u/%zu of file %s to %s"),
 				 part, file->parts.size() + 1,
 				 file->filename.c_str(),
 				 d->settings.users.at(client.usernum).name.c_str());

=== modified file 'src/scripting/lua_ui.cc'
--- src/scripting/lua_ui.cc	2011-11-20 17:06:28 +0000
+++ src/scripting/lua_ui.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -632,7 +632,7 @@
 int L_MapView::click(lua_State * L) {
 	get()->warp_mouse_to_node
 		((*get_user_class<LuaMap::L_Field>(L, 2))->coords());
-	get()->fieldclicked.call();
+	get()->fieldclicked();
 	return 0;
 }
 

=== modified file 'src/ui_basic/box.cc'
--- src/ui_basic/box.cc	2011-11-09 20:16:07 +0000
+++ src/ui_basic/box.cc	2011-11-26 13:22:27 +0000
@@ -25,6 +25,7 @@
 #include "scrollbar.h"
 
 #include <algorithm>
+#include <boost/bind.hpp>
 
 namespace UI {
 /**
@@ -177,7 +178,7 @@
 			m_scrollbar = new Scrollbar
 					(this, sb_x, sb_y, sb_w,
 					 sb_h, m_orientation == Horizontal);
-			m_scrollbar->moved.set(this, &Box::scrollbar_moved);
+			m_scrollbar->moved.connect(boost::bind(&Box::scrollbar_moved, this, _1));
 		} else {
 			m_scrollbar->set_pos(Point(sb_x, sb_y));
 			m_scrollbar->set_size(sb_w, sb_h);

=== modified file 'src/ui_basic/button.cc'
--- src/ui_basic/button.cc	2011-09-28 09:00:23 +0000
+++ src/ui_basic/button.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2002, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -267,6 +267,7 @@
 			if (m_time_nextact < time)
 				m_time_nextact = time;
 			play_click();
+			sigclicked();
 			clicked();
 			//  The button may not exist at this point (for example if the button
 			//  closed the dialog that it is part of). So member variables may no
@@ -322,6 +323,7 @@
 		update();
 		if (m_highlighted && m_enabled) {
 			play_click();
+			sigclicked();
 			clicked();
 			//  The button may not exist at this point (for example if the button
 			//  closed the dialog that it is part of). So member variables may no

=== modified file 'src/ui_basic/button.h'
--- src/ui_basic/button.h	2011-11-05 21:32:08 +0000
+++ src/ui_basic/button.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006, 2008-2010 by the Widelands Development Team
+ * Copyright (C) 2002, 2006, 2008-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,10 +22,10 @@
 
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
+#include <boost/signal.hpp>
 
 #include "constants.h"
 #include "panel.h"
-#include "m_signal.h"
 
 #include "rgbcolor.h"
 
@@ -86,8 +86,10 @@
 	// If no background is drawn, the button is drawn over the current background
 	void set_draw_flat_background(bool set);
 
+	boost::signal<void ()> sigclicked;
+
 protected:
-	virtual void clicked() = 0; /// Override this to react on the click.
+	virtual void clicked() {} /// Override this to react on the click.
 
 	bool        m_highlighted;    //  mouse is over the button
 	bool        m_pressed;        //  mouse is clicked over the button
@@ -110,55 +112,6 @@
 	bool        m_draw_caret;
 };
 
-
-/// A verion of Button that uses a function object for the callback.
-struct Callback_Button : public Button {
-	Callback_Button /// for textual buttons
-		(Panel * const parent,
-		 std::string const & name,
-		 const int32_t x, const int32_t y, const uint32_t w, const uint32_t h,
-		 const PictureID background_pictute_id,
-		 boost::function<void()> callback_function,
-		 const std::string & title_text,
-		 std::string const & tooltip_text = std::string(),
-		 bool const _enabled = true,
-		 bool const flat     = false)
-		:
-		Button
-			(parent, name,
-			 x, y, w, h,
-			 background_pictute_id,
-			 title_text,
-			 tooltip_text,
-			 _enabled, flat),
-		_callback_function     (callback_function)
-	{}
-	Callback_Button /// for pictorial buttons
-		(Panel * const parent,
-		 std::string const & name,
-		 const int32_t x, const int32_t y, const uint32_t w, const uint32_t h,
-		 const PictureID background_pictute_id,
-		 const PictureID foreground_picture_id,
-		 boost::function<void()> callback_function,
-		 std::string const & tooltip_text = std::string(),
-		 bool const _enabled = true,
-		 bool const flat     = false)
-		:
-		Button
-			(parent, name,
-			 x, y, w, h,
-			 background_pictute_id,
-			 foreground_picture_id,
-			 tooltip_text,
-			 _enabled, flat),
-		_callback_function     (callback_function)
-	{}
-
-protected:
-	boost::function<void()> _callback_function;
-	void clicked() {_callback_function();}
-};
-
-}
+} // namespace UI
 
 #endif

=== modified file 'src/ui_basic/checkbox.cc'
--- src/ui_basic/checkbox.cc	2011-11-06 12:22:20 +0000
+++ src/ui_basic/checkbox.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2002, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -50,8 +50,6 @@
 	} else
 		m_pic_graphics =
 			g_gr->get_picture(PicMod_UI, "pics/checkbox_light_new.png");
-
-	m_id = -1;
 }
 
 
@@ -93,9 +91,8 @@
 void Statebox::set_state(bool const on) {
 	if (on xor ((m_flags & Is_Checked) > 1)) {
 		set_flags(Is_Checked, on);
-		changed    .call        ();
-		changedto  .call      (on);
-		changedtoid.call(m_id, on);
+		changed();
+		changedto(on);
 		update();
 	}
 }
@@ -168,7 +165,7 @@
  */
 void Checkbox::clicked()
 {
-	clickedto.call(!get_state());
+	clickedto(!get_state());
 	set_state(!get_state());
 	play_click();
 }

=== modified file 'src/ui_basic/checkbox.h'
--- src/ui_basic/checkbox.h	2009-09-30 18:31:29 +0000
+++ src/ui_basic/checkbox.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2008 by the Widelands Development Team
+ * Copyright (C) 2004, 2006, 2008-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,8 +20,9 @@
 #ifndef UI_CHECKBOX_H
 #define UI_CHECKBOX_H
 
+#include <boost/signals.hpp>
+
 #include "panel.h"
-#include "m_signal.h"
 
 #include "rgbcolor.h"
 
@@ -42,17 +43,15 @@
 		 std::string const & tooltip_text = std::string());
 	~Statebox();
 
-	Signal changed;
-	Signal1<bool> changedto;
-	Signal1<bool> clickedto; // same as changedto but only called when clicked
-	Signal2<int32_t, bool> changedtoid;
+	boost::signal<void ()> changed;
+	boost::signal<void (bool)> changedto;
+	boost::signal<void (bool)> clickedto; // same as changedto but only called when clicked
 
 	void set_enabled(bool enabled);
 
 	bool get_state() const throw () {return m_flags & Is_Checked;}
 	void set_state(bool on);
 
-	void set_id(int32_t n) {m_id = n;}
 	void set_owns_custom_picture() throw () {
 		assert(m_flags & Has_Custom_Picture);
 		set_flags(Owns_Custom_Picture, true);
@@ -68,7 +67,6 @@
 private:
 	virtual void clicked() = 0;
 
-	int32_t  m_id;
 	enum Flags {
 		Is_Highlighted      = 0x01,
 		Is_Enabled          = 0x02,

=== modified file 'src/ui_basic/editbox.cc'
--- src/ui_basic/editbox.cc	2011-10-23 16:18:19 +0000
+++ src/ui_basic/editbox.cc	2011-11-26 13:22:27 +0000
@@ -44,9 +44,6 @@
 	/// Background tile style.
 	PictureID background;
 
-	/// ID. Only used for the id-flavoured signals.
-	int32_t id;
-
 	/// Maximum number of characters in the input
 	uint32_t maxLength;
 
@@ -67,7 +64,6 @@
 	(Panel * const parent,
 	 const int32_t x, const int32_t y, const uint32_t w, const uint32_t h,
 	 const PictureID & background,
-	 const int32_t id,
 	 Align _align)
 	:
 	Panel(parent, x, y, w, h),
@@ -82,7 +78,6 @@
 	m->fontsize = UI_FONT_SIZE_SMALL;
 	m->fontcolor = UI_FONT_CLR_FG;
 
-	m->id = id;
 	m->align = static_cast<Align>((_align & Align_Horizontal) | Align_VCenter);
 	m->caret = 0;
 	m->scrolloffset = 0;
@@ -230,8 +225,7 @@
 	if (down) {
 		switch (code.sym) {
 		case SDLK_ESCAPE:
-			cancel.call();
-			cancelid.call(m->id);
+			cancel();
 			return true;
 
 		case SDLK_KP_ENTER:
@@ -245,8 +239,7 @@
 					m_history_position = -1;
 				}
 			}
-			ok.call();
-			okid.call(m->id);
+			ok();
 			return true;
 
 		case SDLK_KP_PERIOD:
@@ -267,8 +260,7 @@
 					m->text.erase(m->text.begin() + m->caret);
 				m->text.erase(m->text.begin() + m->caret);
 				check_caret();
-				changed.call();
-				changedid.call(m->id);
+				changed();
 				update();
 			}
 			return true;
@@ -419,8 +411,7 @@
 				(m->text.begin() + m->caret++, ((code.unicode & 0x3f) | 0x80));
 		}
 		check_caret();
-		changed.call();
-		changedid.call(m->id);
+		changed();
 		update();
 	}
 }

=== modified file 'src/ui_basic/editbox.h'
--- src/ui_basic/editbox.h	2011-10-23 16:18:19 +0000
+++ src/ui_basic/editbox.h	2011-11-26 13:22:27 +0000
@@ -24,6 +24,7 @@
 #include "button.h"
 
 #include <boost/scoped_ptr.hpp>
+#include <boost/signal.hpp>
 #include <SDL_keyboard.h>
 
 #define CHAT_HISTORY_SIZE 5
@@ -41,16 +42,12 @@
 		 int32_t x, int32_t y, uint32_t w, uint32_t h,
 		 PictureID const & background =
 		 	g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-		 int32_t id = 0,
 		 Align align = Align_Center);
 	virtual ~EditBox();
 
-	Signal changed;
-	Signal1<int32_t> changedid;
-	Signal ok;
-	Signal1<int32_t> okid;
-	Signal cancel;
-	Signal1<int32_t> cancelid;
+	boost::signal<void ()> changed;
+	boost::signal<void ()> ok;
+	boost::signal<void ()> cancel;
 
 	std::string const & text() const;
 	void setText(std::string const &);

=== modified file 'src/ui_basic/helpwindow.cc'
--- src/ui_basic/helpwindow.cc	2011-11-15 16:11:23 +0000
+++ src/ui_basic/helpwindow.cc	2011-11-26 13:22:27 +0000
@@ -75,13 +75,13 @@
 	set_inner_size(in_width, in_height);
 	set_pos(Point((g_gr->get_xres() - out_width) / 2, (g_gr->get_yres() - out_height) / 2));
 
-	Button * btn = new Callback_Button
+	Button * btn = new Button
 		(this, "ok",
 		 in_width / 3, in_height - but_height * 3 / 2,
 		 in_width / 3, but_height,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&HelpWindow::pressedOk, boost::ref(*this)),
 		 _("OK"), std::string(), true, false);
+	btn->sigclicked.connect(boost::bind(&HelpWindow::pressedOk, boost::ref(*this)));
 	btn->set_font(Font::get(UI_FONT_NAME, (fontsize < 12 ? 12 : fontsize)));
 
 	textarea->set_size(in_width - 10, in_height - 10 - (2 * but_height));

=== modified file 'src/ui_basic/icongrid.cc'
--- src/ui_basic/icongrid.cc	2010-11-01 23:54:06 +0000
+++ src/ui_basic/icongrid.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2003, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -30,22 +30,19 @@
 
 namespace UI {
 
-struct IconGridButton : public Callback_Button {
+struct IconGridButton : public Button {
 	IconGridButton
 		(Icon_Grid         & parent,
 		 std::string const & name,
 		 const int32_t x, const int32_t y, const uint32_t w, const uint32_t h,
 		 const PictureID background_pictute_id,
 		 const PictureID foreground_picture_id,
-		 void (Icon_Grid::*callback_function)(uint32_t),
-		 Icon_Grid & callback_argument_this,
 		 const uint32_t callback_argument_id,
 		 Textarea          & ta, std::string const & descr)
 		:
-		Callback_Button
+		Button
 			(&parent, name, x, y, w, h, background_pictute_id,
 			 foreground_picture_id,
-			 boost::bind(callback_function, boost::ref(callback_argument_this), callback_argument_id),
 			 "", true, true),
 			 m_icongrid(parent), m_ta(ta), m_descr(descr),
 			 _callback_argument_id(callback_argument_id)
@@ -59,13 +56,13 @@
 
 	void handle_mousein(bool const inside) {
 		if (inside) {
-			m_icongrid.mousein.call(_callback_argument_id);
+			m_icongrid.mousein(_callback_argument_id);
 			m_ta.set_text(m_descr);
 		} else {
-			m_icongrid.mouseout.call(_callback_argument_id);
+			m_icongrid.mouseout(_callback_argument_id);
 			m_ta.set_text("");
 		}
-		Callback_Button::handle_mousein(inside);
+		Button::handle_mousein(inside);
 	}
 };
 
@@ -117,17 +114,18 @@
 	uint32_t x = (idx % m_columns) * m_cell_width;
 	uint32_t y = (idx / m_columns) * m_cell_height;
 
-	new IconGridButton
+	UI::Button * btn = new IconGridButton
 		(*this, name,
 		 x, y, m_cell_width, m_cell_height,
 		 g_gr->get_no_picture(), picid,
-		 &Icon_Grid::clicked_button, *this, idx, m_ta, descr);
+		 idx, m_ta, descr);
+	btn->sigclicked.connect(boost::bind(&Icon_Grid::clicked_button, this, idx));
 
 	return idx;
 }
 
 void Icon_Grid::clicked_button(uint32_t idx) {
-	clicked.call(idx);
+	clicked(idx);
 	play_click();
 }
 

=== modified file 'src/ui_basic/icongrid.h'
--- src/ui_basic/icongrid.h	2010-11-01 23:54:06 +0000
+++ src/ui_basic/icongrid.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2003, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,10 +22,11 @@
 
 #include "panel.h"
 #include "textarea.h"
-#include "m_signal.h"
 
 #include <vector>
 
+#include <boost/signal.hpp>
+
 namespace UI {
 
 /**
@@ -40,9 +41,9 @@
 		 int32_t x, int32_t y, int32_t cellw, int32_t cellh,
 		 int32_t  cols);
 
-	Signal1<int32_t> clicked;
-	Signal1<int32_t> mouseout;
-	Signal1<int32_t> mousein;
+	boost::signal<void (int32_t)> clicked;
+	boost::signal<void (int32_t)> mouseout;
+	boost::signal<void (int32_t)> mousein;
 
 	int32_t add
 		(std::string const & name,

=== modified file 'src/ui_basic/listselect.cc'
--- src/ui_basic/listselect.cc	2011-10-23 16:52:10 +0000
+++ src/ui_basic/listselect.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2002, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,6 +29,7 @@
 
 #include "container_iterate.h"
 
+#include <boost/bind.hpp>
 #include <iostream>
 
 namespace UI {
@@ -62,7 +63,7 @@
 
 	set_align(align);
 
-	m_scrollbar.moved.set(this, &BaseListselect::set_scrollpos);
+	m_scrollbar.moved.connect(boost::bind(&BaseListselect::set_scrollpos, this, _1));
 	m_scrollbar.set_singlestepsize(g_fh->get_fontheight(m_fontname, m_fontsize));
 	m_scrollbar.set_pagesize
 		(h - 2 * g_fh->get_fontheight(m_fontname, m_fontsize));
@@ -202,10 +203,10 @@
 
 	if (m_selection == m) {
 		m_selection = n;
-		selected.call(n);
+		selected(n);
 	} else if (m_selection == n) {
 		m_selection = m;
-		selected.call(m);
+		selected(m);
 	}
 }
 
@@ -289,7 +290,7 @@
 	}
 	m_selection = i;
 
-	selected.call(m_selection);
+	selected(m_selection);
 	update(0, 0, get_eff_w(), get_h());
 }
 
@@ -444,7 +445,7 @@
 			return false;
 		play_click();
 		select(y);
-		clicked.call(m_selection);
+		clicked(m_selection);
 
 		if //  check if doubleclicked
 			(time - real_last_click_time < DOUBLE_CLICK_INTERVAL
@@ -452,7 +453,7 @@
 			 m_last_selection == m_selection
 			 and
 			 m_selection != no_selection_index())
-			double_clicked.call(m_selection);
+			double_clicked(m_selection);
 
 		return true;
 	}
@@ -513,7 +514,7 @@
 	delete (m_entry_records[i]);
 	m_entry_records.erase(m_entry_records.begin() + i);
 	if (m_selection == i)
-		selected.call(m_selection = no_selection_index());
+		selected(m_selection = no_selection_index());
 	else if (i <  m_selection)
 		--m_selection;
 }

=== modified file 'src/ui_basic/listselect.h'
--- src/ui_basic/listselect.h	2011-10-23 16:52:10 +0000
+++ src/ui_basic/listselect.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006, 2008-2010 by the Widelands Development Team
+ * Copyright (C) 2002, 2006, 2008-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,10 +21,11 @@
 #ifndef UI_LISTSELECT_H
 #define UI_LISTSELECT_H
 
+#include <boost/signal.hpp>
+
 #include "align.h"
 #include "panel.h"
 #include "scrollbar.h"
-#include "m_signal.h"
 
 #include "compile_assert.h"
 
@@ -51,9 +52,9 @@
 		 bool show_check = false);
 	~BaseListselect();
 
-	Signal1<uint32_t> selected;
-	Signal1<uint32_t> clicked;
-	Signal1<uint32_t> double_clicked;
+	boost::signal<void (uint32_t)> selected;
+	boost::signal<void (uint32_t)> clicked;
+	boost::signal<void (uint32_t)> double_clicked;
 
 	void clear();
 	void sort

=== removed file 'src/ui_basic/m_signal.h'
--- src/ui_basic/m_signal.h	2009-11-26 20:08:24 +0000
+++ src/ui_basic/m_signal.h	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2002, 2006, 2008-2009 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef UI_SIGNAL_H
-#define UI_SIGNAL_H
-
-#include "object.h"
-
-namespace UI {
-/**
- * Provides a hook for callback function.
- * This is exactly what register_func used to provide but for Panel
- * member functions and with better type checking.
- *
- * Use as:
- *      Signal signal;
- *      Signal1<int32_t> signal1;
- *
- *      foo->signal.set(this, &MyClass::Handler);
- *      signal.call();
- *      signal1.call(some_int);
- */
-class Signal : public Object {
-	typedef void (Object::*fnT)();
-	Object * _obj;
-	fnT _fn;
-public:
-	Signal() {_obj = 0; _fn = 0;}
-	template<class T> void set(Object * const p, void (T::*f)()) {
-		_obj = p;
-		_fn = static_cast<fnT>(f);
-	}
-	void unset() {
-		_fn = 0;
-	}
-	void call() {if (_fn) (_obj->*_fn)();}
-};
-
-/**
- * See Signal
- */
-template<typename T1> struct Signal1 : public Object {
-	Signal1() {_obj = 0; _fn = 0;}
-	template<class T>
-	void set(Object * const p, void (T::*f)(T1)) {
-		_obj = p;
-		_fn = static_cast<fnT>(f);
-	}
-	void unset() {
-		_fn = 0;
-	}
-	void call(T1 t1) {if (_fn) (_obj->*_fn)(t1);}
-private:
-	typedef void (Object::*fnT)(T1);
-	Object * _obj;
-	fnT _fn;
-};
-
-/**
- * See Signal
- */
-template<typename T1, typename T2> struct Signal2 : public Object {
-	Signal2() {_obj = 0; _fn = 0;}
-	template<class T>
-	void set(Object * p, void (T::*f)(T1, T2)) {
-		_obj = p;
-		_fn = static_cast<fnT>(f);
-	}
-	void unset() {
-		_fn = 0;
-	}
-	void call(T1 t1, T2 t2) {if (_fn) (_obj->*_fn)(t1, t2);}
-private:
-	typedef void (Object::*fnT)(T1, T2);
-	Object * _obj;
-	fnT _fn;
-};
-
-}
-
-#endif

=== modified file 'src/ui_basic/messagebox.cc'
--- src/ui_basic/messagebox.cc	2011-10-23 16:52:10 +0000
+++ src/ui_basic/messagebox.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2008 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -83,26 +83,26 @@
 	d->textarea->set_size(width - 10, height - 50);
 
 	if (type == OK) {
-		new Callback_Button
+		UI::Button * okbtn = new Button
 			(this, "ok",
 			 (get_inner_w() - 60) / 2, get_inner_h() - 30, 60, 20,
 			 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-			 boost::bind(&WLMessageBox::pressedOk, boost::ref(*this)),
 			 _("OK"));
+		okbtn->sigclicked.connect(boost::bind(&WLMessageBox::pressedOk, boost::ref(*this)));
 	} else if (type == YESNO) {
-		new Callback_Button
+		UI::Button * yesbtn = new Button
 			(this, "yes",
 			 (get_inner_w() / 2 - 60) / 2, get_inner_h() - 30, 60, 20,
 			 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-			 boost::bind(&WLMessageBox::pressedYes, boost::ref(*this)),
 			 _("Yes"));
-		new Callback_Button
+		yesbtn->sigclicked.connect(boost::bind(&WLMessageBox::pressedYes, boost::ref(*this)));
+		UI::Button * nobtn = new Button
 			(this, "no",
 			 (get_inner_w() / 2 - 60) / 2 + get_inner_w() / 2, get_inner_h() - 30,
 			 60, 20,
 			 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-			 boost::bind(&WLMessageBox::pressedNo, boost::ref(*this)),
 			 _("No"));
+		nobtn->sigclicked.connect(boost::bind(&WLMessageBox::pressedNo, boost::ref(*this)));
 	}
 }
 
@@ -165,21 +165,21 @@
 
 void WLMessageBox::pressedOk()
 {
-	ok.call();
+	ok();
 	if (is_modal())
 		end_modal(0);
 }
 
 void WLMessageBox::pressedYes()
 {
-	yes.call();
+	yes();
 	if (is_modal())
 		end_modal(1);
 }
 
 void WLMessageBox::pressedNo()
 {
-	no.call();
+	no();
 	if (is_modal())
 		end_modal(0);
 }

=== modified file 'src/ui_basic/messagebox.h'
--- src/ui_basic/messagebox.h	2011-10-23 16:52:10 +0000
+++ src/ui_basic/messagebox.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006, 2008-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006, 2008-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,10 +21,10 @@
 #define UI_MESSAGEBOX_H
 
 #include "align.h"
-#include "m_signal.h"
 #include "window.h"
 
 #include <boost/scoped_ptr.hpp>
+#include <boost/signal.hpp>
 
 namespace UI {
 
@@ -61,9 +61,9 @@
 		 MB_Type);
 	~WLMessageBox();
 
-	Signal ok;
-	Signal yes;
-	Signal no;
+	boost::signal<void ()> ok;
+	boost::signal<void ()> yes;
+	boost::signal<void ()> no;
 
 	void set_align(Align);
 

=== modified file 'src/ui_basic/multilineeditbox.cc'
--- src/ui_basic/multilineeditbox.cc	2011-10-23 16:18:19 +0000
+++ src/ui_basic/multilineeditbox.cc	2011-11-26 13:22:27 +0000
@@ -19,6 +19,8 @@
 
 #include "multilineeditbox.h"
 
+#include <boost/bind.hpp>
+
 #include "scrollbar.h"
 #include "constants.h"
 #include "graphic/font_handler.h"
@@ -102,7 +104,7 @@
 ww_valid(false),
 owner(o)
 {
-	scrollbar.moved.set(&o, &Multiline_Editbox::scrollpos_changed);
+	scrollbar.moved.connect(boost::bind(&Multiline_Editbox::scrollpos_changed, &o, _1));
 
 	scrollbar.set_pagesize(owner.get_h() - 2 * textstyle.font->height());
 	scrollbar.set_singlestepsize(textstyle.font->height());
@@ -144,7 +146,7 @@
 	d->update();
 	d->scroll_cursor_into_view();
 
-	changed.call();
+	changed();
 }
 
 /**
@@ -254,7 +256,7 @@
 
 	if (d->text.size() + utf8.size() <= d->maxbytes) {
 		d->insert(d->cursor_pos, utf8);
-		changed.call();
+		changed();
 	}
 }
 
@@ -271,14 +273,14 @@
 		case SDLK_DELETE:
 			if (d->cursor_pos < d->text.size()) {
 				d->erase_bytes(d->cursor_pos, d->next_char(d->cursor_pos));
-				changed.call();
+				changed();
 			}
 			break;
 
 		case SDLK_BACKSPACE:
 			if (d->cursor_pos > 0) {
 				d->erase_bytes(d->prev_char(d->cursor_pos), d->cursor_pos);
-				changed.call();
+				changed();
 			}
 			break;
 
@@ -421,7 +423,7 @@
 		case SDLK_KP_ENTER:
 		case SDLK_RETURN:
 			d->insert(d->cursor_pos, "\n");
-			changed.call();
+			changed();
 			break;
 
 		default:

=== modified file 'src/ui_basic/multilineeditbox.h'
--- src/ui_basic/multilineeditbox.h	2011-10-23 16:18:19 +0000
+++ src/ui_basic/multilineeditbox.h	2011-11-26 13:22:27 +0000
@@ -21,9 +21,9 @@
 #define UI_MULTILINEEDITBOX_H
 
 #include "panel.h"
-#include "m_signal.h"
 
 #include <boost/scoped_ptr.hpp>
+#include <boost/signal.hpp>
 
 namespace UI {
 
@@ -37,7 +37,7 @@
 	Multiline_Editbox
 		(Panel *, int32_t x, int32_t y, uint32_t w, uint32_t h, const std::string & text);
 
-	Signal changed;
+	boost::signal<void ()> changed;
 
 	std::string const & get_text() const;
 	void set_text(std::string const &);

=== modified file 'src/ui_basic/multilinetextarea.cc'
--- src/ui_basic/multilinetextarea.cc	2011-02-20 17:01:25 +0000
+++ src/ui_basic/multilinetextarea.cc	2011-11-26 13:22:27 +0000
@@ -19,6 +19,8 @@
 
 #include "multilinetextarea.h"
 
+#include <boost/bind.hpp>
+
 #include "constants.h"
 #include "graphic/font_handler.h"
 #include "graphic/richtext.h"
@@ -54,7 +56,7 @@
 
 	set_align(align);
 
-	m_scrollbar.moved.set(this, &Multiline_Textarea::scrollpos_changed);
+	m_scrollbar.moved.connect(boost::bind(&Multiline_Textarea::scrollpos_changed, this, _1));
 
 	m_scrollbar.set_singlestepsize(g_fh->get_fontheight(UI_FONT_SMALL));
 	m_scrollbar.set_pagesize(h - 2 * g_fh->get_fontheight(UI_FONT_BIG));

=== removed file 'src/ui_basic/object.h'
--- src/ui_basic/object.h	2011-11-20 12:27:39 +0000
+++ src/ui_basic/object.h	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2002, 2006-2011 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef UI_OBJECT_H
-#define UI_OBJECT_H
-
-#include <boost/noncopyable.hpp>
-
-namespace UI {
-
-/**
- * Serves as a base class for UI related objects. The only purpose is
- * to provide the base class for signal function pointers.
- */
-struct Object : boost::noncopyable {
-	Object() {}
-
-	// Yeah right... force a VMT so that MSVC++ gets the pointers-to-members
-	// right *sigh*
-	// OTOH, looking at the gcc assembly, gcc seems to use a less efficient
-	// pointer representation. Can anyone clear this up? -- Nicolai
-	virtual ~Object() {}
-};
-
-}
-
-#endif

=== modified file 'src/ui_basic/panel.h'
--- src/ui_basic/panel.h	2011-11-21 21:28:16 +0000
+++ src/ui_basic/panel.h	2011-11-26 13:22:27 +0000
@@ -21,7 +21,8 @@
 #ifndef UI_PANEL_H
 #define UI_PANEL_H
 
-#include "object.h"
+#include <boost/signals/trackable.hpp>
+#include <boost/noncopyable.hpp>
 
 #include "point.h"
 #include "graphic/picture_id.h"
@@ -58,7 +59,7 @@
  * its desired size changes, this automatically changes the actual size (which then invokes
  * \ref layout and \ref move_inside_parent).
  */
-struct Panel : public Object {
+struct Panel : boost::signals::trackable, boost::noncopyable {
 	enum {
 		pf_handle_mouse = 1, ///< receive mouse events
 		pf_think = 2, ///< call think() function during run

=== modified file 'src/ui_basic/radiobutton.cc'
--- src/ui_basic/radiobutton.cc	2011-11-06 12:22:50 +0000
+++ src/ui_basic/radiobutton.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006, 2008-2009 by the Widelands Development Team
+ * Copyright (C) 2002, 2006, 2008-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -115,15 +115,15 @@
  */
 void Radiogroup::set_state(int32_t const state) {
 	if (state == m_state) {
-		clicked.call();
+		clicked();
 		return;
 	}
 
 	for (Radiobutton * btn = m_buttons; btn; btn = btn->m_nextbtn)
 		btn->set_state(btn->m_id == state);
 	m_state = state;
-	changed.call();
-	changedto.call(state);
+	changed();
+	changedto(state);
 }
 
 /**

=== modified file 'src/ui_basic/radiobutton.h'
--- src/ui_basic/radiobutton.h	2011-11-06 12:22:50 +0000
+++ src/ui_basic/radiobutton.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2008-2009 by the Widelands Development Team
+ * Copyright (C) 2004, 2006, 2008-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,7 +22,6 @@
 
 #include "graphic/picture_id.h"
 #include "point.h"
-#include "m_signal.h"
 
 #include "checkbox.h"
 
@@ -59,9 +58,9 @@
 	Radiogroup();
 	~Radiogroup();
 
-	Signal changed;
-	Signal1<int32_t> changedto;
-	Signal clicked; //  clicked without things changed
+	boost::signal<void ()> changed;
+	boost::signal<void (int32_t)> changedto;
+	boost::signal<void ()> clicked; //  clicked without things changed
 
 	int32_t add_button
 		(Panel * parent, Point, PictureID picid, char const * tooltip = 0, Radiobutton ** = NULL);

=== modified file 'src/ui_basic/scrollbar.cc'
--- src/ui_basic/scrollbar.cc	2010-12-03 19:03:40 +0000
+++ src/ui_basic/scrollbar.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2002, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -134,7 +134,7 @@
 		return;
 
 	m_pos = pos;
-	moved.call(pos);
+	moved(pos);
 
 	update();
 }

=== modified file 'src/ui_basic/scrollbar.h'
--- src/ui_basic/scrollbar.h	2010-12-03 19:03:40 +0000
+++ src/ui_basic/scrollbar.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2002, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,8 +20,9 @@
 #ifndef UI_SCROLLBAR_H
 #define UI_SCROLLBAR_H
 
+#include <boost/signal.hpp>
+
 #include "panel.h"
-#include "m_signal.h"
 
 #include "rect.h"
 
@@ -50,7 +51,7 @@
 		(Panel * parent,
 		 int32_t x, int32_t y, uint32_t w, uint32_t h, bool horiz);
 
-	Signal1<int32_t> moved;
+	boost::signal<void (int32_t)> moved;
 
 	void set_steps(int32_t steps);
 	void set_singlestepsize(uint32_t singlestepsize);

=== modified file 'src/ui_basic/slider.cc'
--- src/ui_basic/slider.cc	2011-11-15 16:11:23 +0000
+++ src/ui_basic/slider.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2010 by the Widelands Development Team
+ * Copyright (C) 2002-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -193,8 +193,8 @@
  */
 void Slider::send_value_changed()
 {
-	changed.call();
-	changedto.call(m_value);
+	changed();
+	changedto(m_value);
 }
 
 
@@ -549,6 +549,34 @@
 //                               DISCRETE                                     //
 ////////////////////////////////////////////////////////////////////////////////
 
+DiscreteSlider::DiscreteSlider
+	(Panel * const parent,
+	 const int32_t x, const int32_t y, const uint32_t w, const uint32_t h,
+	 const std::vector<std::string> labels_in,
+	 uint32_t m_value,
+	 const PictureID background_picture_id,
+	 const std::string & tooltip_text,
+	 const uint32_t cursor_size,
+	 const bool enabled)
+	:
+	Panel (parent, x, y, w, h, tooltip_text),
+	slider
+		(this,
+		 // here, we take into account the h_gap introduced by HorizontalSlider
+		 w / (2 * labels_in.size()) - cursor_size / 2, 0,
+		 w - (w / labels_in.size()) + cursor_size,
+		 h - UI::Font::ui_small()->lineskip() - 2,
+		 0, labels_in.size() - 1, m_value,
+		 background_picture_id,
+		 tooltip_text,
+		 cursor_size,
+		 enabled),
+	labels(labels_in)
+{
+	slider.changed.connect(changed);
+	slider.changedto.connect(changedto);
+}
+
 /**
  * \brief Redraw the slide bar. The discrete horizontal bar is painted.
  *

=== modified file 'src/ui_basic/slider.h'
--- src/ui_basic/slider.h	2011-11-08 22:45:39 +0000
+++ src/ui_basic/slider.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2010 by the Widelands Development Team
+ * Copyright (C) 2002-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -19,8 +19,9 @@
 #ifndef UI_SLIDER_H
 #define UI_SLIDER_H
 
+#include <boost/signal.hpp>
+
 #include "panel.h"
-#include "m_signal.h"
 #include "graphic/font.h"
 
 namespace UI {
@@ -84,8 +85,8 @@
 	void set_highlighted(bool highlighted);
 
 public:
-	Signal        changed;
-	Signal1<int32_t>  changedto;
+	boost::signal<void ()> changed;
+	boost::signal<void (int32_t)> changedto;
 
 private:
 	int32_t m_min_value;          //  cursor values
@@ -179,7 +180,7 @@
 
 /**
  * \brief This class defines an discrete slide bar. We do not derive from
- * Slider, but rather embed it, as we need to re-size it and add the lables.
+ * Slider, but rather embed it, as we need to re-size it and add the labels.
  */
 struct DiscreteSlider : public Panel {
 	DiscreteSlider
@@ -190,39 +191,21 @@
 		 const PictureID background_picture_id,
 		 const std::string & tooltip_text = std::string(),
 		 const uint32_t cursor_size = 20,
-		 const bool enabled = true)
-		:
-		Panel (parent, x, y, w, h, tooltip_text),
-		slider
-			(this,
-			 // here, we take into account the h_gap introduced by HorizontalSlider
-			 w / (2 * labels_in.size()) - cursor_size / 2, 0,
-			 w - (w / labels_in.size()) + cursor_size,
-			 h - UI::Font::ui_small()->lineskip() - 2,
-			 0, labels_in.size() - 1, m_value,
-			 background_picture_id,
-			 tooltip_text,
-			 cursor_size,
-			 enabled),
-		 changed(&slider.changed),
-		 changedto(&slider.changedto),
-		 labels(labels_in)
-	{}
-protected:
-	HorizontalSlider slider;
-public:
+		 const bool enabled = true);
+
 	void set_labels(std::vector<std::string>);
 
-	Signal *       changed;
-	Signal1<int32_t> *  changedto;
-
-private:
-	std::vector<std::string> labels;
+	boost::signal<void ()> changed;
+	boost::signal<void (int32_t)> changedto;
 
 protected:
-
 	virtual void draw(RenderTarget & dst);
 	virtual void layout();
+
+	HorizontalSlider slider;
+
+private:
+	std::vector<std::string> labels;
 };
 
 

=== modified file 'src/ui_basic/spinbox.cc'
--- src/ui_basic/spinbox.cc	2010-12-04 23:11:18 +0000
+++ src/ui_basic/spinbox.cc	2011-11-26 13:22:27 +0000
@@ -59,10 +59,10 @@
 
 	/// The UI parts
 	Textarea * text;
-	Callback_Button * butPlus;
-	Callback_Button * butMinus;
-	Callback_Button * butTenPlus;
-	Callback_Button * butTenMinus;
+	Button * butPlus;
+	Button * butMinus;
+	Button * butTenPlus;
+	Button * butTenMinus;
 };
 
 /**
@@ -108,40 +108,40 @@
 	sbi->text = new UI::Textarea
 		(this, butw * 16 / 5, 0, textw, h, buf, Align_Center);
 	sbi->butPlus =
-		new Callback_Button
+		new Button
 			(this, "+",
 			 butw * 21 / 10, 0, butw, butw,
 			 sbi->background,
-			 boost::bind(&SpinBox::changeValue, boost::ref(*this), 1),
 			 "+", _("Increase the value"),
 			 true, false);
+	sbi->butPlus->sigclicked.connect(boost::bind(&SpinBox::changeValue, boost::ref(*this), 1));
 	sbi->butMinus =
-		new Callback_Button
+		new Button
 			(this, "-",
 			 w - butw * 31 / 10, 0, butw, butw,
 			 sbi->background,
-			 boost::bind(&SpinBox::changeValue, boost::ref(*this), -1),
 			 "-", _("Decrease the value"),
 			 true, false);
+	sbi->butMinus->sigclicked.connect(boost::bind(&SpinBox::changeValue, boost::ref(*this), -1));
 	sbi->butPlus->set_repeating(true);
 	sbi->butMinus->set_repeating(true);
 	if (m_big) {
 		sbi->butTenPlus =
-			new Callback_Button
+			new Button
 				(this, "++",
 				 0, 0, butw * 2, butw,
 				 sbi->background,
-				 boost::bind(&SpinBox::changeValue, boost::ref(*this), 10),
 				 "++", _("Increase the value by 10"),
 				 true, false);
+		sbi->butTenPlus->sigclicked.connect(boost::bind(&SpinBox::changeValue, boost::ref(*this), 10));
 		sbi->butTenMinus =
-			new Callback_Button
+			new Button
 				(this, "--",
 				 w - 2 * butw, 0, butw * 2, butw,
 				 sbi->background,
-				 boost::bind(&SpinBox::changeValue, boost::ref(*this), -10),
 				 "--", _("Decrease the value by 10"),
 				 true, false);
+		sbi->butTenMinus->sigclicked.connect(boost::bind(&SpinBox::changeValue, boost::ref(*this), -10));
 		sbi->butTenPlus->set_repeating(true);
 		sbi->butTenMinus->set_repeating(true);
 	}

=== modified file 'src/ui_basic/table.cc'
--- src/ui_basic/table.cc	2011-11-20 12:29:57 +0000
+++ src/ui_basic/table.cc	2011-11-26 13:22:27 +0000
@@ -97,12 +97,13 @@
 		c.btn = 0;
 		if (title.size()) {
 			c.btn =
-				new Callback_Button
+				new Button
 					(this, title,
 					 complete_width, 0, width, m_headerheight,
 					 g_gr->get_picture(PicMod_UI, "pics/but3.png"),
-					 boost::bind(&Table::header_button_clicked, boost::ref(*this), m_columns.size()),
 					 title, "", true, false);
+			c.btn->sigclicked.connect
+				(boost::bind(&Table::header_button_clicked, boost::ref(*this), m_columns.size()));
 			c.btn->set_font(Font::get(m_fontname, m_fontsize));
 		}
 		c.width = width;
@@ -128,7 +129,7 @@
 				 get_x() + get_w() - 24, get_y() + m_headerheight,
 				 24,                     get_h() - m_headerheight,
 				 false);
-		m_scrollbar->moved.set(this, &Table::set_scrollpos);
+		m_scrollbar->moved.connect(boost::bind(&Table::set_scrollpos, this, _1));
 		m_scrollbar->set_steps(1);
 		uint32_t const lineheight = g_fh->get_fontheight(m_fontname, m_fontsize);
 		m_scrollbar->set_singlestepsize(lineheight);
@@ -146,12 +147,13 @@
 		for (uint8_t i = 0; i < col; ++i)
 			complete_width += m_columns.at(i).width;
 		column.btn =
-			new Callback_Button
+			new Button
 				(this, title,
 				 complete_width, 0, column.width, m_headerheight,
 				 g_gr->get_picture(PicMod_UI, "pics/but3.png"),
-				 boost::bind(&Table::header_button_clicked, boost::ref(*this), col),
 				 title, "", true, false);
+		column.btn->sigclicked.connect
+			(boost::bind(&Table::header_button_clicked, boost::ref(*this), col));
 		column.btn->set_font(Font::get(m_fontname, m_fontsize));
 	} else if (column.btn and title.empty()) { //  had title before, not now
 		delete column.btn;
@@ -365,7 +367,7 @@
 			 and
 			 m_last_selection == m_selection
 			 and m_selection != no_selection_index())
-			double_clicked.call(m_selection);
+			double_clicked(m_selection);
 
 		return true;
 	}
@@ -390,7 +392,7 @@
 
 	m_selection = i;
 
-	selected.call(m_selection);
+	selected(m_selection);
 	update(0, 0, get_eff_w(), get_h());
 }
 

=== modified file 'src/ui_basic/table.h'
--- src/ui_basic/table.h	2011-11-05 16:32:47 +0000
+++ src/ui_basic/table.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006, 2008-2009 by the Widelands Development Team
+ * Copyright (C) 2002, 2006, 2008-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -23,17 +23,17 @@
 
 #include "align.h"
 #include "panel.h"
-#include "m_signal.h"
 
 #include "compile_assert.h"
 
 #include <limits>
 #include <vector>
 #include <boost/function.hpp>
+#include <boost/signal.hpp>
 
 namespace UI {
 struct Scrollbar;
-struct Callback_Button;
+struct Button;
 
 /// A table with columns and lines. The entries can be sorted by columns by
 /// clicking on the column header button.
@@ -53,8 +53,8 @@
 		 bool descending = false);
 	~Table();
 
-	Signal1<uint32_t> selected;
-	Signal1<uint32_t> double_clicked;
+	boost::signal<void (uint32_t)> selected;
+	boost::signal<void (uint32_t)> double_clicked;
 
 	/// A column that has a title is sortable (by clicking on the title).
 	void add_column
@@ -157,8 +157,8 @@
 		 bool descending = false);
 	~Table();
 
-	Signal1<uint32_t> selected;
-	Signal1<uint32_t> double_clicked;
+	boost::signal<void (uint32_t)> selected;
+	boost::signal<void (uint32_t)> double_clicked;
 
 	void add_column
 		(uint32_t width,
@@ -246,7 +246,7 @@
 	struct Column;
 	typedef std::vector<Column> Columns;
 	struct Column {
-		Callback_Button                 * btn;
+		Button                 * btn;
 		uint32_t                              width;
 		Align                                 alignment;
 		bool                                           is_checkbox_column;

=== added file 'src/ui_basic/wsm_checkbox.cc.OTHER'
--- src/ui_basic/wsm_checkbox.cc.OTHER	1970-01-01 00:00:00 +0000
+++ src/ui_basic/wsm_checkbox.cc.OTHER	2011-11-26 13:22:27 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include "graphic/rendertarget.h"
+#include "logic/item_ware_descr.h"
+#include "compile_assert.h"
+#include "checkbox.h"
+
+#include "wsm_checkbox.h"
+
+
+#define COLOR_BOX_HEIGHT 7
+#define WARES_DISPLAY_BG "pics/ware_list_bg.png"
+
+
+WSM_Checkbox::WSM_Checkbox
+	(UI::Panel * const parent,
+	 Point       const p,
+	 PictureID   const picid,
+	 RGBColor    const color)
+:
+UI::Checkbox(parent, p, g_gr->get_picture(PicMod_Game,  WARES_DISPLAY_BG)),
+m_pic       (picid),
+m_color     (color)
+{
+}
+
+/**
+ * draw the normal checkbox, the picture and the color rectangle
+ */
+void WSM_Checkbox::draw(RenderTarget & dst) {
+	//  First, draw normal.
+	UI::Checkbox::draw(dst);
+
+	//  Now, draw a small box with the color.
+	assert(1 <= get_inner_w());
+	compile_assert(2 <= COLOR_BOX_HEIGHT);
+	dst.fill_rect
+		(Rect(Point(1, 1), get_inner_w() - 1, COLOR_BOX_HEIGHT - 2), m_color);
+
+	//  and the item
+	dst.blit
+		(Point((get_inner_w() - WARE_MENU_PIC_WIDTH) / 2, COLOR_BOX_HEIGHT),
+		 m_pic);
+}

=== added file 'src/ui_basic/wsm_checkbox.h.OTHER'
--- src/ui_basic/wsm_checkbox.h.OTHER	1970-01-01 00:00:00 +0000
+++ src/ui_basic/wsm_checkbox.h.OTHER	2011-11-26 13:22:27 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2011 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef WSM_CHECKBOX_H
+#define WSM_CHECKBOX_H
+
+/**
+ * This class is the same as an ordinary
+ * checkbox, the only difference is, it has
+ * a small rectangle on it with the color
+ * of the graph and it needs a picture
+ */
+struct WSM_Checkbox : public UI::Checkbox {
+	WSM_Checkbox(UI::Panel *, Point, PictureID picid, RGBColor);
+
+	virtual void draw(RenderTarget &);
+
+private:
+	PictureID  m_pic;
+	RGBColor   m_color;
+};
+
+
+#endif

=== modified file 'src/ui_fsmenu/campaign_select.cc'
--- src/ui_fsmenu/campaign_select.cc	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/campaign_select.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -70,15 +70,11 @@
 		(this, "ok",
 		 get_w() * 71 / 100, get_h() * 9 / 10, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_CampaignSelect::clicked_ok, boost::ref(*this)),
 		 _("OK"), std::string(), false, false),
 	back
 		(this, "back",
 		 get_w() * 71 / 100, get_h() * 17 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_CampaignSelect::end_modal, boost::ref(*this), 0),
 		 _("Back"), std::string(), true, false),
 
 // Campaign list
@@ -87,6 +83,13 @@
 		 get_w() *  47 / 2500, get_h() * 3417 / 10000,
 		 get_w() * 711 / 1250, get_h() * 6083 / 10000)
 {
+	b_ok.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_CampaignSelect::clicked_ok, boost::ref(*this)));
+	back.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_CampaignSelect::end_modal, boost::ref(*this), 0));
+
 	back.set_font(font_small());
 	b_ok.set_font(font_small());
 
@@ -98,10 +101,10 @@
 	label_campdescr .set_font(m_fn, m_fs, UI_FONT_CLR_FG);
 	tacampdescr     .set_font(m_fn, m_fs, UI_FONT_CLR_FG);
 	m_list.set_font(m_fn, m_fs);
-	m_list.selected      .set
-		(this, &Fullscreen_Menu_CampaignSelect::campaign_selected);
-	m_list.double_clicked.set
-		(this, &Fullscreen_Menu_CampaignSelect::double_clicked);
+	m_list.selected.connect
+		(boost::bind(&Fullscreen_Menu_CampaignSelect::campaign_selected, this, _1));
+	m_list.double_clicked.connect
+		(boost::bind(&Fullscreen_Menu_CampaignSelect::double_clicked, this, _1));
 	fill_list();
 }
 
@@ -276,15 +279,11 @@
 		(this, "ok",
 		 get_w() * 71 / 100, get_h() * 9 / 10, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_CampaignMapSelect::clicked_ok, boost::ref(*this)),
 		 _("OK"), std::string(), false, false),
 	back
 		(this, "back",
 		 get_w() * 71 / 100, get_h() * 17 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_CampaignMapSelect::end_modal, boost::ref(*this), 0),
 		 _("Back"), std::string(), true, false),
 
 // Campaign map list
@@ -293,6 +292,13 @@
 		 get_w() *  47 / 2500, get_h() * 3417 / 10000,
 		 get_w() * 711 / 1250, get_h() * 6083 / 10000)
 {
+	b_ok.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_CampaignMapSelect::clicked_ok, boost::ref(*this)));
+	back.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_CampaignMapSelect::end_modal, boost::ref(*this), 0));
+
 	b_ok.set_font(font_small());
 	back.set_font(font_small());
 
@@ -304,9 +310,9 @@
 	label_mapdescr.set_font(m_fn, m_fs, UI_FONT_CLR_FG);
 	tamapdescr    .set_font(m_fn, m_fs, UI_FONT_CLR_FG);
 	m_list.set_font(m_fn, m_fs);
-	m_list.selected.set(this, &Fullscreen_Menu_CampaignMapSelect::map_selected);
-	m_list.double_clicked.set
-		(this, &Fullscreen_Menu_CampaignMapSelect::double_clicked);
+	m_list.selected.connect(boost::bind(&Fullscreen_Menu_CampaignMapSelect::map_selected, this, _1));
+	m_list.double_clicked.connect
+		(boost::bind(&Fullscreen_Menu_CampaignMapSelect::double_clicked, this, _1));
 }
 
 

=== modified file 'src/ui_fsmenu/campaign_select.h'
--- src/ui_fsmenu/campaign_select.h	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/campaign_select.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2008, 2010 by the Widelands Development Team
+ * Copyright (C) 2002-2008, 2010-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -50,15 +50,15 @@
 	uint32_t    m_fs;
 	std::string m_fn;
 
-	UI::Textarea                                      title;
-	UI::Textarea                                      label_campname;
-	UI::Textarea                                      tacampname;
-	UI::Textarea                                      label_difficulty;
-	UI::Textarea                                      tadifficulty;
-	UI::Textarea                                      label_campdescr;
-	UI::Multiline_Textarea                            tacampdescr;
-	UI::Callback_Button                               b_ok, back;
-	UI::Listselect<const char *>                      m_list;
+	UI::Textarea                             title;
+	UI::Textarea                             label_campname;
+	UI::Textarea                             tacampname;
+	UI::Textarea                             label_difficulty;
+	UI::Textarea                             tadifficulty;
+	UI::Textarea                             label_campdescr;
+	UI::Multiline_Textarea                   tacampdescr;
+	UI::Button                               b_ok, back;
+	UI::Listselect<const char *>             m_list;
 
 	/// Variables used for exchange between the two Campaign UIs and
 	/// Game::run_campaign
@@ -84,17 +84,17 @@
 	uint32_t    m_fs;
 	std::string m_fn;
 
-	UI::Textarea                                         title;
-	UI::Textarea                                         label_mapname;
-	UI::Textarea                                         tamapname;
-	UI::Textarea                                         label_author;
-	UI::Textarea                                         taauthor;
-	UI::Textarea                                         label_mapdescr;
-	UI::Multiline_Textarea                               tamapdescr;
-	UI::Callback_Button                              b_ok, back;
-	UI::Listselect<std::string>                          m_list;
-	uint32_t                                             campaign;
-	std::string                                          campmapfile;
+	UI::Textarea                            title;
+	UI::Textarea                            label_mapname;
+	UI::Textarea                            tamapname;
+	UI::Textarea                            label_author;
+	UI::Textarea                            taauthor;
+	UI::Textarea                            label_mapdescr;
+	UI::Multiline_Textarea                  tamapdescr;
+	UI::Button                              b_ok, back;
+	UI::Listselect<std::string>             m_list;
+	uint32_t                                campaign;
+	std::string                             campmapfile;
 
 };
 

=== modified file 'src/ui_fsmenu/editor.cc'
--- src/ui_fsmenu/editor.cc	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/editor.cc	2011-11-26 13:22:27 +0000
@@ -39,21 +39,25 @@
 		(this, "new_map",
 		 m_butx, get_h() * 6 / 25, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Fullscreen_Menu_Editor::end_modal, boost::ref(*this), static_cast<int32_t>(New_Map)),
 		 _("New Map"), std::string(), true, false),
 	load_map
 		(this, "load_map",
 		 m_butx, get_h() * 61 / 200, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Fullscreen_Menu_Editor::end_modal, boost::ref(*this), static_cast<int32_t>(Load_Map)),
 		 _("Load Map"), std::string(), true, false),
 	back
 		(this, "back",
 		 m_butx, get_h() * 3 / 4, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Fullscreen_Menu_Editor::end_modal, boost::ref(*this), static_cast<int32_t>(Back)),
 		 _("Back"), std::string(), true, false)
 {
+	new_map.sigclicked.connect
+		(boost::bind(&Fullscreen_Menu_Editor::end_modal, boost::ref(*this), static_cast<int32_t>(New_Map)));
+	load_map.sigclicked.connect
+		(boost::bind(&Fullscreen_Menu_Editor::end_modal, boost::ref(*this), static_cast<int32_t>(Load_Map)));
+	back.sigclicked.connect
+		(boost::bind(&Fullscreen_Menu_Editor::end_modal, boost::ref(*this), static_cast<int32_t>(Back)));
+
 	new_map.set_font(font_small());
 	load_map.set_font(font_small());
 	back.set_font(font_small());

=== modified file 'src/ui_fsmenu/editor.h'
--- src/ui_fsmenu/editor.h	2010-10-17 19:42:01 +0000
+++ src/ui_fsmenu/editor.h	2011-11-26 13:22:27 +0000
@@ -39,9 +39,9 @@
 	uint32_t                                      m_buth;
 	uint32_t                                      m_butx;
 	UI::Textarea                                  title;
-	UI::Callback_Button                       new_map;
-	UI::Callback_Button                       load_map;
-	UI::Callback_Button                       back;
+	UI::Button                       new_map;
+	UI::Button                       load_map;
+	UI::Button                       back;
 };
 
 #endif

=== modified file 'src/ui_fsmenu/editor_mapselect.cc'
--- src/ui_fsmenu/editor_mapselect.cc	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/editor_mapselect.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -87,13 +87,11 @@
 		(this, "back",
 		 get_w() * 71 / 100, get_h() * 17 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Fullscreen_Menu_Editor_MapSelect::end_modal, boost::ref(*this), 0),
 		 _("Back"), std::string(), true, false),
 	m_ok
 		(this, "ok",
 		 get_w() * 71 / 100, get_h() * 9 / 10, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-		 boost::bind(&Fullscreen_Menu_Editor_MapSelect::ok, boost::ref(*this)),
 		 _("OK"), std::string(), false, false),
 
 // Map list
@@ -105,6 +103,9 @@
 // Runtime variables
 	m_curdir("maps"), m_basedir("maps")
 {
+	m_back.sigclicked.connect(boost::bind(&Fullscreen_Menu_Editor_MapSelect::end_modal, boost::ref(*this), 0));
+	m_ok.sigclicked.connect(boost::bind(&Fullscreen_Menu_Editor_MapSelect::ok, boost::ref(*this)));
+
 	m_back.set_font(font_small());
 	m_ok.set_font(font_small());
 
@@ -123,9 +124,9 @@
 	m_descr           .set_font(m_fn, m_fs, UI_FONT_CLR_FG);
 	m_list            .set_font(m_fn, m_fs);
 
-	m_list.selected.set(this, &Fullscreen_Menu_Editor_MapSelect::map_selected);
-	m_list.double_clicked.set
-		(this, &Fullscreen_Menu_Editor_MapSelect::double_clicked);
+	m_list.selected.connect(boost::bind(&Fullscreen_Menu_Editor_MapSelect::map_selected, this, _1));
+	m_list.double_clicked.connect
+		(boost::bind(&Fullscreen_Menu_Editor_MapSelect::double_clicked, this, _1));
 
 	fill_list();
 }

=== modified file 'src/ui_fsmenu/editor_mapselect.h'
--- src/ui_fsmenu/editor_mapselect.h	2010-10-17 19:42:01 +0000
+++ src/ui_fsmenu/editor_mapselect.h	2011-11-26 13:22:27 +0000
@@ -55,7 +55,7 @@
 	UI::Textarea    m_size,             m_label_world,      m_world;
 	UI::Textarea    m_label_nr_players, m_nr_players,       m_label_descr;
 	UI::Multiline_Textarea              m_descr;
-	UI::Callback_Button             m_back,             m_ok;
+	UI::Button             m_back,             m_ok;
 	UI::Listselect<std::string>                             m_list;
 	std::string     m_parentdir,        m_curdir,           m_basedir;
 	filenameset_t   m_mapfiles;

=== modified file 'src/ui_fsmenu/fileview.cc'
--- src/ui_fsmenu/fileview.cc	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/fileview.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2002, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -41,9 +41,10 @@
 		(this, "close",
 		 get_w() * 3 / 8, get_h() * 9 / 10, get_w() / 4, get_h() * 9 / 200,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Fullscreen_Menu_TextView::end_modal, boost::ref(*this), 0),
 		 _("Close"), std::string(), true, false)
 {
+	close_button.sigclicked.connect(boost::bind(&Fullscreen_Menu_TextView::end_modal, boost::ref(*this), 0));
+
 	close_button.set_font(font_small());
 
 	Profile prof(filename.c_str(), "global", "texts"); //  section-less file

=== modified file 'src/ui_fsmenu/fileview.h'
--- src/ui_fsmenu/fileview.h	2010-10-17 19:42:01 +0000
+++ src/ui_fsmenu/fileview.h	2011-11-26 13:22:27 +0000
@@ -47,7 +47,7 @@
 private:
 	UI::Textarea                                title;
 	UI::Multiline_Textarea                      textview;
-	UI::Callback_Button                     close_button;
+	UI::Button                     close_button;
 };
 
 /**

=== modified file 'src/ui_fsmenu/launchMPG.cc'
--- src/ui_fsmenu/launchMPG.cc	2011-09-18 13:39:55 +0000
+++ src/ui_fsmenu/launchMPG.cc	2011-11-26 13:22:27 +0000
@@ -57,31 +57,34 @@
 		uint32_t space = get_inner_w() / 40;
 		uint32_t butw  = get_inner_w() * 3 / 10;
 		uint32_t buth  = get_inner_h() * 8 / 10;
-		UI::Button * btn = new UI::Callback_Button
+		UI::Button * btn = new UI::Button
 			(this, "map",
 			 space, y, butw, buth,
 			 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-			 boost::bind
-				 (&MapOrSaveSelectionWindow::pressedButton, boost::ref(*this), 1),
 			 _("Map"), _("Select a map"), true, false);
+		btn->sigclicked.connect
+			(boost::bind
+				 (&MapOrSaveSelectionWindow::pressedButton, boost::ref(*this), 1));
 		btn->set_font(font);
 
-		btn = new UI::Callback_Button
+		btn = new UI::Button
 			(this, "saved_game",
 			 2 * space + butw, y, butw, buth,
 			 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-			 boost::bind
-				 (&MapOrSaveSelectionWindow::pressedButton, boost::ref(*this), 2),
 			 _("Saved game"), _("Select a saved game"), true, false);
+		btn->sigclicked.connect
+			(boost::bind
+				 (&MapOrSaveSelectionWindow::pressedButton, boost::ref(*this), 2));
 		btn->set_font(font);
 
-		btn = new UI::Callback_Button
+		btn = new UI::Button
 			(this, "cancel",
 			 3 * space + 2 * butw, y, butw, buth,
 			 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-			 boost::bind
-				 (&MapOrSaveSelectionWindow::pressedButton, boost::ref(*this), 0),
 			 _("Cancel"), _("Cancel selection"), true, false);
+		btn->sigclicked.connect
+			(boost::bind
+				 (&MapOrSaveSelectionWindow::pressedButton, boost::ref(*this), 0));
 		btn->set_font(font);
 	}
 
@@ -108,38 +111,27 @@
 		 get_w() * 37 / 50 + m_butw - m_buth, get_h() * 3 / 20, m_buth, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/menu_toggle_minimap.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_LaunchMPG::change_map_or_save, boost::ref(*this)),
 		 _("Change map or saved game"), false, false),
 	m_ok
 		(this, "ok",
 		 get_w() * 37 / 50, get_h() * 12 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_LaunchMPG::start_clicked, boost::ref(*this)),
 		 _("Start game"), std::string(), false, false),
 	m_back
 		(this, "back",
 		 get_w() * 37 / 50, get_h() * 218 / 240, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Fullscreen_Menu_LaunchMPG::back_clicked, boost::ref(*this)),
 		 _("Back"), std::string(), true, false),
 	m_wincondition
 		(this, "win_condition",
 		 get_w() * 37 / 50, get_h() * 11 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_LaunchMPG::win_condition_clicked,
-			  boost::ref(*this)),
 		 "", std::string(), false, false),
 	m_help_button
 		(this, "help",
 		 get_w() * 37 / 50 + m_butw - m_buth, get_h() / 100, m_buth, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/menu_help.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_LaunchMPG::help_clicked,
-			  boost::ref(*this)),
 		 _("Show the help window"), true, false),
 
 // Text labels
@@ -173,6 +165,22 @@
 	m_ctrl         (ctrl),
 	m_chat         (0)
 {
+	m_change_map_or_save.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_LaunchMPG::change_map_or_save, boost::ref(*this)));
+	m_ok.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_LaunchMPG::start_clicked, boost::ref(*this)));
+	m_back.sigclicked.connect(boost::bind(&Fullscreen_Menu_LaunchMPG::back_clicked, boost::ref(*this)));
+	m_wincondition.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_LaunchMPG::win_condition_clicked,
+			  boost::ref(*this)));
+	m_help_button.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_LaunchMPG::help_clicked,
+			  boost::ref(*this)));
+
 	m_back.set_font(font_small());
 	m_ok.set_font(font_small());
 	m_wincondition.set_font(font_small());

=== modified file 'src/ui_fsmenu/launchMPG.h'
--- src/ui_fsmenu/launchMPG.h	2011-02-18 23:05:02 +0000
+++ src/ui_fsmenu/launchMPG.h	2011-11-26 13:22:27 +0000
@@ -78,8 +78,8 @@
 	uint32_t    m_fs;
 	std::string m_fn;
 
-	UI::Callback_Button       m_change_map_or_save, m_ok, m_back, m_wincondition;
-	UI::Callback_Button       m_help_button;
+	UI::Button       m_change_map_or_save, m_ok, m_back, m_wincondition;
+	UI::Button       m_help_button;
 	UI::Textarea              m_title, m_mapname, m_clients, m_players, m_map;
 	UI::Multiline_Textarea    m_map_info, m_client_info;
 	UI::HelpWindow          * m_help;

=== modified file 'src/ui_fsmenu/launchSPG.cc'
--- src/ui_fsmenu/launchSPG.cc	2011-09-18 13:39:55 +0000
+++ src/ui_fsmenu/launchSPG.cc	2011-11-26 13:22:27 +0000
@@ -52,28 +52,21 @@
 		(this, "select_map",
 		 get_w() * 7 / 10, get_h() * 3 / 10, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Fullscreen_Menu_LaunchSPG::select_map, boost::ref(*this)),
 		 _("Select map"), std::string(), false, false),
 	m_wincondition
 		(this, "win_condition",
 		 get_w() * 7 / 10, get_h() * 4 / 10, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_LaunchSPG::win_condition_clicked,
-			  boost::ref(*this)),
 		 "", std::string(), false, false),
 	m_back
 		(this, "back",
 		 get_w() * 7 / 10, get_h() * 9 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Fullscreen_Menu_LaunchSPG::back_clicked, boost::ref(*this)),
 		 _("Back"), std::string(), true, false),
 	m_ok
 		(this, "ok",
 		 get_w() * 7 / 10, get_h() * 1 / 2, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_LaunchSPG::start_clicked, boost::ref(*this)),
 		 _("Start game"), std::string(), false, false),
 
 // Text labels
@@ -111,6 +104,16 @@
 	m_ctrl         (ctrl),
 	m_is_scenario  (false)
 {
+	m_select_map.sigclicked.connect(boost::bind(&Fullscreen_Menu_LaunchSPG::select_map, boost::ref(*this)));
+	m_wincondition.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_LaunchSPG::win_condition_clicked,
+			  boost::ref(*this)));
+	m_back.sigclicked.connect(boost::bind(&Fullscreen_Menu_LaunchSPG::back_clicked, boost::ref(*this)));
+	m_ok.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_LaunchSPG::start_clicked, boost::ref(*this)));
+
 
 	// Register win condition scripts
 	m_lua = create_LuaInterface();
@@ -144,15 +147,14 @@
 	for (uint32_t i = 0; i < MAX_PLAYERS; ++i) {
 		sprintf(posIco, "pics/fsel_editor_set_player_0%i_pos.png", i + 1);
 		m_pos[i] =
-			new UI::Callback_Button
+			new UI::Button
 				(this, "switch_to_position",
 				 get_w() / 100, y += m_buth, get_h() * 17 / 500, get_h() * 17 / 500,
 				 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 				 g_gr->get_picture(PicMod_Game, posIco),
-				 boost::bind
-					 (&Fullscreen_Menu_LaunchSPG::switch_to_position,
-					  boost::ref(*this), i),
 				 _("Switch to position"), false);
+		m_pos[i]->sigclicked.connect
+			(boost::bind(&Fullscreen_Menu_LaunchSPG::switch_to_position, boost::ref(*this), i));
 		m_players[i] =
 			new PlayerDescriptionGroup
 				(this,

=== modified file 'src/ui_fsmenu/launchSPG.h'
--- src/ui_fsmenu/launchSPG.h	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/launchSPG.h	2011-11-26 13:22:27 +0000
@@ -75,8 +75,8 @@
 	uint32_t    m_butw;
 	uint32_t    m_buth;
 
-	UI::Callback_Button       m_select_map, m_wincondition, m_back, m_ok;
-	UI::Callback_Button     * m_pos[MAX_PLAYERS];
+	UI::Button       m_select_map, m_wincondition, m_back, m_ok;
+	UI::Button     * m_pos[MAX_PLAYERS];
 	UI::Textarea              m_title, m_mapname;
 	UI::Textarea              m_name, m_type, m_team, m_tribe, m_init;
 	GameSettingsProvider    * m_settings;

=== modified file 'src/ui_fsmenu/loadgame.cc'
--- src/ui_fsmenu/loadgame.cc	2011-10-23 16:52:10 +0000
+++ src/ui_fsmenu/loadgame.cc	2011-11-26 13:22:27 +0000
@@ -50,20 +50,16 @@
 		(this, "back",
 		 get_w() * 71 / 100, get_h() * 9 / 10, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Fullscreen_Menu_LoadGame::end_modal, boost::ref(*this), 0),
 		 _("Back"), std::string(), true, false),
 	m_ok
 		(this, "ok",
 		 get_w() * 71 / 100, get_h() * 15 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-		 boost::bind(&Fullscreen_Menu_LoadGame::clicked_ok, boost::ref(*this)),
 		 _("OK"), std::string(), false, false),
 	m_delete
 		(this, "delete",
 		 get_w() * 71 / 100, get_h() * 17 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_LoadGame::clicked_delete, boost::ref(*this)),
 		 _("Delete"), std::string(), false, false),
 
 // Savegame list
@@ -90,6 +86,12 @@
 	m_settings(gsp),
 	m_ctrl(gc)
 {
+	m_back.sigclicked.connect(boost::bind(&Fullscreen_Menu_LoadGame::end_modal, boost::ref(*this), 0));
+	m_ok.sigclicked.connect(boost::bind(&Fullscreen_Menu_LoadGame::clicked_ok, boost::ref(*this)));
+	m_delete.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_LoadGame::clicked_delete, boost::ref(*this)));
+
 	m_back.set_font(font_small());
 	m_ok.set_font(font_small());
 	m_delete.set_font(font_small());
@@ -100,8 +102,8 @@
 	m_label_gametime.set_font(m_fn, m_fs, UI_FONT_CLR_FG);
 	m_tagametime    .set_font(m_fn, m_fs, UI_FONT_CLR_FG);
 	m_list          .set_font(m_fn, m_fs);
-	m_list.selected.set(this, &Fullscreen_Menu_LoadGame::map_selected);
-	m_list.double_clicked.set(this, &Fullscreen_Menu_LoadGame::double_clicked);
+	m_list.selected.connect(boost::bind(&Fullscreen_Menu_LoadGame::map_selected, this, _1));
+	m_list.double_clicked.connect(boost::bind(&Fullscreen_Menu_LoadGame::double_clicked, this, _1));
 	fill_list();
 }
 

=== modified file 'src/ui_fsmenu/loadgame.h'
--- src/ui_fsmenu/loadgame.h	2011-10-23 16:52:10 +0000
+++ src/ui_fsmenu/loadgame.h	2011-11-26 13:22:27 +0000
@@ -64,9 +64,9 @@
 	std::string m_fn;
 
 	Widelands::Game &                               m_game;
-	UI::Callback_Button                             m_back;
-	UI::Callback_Button                             m_ok;
-	UI::Callback_Button                             m_delete;
+	UI::Button                             m_back;
+	UI::Button                             m_ok;
+	UI::Button                             m_delete;
 	UI::Listselect<const char *>                    m_list;
 	UI::Textarea                                    m_title;
 	UI::Textarea                                    m_label_mapname;

=== modified file 'src/ui_fsmenu/loadreplay.cc'
--- src/ui_fsmenu/loadreplay.cc	2011-10-23 16:52:10 +0000
+++ src/ui_fsmenu/loadreplay.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 by the Widelands Development Team
+ * Copyright (C) 2007-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -40,20 +40,16 @@
 		(this, "back",
 		 get_w() * 71 / 100, get_h() * 9 / 10, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Fullscreen_Menu_LoadReplay::end_modal, boost::ref(*this), 0),
 		 _("Back"), std::string(), true, false),
 	m_ok
 		(this, "ok",
 		 get_w() * 71 / 100, get_h() * 15 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-		 boost::bind(&Fullscreen_Menu_LoadReplay::clicked_ok, boost::ref(*this)),
 		 _("OK"), std::string(), false, false),
 	m_delete
 		(this, "delete",
 		 get_w() * 71 / 100, get_h() * 17 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind
-		 	 (&Fullscreen_Menu_LoadReplay::clicked_delete, boost::ref(*this)),
 		 _("Delete"), std::string(), false, false),
 
 // Replay list
@@ -78,11 +74,17 @@
 		 _("Gametime:"), UI::Align_Right),
 	m_tagametime(this, get_w() * 71 / 100, get_h() * 3 / 8)
 {
+	m_back.sigclicked.connect(boost::bind(&Fullscreen_Menu_LoadReplay::end_modal, boost::ref(*this), 0));
+	m_ok.sigclicked.connect(boost::bind(&Fullscreen_Menu_LoadReplay::clicked_ok, boost::ref(*this)));
+	m_delete.sigclicked.connect
+		(boost::bind
+		 	 (&Fullscreen_Menu_LoadReplay::clicked_delete, boost::ref(*this)));
+
 	m_title.set_textstyle(ts_big());
-	m_list .set_font(ui_fn(), fs_small());
-	m_list .selected.set(this, &Fullscreen_Menu_LoadReplay::replay_selected);
-	m_list .double_clicked.set
-		(this, &Fullscreen_Menu_LoadReplay::double_clicked);
+	m_list.set_font(ui_fn(), fs_small());
+	m_list.selected.connect(boost::bind(&Fullscreen_Menu_LoadReplay::replay_selected, this, _1));
+	m_list.double_clicked.connect
+		(boost::bind(&Fullscreen_Menu_LoadReplay::double_clicked, this, _1));
 	m_back.set_font(font_small());
 	m_ok.set_font(font_small());
 	fill_list();

=== modified file 'src/ui_fsmenu/loadreplay.h'
--- src/ui_fsmenu/loadreplay.h	2011-10-23 16:52:10 +0000
+++ src/ui_fsmenu/loadreplay.h	2011-11-26 13:22:27 +0000
@@ -49,9 +49,9 @@
 	uint32_t m_butw;
 	uint32_t m_buth;
 
-	UI::Callback_Button                             m_back;
-	UI::Callback_Button                             m_ok;
-	UI::Callback_Button                             m_delete;
+	UI::Button                             m_back;
+	UI::Button                             m_ok;
+	UI::Button                             m_delete;
 	UI::Listselect<std::string>                     m_list;
 	UI::Textarea                                    m_title;
 	UI::Textarea                                    m_label_mapname;

=== modified file 'src/ui_fsmenu/main.cc'
--- src/ui_fsmenu/main.cc	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/main.cc	2011-11-26 13:22:27 +0000
@@ -36,73 +36,46 @@
 		(this, "play_tutorial",
 		 m_butx, get_h() * 42 / 200, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but3.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
-			  static_cast<int32_t>(mm_playtutorial)),
 		 _("Play Tutorial"), std::string(), true, false),
 	singleplayer
 		(this, "single_player",
 		 m_butx, get_h() * 61 / 200, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but3.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
-			  static_cast<int32_t>(mm_singleplayer)),
 		 _("Single Player"), std::string(), true, false),
 	multiplayer
 		(this, "multi_player",
 		 m_butx, get_h() * 37 / 100, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but3.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
-			  static_cast<int32_t>(mm_multiplayer)),
 		 _("Multi Player"), std::string(), true, false),
 	replay
 		(this, "replay",
 		 m_butx, get_h() * 87 / 200, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but3.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
-			  static_cast<int32_t>(mm_replay)),
 		 _("Watch Replay"), std::string(), true, false),
 	editor
 		(this, "editor",
 		 m_butx, get_h() * 100 / 200, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but3.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
-			  static_cast<int32_t>(mm_editor)),
 		 _("Editor"), std::string(), true, false),
 	options
 		(this, "options",
 		 m_butx, get_h() * 119 / 200, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but3.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
-			  static_cast<int32_t>(mm_options)),
 		 _("Options"), std::string(), true, false),
 	readme
 		(this, "readme",
 		 m_butx, get_h() * 138 / 200, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but3.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
-			  static_cast<int32_t>(mm_readme)),
 		 _("View Readme"), std::string(), true, false),
 	license
 		(this, "license",
 		 m_butx, get_h() * 151 / 200, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but3.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
-			  static_cast<int32_t>(mm_license)),
 		 _("License"), std::string(), true, false),
 	exit
 		(this, "exit",
 		 m_butx, get_h() * 178 / 200, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but3.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
-			  static_cast<int32_t>(mm_exit)),
 		 _("Exit Game"), std::string(), true, false),
 
 // Textlabels
@@ -117,6 +90,43 @@
 		 (wlcr + _("by the Widelands Development Team")).c_str(),
 		 UI::Align_BottomLeft)
 {
+	playtutorial.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
+			  static_cast<int32_t>(mm_playtutorial)));
+	singleplayer.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
+			  static_cast<int32_t>(mm_singleplayer)));
+	multiplayer.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
+			  static_cast<int32_t>(mm_multiplayer)));
+	replay.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
+			  static_cast<int32_t>(mm_replay)));
+	editor.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
+			  static_cast<int32_t>(mm_editor)));
+	options.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
+			  static_cast<int32_t>(mm_options)));
+	readme.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
+			  static_cast<int32_t>(mm_readme)));
+	license.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
+			  static_cast<int32_t>(mm_license)));
+	exit.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_Main::end_modal, boost::ref(*this),
+			  static_cast<int32_t>(mm_exit)));
+
 	playtutorial.set_font(font_small());
 	singleplayer.set_font(font_small());
 	multiplayer.set_font(font_small());

=== modified file 'src/ui_fsmenu/main.h'
--- src/ui_fsmenu/main.h	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/main.h	2011-11-26 13:22:27 +0000
@@ -47,15 +47,15 @@
 	uint32_t                                    m_butw;
 	uint32_t                                    m_buth;
 	std::string                                 wlcr;
-	UI::Callback_Button                     playtutorial;
-	UI::Callback_Button                     singleplayer;
-	UI::Callback_Button                     multiplayer;
-	UI::Callback_Button                     replay;
-	UI::Callback_Button                     editor;
-	UI::Callback_Button                     options;
-	UI::Callback_Button                     readme;
-	UI::Callback_Button                     license;
-	UI::Callback_Button                     exit;
+	UI::Button                     playtutorial;
+	UI::Button                     singleplayer;
+	UI::Button                     multiplayer;
+	UI::Button                     replay;
+	UI::Button                     editor;
+	UI::Button                     options;
+	UI::Button                     readme;
+	UI::Button                     license;
+	UI::Button                     exit;
 	UI::Textarea                                version;
 	UI::Textarea                                copyright;
 };

=== modified file 'src/ui_fsmenu/mapselect.cc'
--- src/ui_fsmenu/mapselect.cc	2011-11-15 16:11:23 +0000
+++ src/ui_fsmenu/mapselect.cc	2011-11-26 13:22:27 +0000
@@ -102,13 +102,11 @@
 		(this, "back",
 		 get_w() * 71 / 100, get_h() * 17 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Fullscreen_Menu_MapSelect::end_modal, boost::ref(*this), 0),
 		 _("Back"), std::string(), true, false),
 	m_ok
 		(this, "ok",
 		 get_w() * 71 / 100, get_h() * 9 / 10, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-		 boost::bind(&Fullscreen_Menu_MapSelect::ok, boost::ref(*this)),
 		 _("OK"), std::string(), false, false),
 
 // Checkbox
@@ -125,6 +123,9 @@
 	m_settings(settings),
 	m_ctrl(ctrl)
 {
+	m_back.sigclicked.connect(boost::bind(&Fullscreen_Menu_MapSelect::end_modal, boost::ref(*this), 0));
+	m_ok.sigclicked.connect(boost::bind(&Fullscreen_Menu_MapSelect::ok, boost::ref(*this)));
+
 	m_title.set_textstyle(ts_big());
 	m_label_load_map_as_scenario.set_textstyle(ts_small());
 	m_label_name                .set_textstyle(ts_small());
@@ -157,8 +158,8 @@
 	m_load_map_as_scenario.set_state(false);
 	m_load_map_as_scenario.set_enabled(false);
 
-	m_table.selected.set(this, &Fullscreen_Menu_MapSelect::map_selected);
-	m_table.double_clicked.set(this, &Fullscreen_Menu_MapSelect::double_clicked);
+	m_table.selected.connect(boost::bind(&Fullscreen_Menu_MapSelect::map_selected, this, _1));
+	m_table.double_clicked.connect(boost::bind(&Fullscreen_Menu_MapSelect::double_clicked, this, _1));
 
 	UI::Box * vbox = new UI::Box
 		(this, m_table.get_x(), m_table.get_y() - 120, UI::Box::Horizontal, m_table.get_w());
@@ -536,9 +537,8 @@
 	m_tags_ordered.push_back(tag);
 
 	UI::Checkbox * cb = new UI::Checkbox(box, Point(0, 0));
-	cb->set_id(id);
-	cb->changedtoid.set
-		(this, &Fullscreen_Menu_MapSelect::_tagbox_changed);
+	cb->changedto.connect
+		(boost::bind(&Fullscreen_Menu_MapSelect::_tagbox_changed, this, id, _1));
 
 	box->add(cb, UI::Box::AlignLeft, true);
 	UI::Textarea * ta = new UI::Textarea(box, displ_name, UI::Align_CenterLeft, 100);

=== modified file 'src/ui_fsmenu/mapselect.h'
--- src/ui_fsmenu/mapselect.h	2011-11-15 16:11:23 +0000
+++ src/ui_fsmenu/mapselect.h	2011-11-26 13:22:27 +0000
@@ -96,7 +96,7 @@
 	UI::Textarea m_label_nr_players, m_nr_players;
 	UI::Textarea m_label_descr;
 	UI::Multiline_Textarea m_descr;
-	UI::Callback_Button m_back, m_ok;
+	UI::Button m_back, m_ok;
 	UI::Checkbox                      m_load_map_as_scenario;
 	UI::Checkbox *                    m_show_all_maps;
 	std::vector<UI::Checkbox *>       m_tags_checkboxes;

=== modified file 'src/ui_fsmenu/multiplayer.cc'
--- src/ui_fsmenu/multiplayer.cc	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/multiplayer.cc	2011-11-26 13:22:27 +0000
@@ -47,28 +47,30 @@
 		(this, "metaserver",
 		 m_butx, get_h() * 6 / 25, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind(&Fullscreen_Menu_MultiPlayer::ggzLogin, boost::ref(*this)),
 		 _("Internet game"), std::string(), true, false),
 	lan
 		(this, "lan",
 		 m_butx, get_h() * 61 / 200, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_MultiPlayer::end_modal, boost::ref(*this),
-			  static_cast<int32_t>(Lan)),
 		 _("LAN / Direct IP"), std::string(), true, false),
 	back
 		(this, "back",
 		 m_butx, get_h() * 3 / 4, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_MultiPlayer::end_modal, boost::ref(*this),
-			  static_cast<int32_t>(Back)),
 		 _("Back"), std::string(), true, false)
 {
+	metaserver.sigclicked.connect(boost::bind(&Fullscreen_Menu_MultiPlayer::ggzLogin, boost::ref(*this)));
 	metaserver.set_font(font_small());
 	lan.set_font(font_small());
+	lan.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_MultiPlayer::end_modal, boost::ref(*this),
+			  static_cast<int32_t>(Lan)));
 	back.set_font(font_small());
+	back.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_MultiPlayer::end_modal, boost::ref(*this),
+			  static_cast<int32_t>(Back)));
 
 	title.set_font(m_fn, fs_big(), UI_FONT_CLR_FG);
 
@@ -76,14 +78,15 @@
 	m_auto_log = s.get_bool("auto_log", false);
 	if (m_auto_log) {
 		showloginbox =
-			new UI::Callback_Button
+			new UI::Button
 				(this, "login_dialog",
 				 m_butx + m_butw + m_buth / 4, get_h() * 6 / 25, m_buth, m_buth,
 				 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 				 g_gr->get_picture(PicMod_UI, "pics/continue.png"),
-				 boost::bind
-					 (&Fullscreen_Menu_MultiPlayer::showGGZLogin, boost::ref(*this)),
 				 _("Show login dialog"), true, false);
+		showloginbox->sigclicked.connect
+			(boost::bind
+				(&Fullscreen_Menu_MultiPlayer::showGGZLogin, boost::ref(*this)));
 		showloginbox->set_font(font_small());
 	}
 }

=== modified file 'src/ui_fsmenu/multiplayer.h'
--- src/ui_fsmenu/multiplayer.h	2010-10-17 19:42:01 +0000
+++ src/ui_fsmenu/multiplayer.h	2011-11-26 13:22:27 +0000
@@ -51,10 +51,10 @@
 	uint32_t                                            m_fs;
 	std::string                                         m_fn;
 	UI::Textarea                                        title;
-	UI::Callback_Button                             metaserver;
-	UI::Callback_Button                           * showloginbox;
-	UI::Callback_Button                             lan;
-	UI::Callback_Button                             back;
+	UI::Button                             metaserver;
+	UI::Button                           * showloginbox;
+	UI::Button                             lan;
+	UI::Button                             back;
 
 	// Values from ggz login window
 	std::string m_nickname;

=== modified file 'src/ui_fsmenu/netsetup_ggz.cc'
--- src/ui_fsmenu/netsetup_ggz.cc	2011-07-31 18:09:39 +0000
+++ src/ui_fsmenu/netsetup_ggz.cc	2011-11-26 13:22:27 +0000
@@ -76,31 +76,22 @@
 		(this, "join_game",
 		 get_w() * 17 / 25, get_h() * 55 / 100, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_NetSetupGGZ::clicked_joingame,
-			  boost::ref(*this)),
 		 _("Join this game"), std::string(), false, false),
 	hostgame
 		(this, "host_game",
 		 get_w() * 17 / 25, get_h() * 81 / 100, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_NetSetupGGZ::clicked_hostgame,
-			  boost::ref(*this)),
 		 _("Open a new game"), std::string(), true, false),
 	back
 		(this, "back",
 		 get_w() * 17 / 25, get_h() * 90 / 100, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_NetSetupGGZ::end_modal,
-			  boost::ref(*this), static_cast<int32_t>(CANCEL)),
 		 _("Back"), std::string(), true, false),
 
 // Edit boxes
 	servername
 		(this, get_w() * 17 / 25, get_h() * 68 / 100, m_butw, m_buth,
-		 g_gr->get_picture(PicMod_UI, "pics/but2.png"), 0),
+		 g_gr->get_picture(PicMod_UI, "pics/but2.png")),
 
 // List
 	usersonline
@@ -124,6 +115,19 @@
 	password(pwd),
 	reg(registered)
 {
+	joingame.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_NetSetupGGZ::clicked_joingame,
+			  boost::ref(*this)));
+	hostgame.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_NetSetupGGZ::clicked_hostgame,
+			  boost::ref(*this)));
+	back.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_NetSetupGGZ::end_modal,
+			  boost::ref(*this), static_cast<int32_t>(CANCEL)));
+
 	back.set_font(font_small());
 	joingame.set_font(font_small());
 	hostgame.set_font(font_small());
@@ -139,8 +143,8 @@
 	maxplayers  .set_font(m_fn, m_fs, UI_FONT_CLR_FG);
 	std::string server = s.get_string("servername", "");
 	servername  .setText (server);
-	servername  .changed.set
-		(this, &Fullscreen_Menu_NetSetupGGZ::change_servername);
+	servername  .changed.connect
+		(boost::bind(&Fullscreen_Menu_NetSetupGGZ::change_servername, this));
 	servername  .set_font(m_fn, m_fs, UI_FONT_CLR_FG);
 
 	// prepare the lists
@@ -153,13 +157,13 @@
 		(0,
 		 boost::bind
 		 	(&Fullscreen_Menu_NetSetupGGZ::compare_usertype, this, _1, _2));
-	usersonline .double_clicked.set
-		(this, &Fullscreen_Menu_NetSetupGGZ::user_doubleclicked);
+	usersonline .double_clicked.connect
+		(boost::bind(&Fullscreen_Menu_NetSetupGGZ::user_doubleclicked, this, _1));
 	opengames   .set_font(m_fn, m_fs);
-	opengames   .selected.set
-		(this, &Fullscreen_Menu_NetSetupGGZ::server_selected);
-	opengames   .double_clicked.set
-		(this, &Fullscreen_Menu_NetSetupGGZ::server_doubleclicked);
+	opengames   .selected.connect
+		(boost::bind(&Fullscreen_Menu_NetSetupGGZ::server_selected, this, _1));
+	opengames   .double_clicked.connect
+		(boost::bind(&Fullscreen_Menu_NetSetupGGZ::server_doubleclicked, this, _1));
 
 	// try to connect to the metaserver
 	if (!NetGGZ::ref().usedcore())

=== modified file 'src/ui_fsmenu/netsetup_ggz.h'
--- src/ui_fsmenu/netsetup_ggz.h	2011-07-31 18:09:39 +0000
+++ src/ui_fsmenu/netsetup_ggz.h	2011-11-26 13:22:27 +0000
@@ -59,21 +59,21 @@
 	}
 
 private:
-	uint32_t                                    m_butx;
-	uint32_t                                    m_butw;
-	uint32_t                                    m_buth;
-	uint32_t                                    m_lisw;
-	uint32_t                                    m_fs;
-	std::string                                 m_fn;
-	UI::Textarea                                title, m_users, m_opengames;
-	UI::Textarea                                m_servername;
-	UI::Textarea                                m_maxplayers;
-	UI::SpinBox                                 maxplayers;
-	UI::Callback_Button                         joingame, hostgame, back;
-	UI::EditBox                                 servername;
-	UI::Table<const Net_Player * const>         usersonline;
-	UI::Listselect<Net_Open_Game>               opengames;
-	GameChatPanel                               chat;
+	uint32_t m_butx;
+	uint32_t m_butw;
+	uint32_t m_buth;
+	uint32_t m_lisw;
+	uint32_t m_fs;
+	std::string m_fn;
+	UI::Textarea title, m_users, m_opengames;
+	UI::Textarea m_servername;
+	UI::Textarea m_maxplayers;
+	UI::SpinBox maxplayers;
+	UI::Button joingame, hostgame, back;
+	UI::EditBox servername;
+	UI::Table<const Net_Player * const> usersonline;
+	UI::Listselect<Net_Open_Game> opengames;
+	GameChatPanel chat;
 
 	// Login information
 	const char * nickname;

=== modified file 'src/ui_fsmenu/netsetup_lan.cc'
--- src/ui_fsmenu/netsetup_lan.cc	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/netsetup_lan.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -56,46 +56,51 @@
 		(this, "join_game",
 		 get_w() * 16 / 25, get_h() * 5333 / 10000, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_NetSetupLAN::clicked_joingame, boost::ref(*this)),
 		 _("Join this game"), std::string(), true, false),
 	hostgame
 		(this, "host_game",
 		 get_w() * 16 / 25, get_h() * 6083 / 10000, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_NetSetupLAN::clicked_hostgame, boost::ref(*this)),
 		 _("Host a new game"), std::string(), true, false),
 	back
 		(this, "back",
 		 get_w() * 16 / 25, get_h() * 8333 / 10000, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_NetSetupLAN::end_modal, boost::ref(*this),
-			  static_cast<int32_t>(CANCEL)),
 		 _("Back"), std::string(), true, false),
 	loadlasthost
 		(this, "load_previous_host",
 		 get_w() * 171 / 200, get_h() * 19 / 40, m_buth, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/menu_load_game.png"),
-		 boost::bind
-			 (&Fullscreen_Menu_NetSetupLAN::clicked_lasthost, boost::ref(*this)),
 		 _("Load previous host"), true, false),
 
 // Edit boxes
 	playername
 		(this, get_w() * 16 / 25, get_h() * 3333 / 10000, m_butw,       m_buth,
-		 g_gr->get_picture(PicMod_UI, "pics/but2.png"), 0),
+		 g_gr->get_picture(PicMod_UI, "pics/but2.png")),
 	hostname
 		(this, get_w() * 16 / 25, get_h() * 19 / 40,  get_w() * 17 / 80, m_buth,
-		 g_gr->get_picture(PicMod_UI, "pics/but2.png"), 0),
+		 g_gr->get_picture(PicMod_UI, "pics/but2.png")),
 
 // List
 	opengames
 		(this,
 		 get_w() * 3 / 50, get_h() * 3333 / 10000, m_lisw, get_h() * 5433 / 10000)
 {
+	joingame.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_NetSetupLAN::clicked_joingame, boost::ref(*this)));
+	hostgame.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_NetSetupLAN::clicked_hostgame, boost::ref(*this)));
+	back.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_NetSetupLAN::end_modal, boost::ref(*this),
+			  static_cast<int32_t>(CANCEL)));
+	loadlasthost.sigclicked.connect
+		(boost::bind
+			 (&Fullscreen_Menu_NetSetupLAN::clicked_lasthost, boost::ref(*this)));
+
 	Section & s = g_options.pull_section("global"); //  for playername
 
 	joingame.set_font(font_small());
@@ -107,20 +112,20 @@
 	m_opengames .set_textstyle(ts_small());
 	m_playername.set_textstyle(ts_small());
 	m_hostname  .set_textstyle(ts_small());
-	hostname    .changed.set
-		(this, &Fullscreen_Menu_NetSetupLAN::change_hostname);
+	hostname    .changed.connect
+		(boost::bind(&Fullscreen_Menu_NetSetupLAN::change_hostname, this));
 	hostname    .set_font(ui_fn(), fs_small(), UI_FONT_CLR_FG);
 	playername  .setText  (s.get_string("nickname", (_("nobody"))));
-	playername  .changed.set
-		(this, &Fullscreen_Menu_NetSetupLAN::change_playername);
+	playername  .changed.connect
+		(boost::bind(&Fullscreen_Menu_NetSetupLAN::change_playername, this));
 	playername  .set_font(ui_fn(), fs_small(), UI_FONT_CLR_FG);
 	opengames   .set_font(ui_fn(), fs_small());
 	opengames   .add_column(m_lisw * 2 / 5, _("Host"));
 	opengames   .add_column(m_lisw * 2 / 5, _("Map"));
 	opengames   .add_column(m_lisw     / 5, _("State"));
-	opengames   .selected.set(this, &Fullscreen_Menu_NetSetupLAN::game_selected);
-	opengames   .double_clicked.set
-		(this, &Fullscreen_Menu_NetSetupLAN::game_doubleclicked);
+	opengames   .selected.connect(boost::bind(&Fullscreen_Menu_NetSetupLAN::game_selected, this, _1));
+	opengames   .double_clicked.connect
+		(boost::bind(&Fullscreen_Menu_NetSetupLAN::game_doubleclicked, this, _1));
 	discovery   .set_callback (discovery_callback, this);
 
 	joingame.set_enabled(false);

=== modified file 'src/ui_fsmenu/netsetup_lan.h'
--- src/ui_fsmenu/netsetup_lan.h	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/netsetup_lan.h	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -61,17 +61,17 @@
 	std::string const & get_playername();
 
 private:
-	uint32_t                                    m_butx;
-	uint32_t                                    m_butw;
-	uint32_t                                    m_buth;
-	uint32_t                                    m_lisw;
-	UI::Textarea                                title, m_opengames;
-	UI::Textarea                                m_playername, m_hostname;
-	UI::Callback_Button                     joingame, hostgame, back, loadlasthost;
-	UI::EditBox                                 playername;
-	UI::EditBox                                 hostname;
-	UI::Table<const Net_Open_Game * const>      opengames;
-	LAN_Game_Finder                             discovery;
+	uint32_t m_butx;
+	uint32_t m_butw;
+	uint32_t m_buth;
+	uint32_t m_lisw;
+	UI::Textarea title, m_opengames;
+	UI::Textarea m_playername, m_hostname;
+	UI::Button joingame, hostgame, back, loadlasthost;
+	UI::EditBox playername;
+	UI::EditBox hostname;
+	UI::Table<const Net_Open_Game * const> opengames;
+	LAN_Game_Finder discovery;
 
 	void game_selected (uint32_t);
 	void game_doubleclicked (uint32_t);

=== modified file 'src/ui_fsmenu/options.cc'
--- src/ui_fsmenu/options.cc	2011-02-18 14:38:56 +0000
+++ src/ui_fsmenu/options.cc	2011-11-26 13:22:27 +0000
@@ -48,19 +48,16 @@
 		(this, "advanced_options",
 		 get_w() * 9 / 80, get_h() * 19 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-		 boost::bind(&Fullscreen_Menu_Options::advanced_options, boost::ref(*this)),
 		 _("Advanced Options"), std::string(), true, false),
 	m_cancel
 		(this, "cancel",
 		 get_w() * 51 / 80, get_h() * 19 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Fullscreen_Menu_Options::end_modal, boost::ref(*this), static_cast<int32_t>(om_cancel)),
 		 _("Cancel"), std::string(), true, false),
 	m_apply
 		(this, "apply",
 		 get_w() * 3 / 8, get_h() * 19 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-		 boost::bind(&Fullscreen_Menu_Options::end_modal, boost::ref(*this), static_cast<int32_t>(om_ok)),
 		 _("Apply"), std::string(), true, false),
 
 // Spinboxes
@@ -187,6 +184,13 @@
 
 	os(opt)
 {
+	m_advanced_options.sigclicked.connect
+		(boost::bind(&Fullscreen_Menu_Options::advanced_options, boost::ref(*this)));
+	m_cancel.sigclicked.connect
+		(boost::bind(&Fullscreen_Menu_Options::end_modal, this, static_cast<int32_t>(om_cancel)));
+	m_apply.sigclicked.connect
+		(boost::bind(&Fullscreen_Menu_Options::end_modal, this, static_cast<int32_t>(om_ok)));
+
 	m_advanced_options.set_font(font_small());
 	m_apply.set_font(font_small());
 	m_cancel.set_font(font_small());
@@ -383,19 +387,11 @@
 		(this, "cancel",
 		 get_w() * 41 / 80, get_h() * 19 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind
-			(&Fullscreen_Menu_Advanced_Options::end_modal,
-			 boost::ref(*this),
-			 static_cast<int32_t>(om_cancel)),
 		 _("Cancel"), std::string(), true, false),
 	m_apply
 		(this, "apply",
 		 get_w() / 4,   get_h() * 19 / 20, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-		 boost::bind
-			(&Fullscreen_Menu_Advanced_Options::end_modal,
-			 boost::ref(*this),
-			 static_cast<int32_t>(om_ok)),
 		 _("Apply"), std::string(), true, false),
 
 // Spinboxes
@@ -479,6 +475,17 @@
 
 	os(opt)
 {
+	m_cancel.sigclicked.connect
+		(boost::bind
+			(&Fullscreen_Menu_Advanced_Options::end_modal,
+			 boost::ref(*this),
+			 static_cast<int32_t>(om_cancel)));
+	m_apply.sigclicked.connect
+		(boost::bind
+			(&Fullscreen_Menu_Advanced_Options::end_modal,
+			 boost::ref(*this),
+			 static_cast<int32_t>(om_ok)));
+
 	m_cancel.set_font(font_small());
 	m_apply.set_font(font_small());
 

=== modified file 'src/ui_fsmenu/options.h'
--- src/ui_fsmenu/options.h	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/options.h	2011-11-26 13:22:27 +0000
@@ -93,7 +93,7 @@
 	uint32_t                          m_vbutw;
 	uint32_t                          m_butw;
 	uint32_t                          m_buth;
-	UI::Callback_Button           m_advanced_options, m_cancel, m_apply;
+	UI::Button           m_advanced_options, m_cancel, m_apply;
 	UI::SpinBox                       m_sb_maxfps, m_sb_autosave;
 	UI::SpinBox                       m_sb_remove_replays;
 	UI::Textarea                      m_title;
@@ -152,7 +152,7 @@
 	uint32_t                    m_butw;
 	uint32_t                    m_buth;
 
-	UI::Callback_Button     m_cancel, m_apply;
+	UI::Button     m_cancel, m_apply;
 	UI::SpinBox                 m_sb_speed, m_sb_dis_panel, m_sb_dis_border;
 	UI::Textarea                m_title;
 	UI::Listselect<std::string> m_ui_font_list;

=== modified file 'src/ui_fsmenu/singleplayer.cc'
--- src/ui_fsmenu/singleplayer.cc	2010-12-04 23:11:18 +0000
+++ src/ui_fsmenu/singleplayer.cc	2011-11-26 13:22:27 +0000
@@ -43,36 +43,41 @@
 		(this, "new_game",
 		 m_butx, get_h() * 6 / 25, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind
-			(&Fullscreen_Menu_SinglePlayer::end_modal,
-			 boost::ref(*this),
-			 static_cast<int32_t>(New_Game)),
 		 _("New Game"), std::string(), true, false),
 	campaign
 		(this, "campaigns",
 		 m_butx, get_h() * 61 / 200, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind
-			(&Fullscreen_Menu_SinglePlayer::end_modal,
-			 boost::ref(*this),
-			 static_cast<int32_t>(Campaign)),
 		 _("Campaigns"), std::string(), true, false),
 	load_game
 		(this, "load_game",
 		 m_butx, get_h() * 87 / 200, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
-		 boost::bind
-			(&Fullscreen_Menu_SinglePlayer::end_modal,
-			 boost::ref(*this),
-			 static_cast<int32_t>(Load_Game)),
 		 _("Load Game"), std::string(), true, false),
 	back
 		(this, "back",
 		 m_butx, get_h() * 3 / 4, m_butw, m_buth,
 		 g_gr->get_picture(PicMod_UI, "pics/but0.png"),
-		 boost::bind(&Fullscreen_Menu_SinglePlayer::end_modal, boost::ref(*this), static_cast<int32_t>(Back)),
 		 _("Back"), std::string(), true, false)
 {
+	new_game.sigclicked.connect
+		(boost::bind
+			(&Fullscreen_Menu_SinglePlayer::end_modal,
+			 boost::ref(*this),
+			 static_cast<int32_t>(New_Game)));
+	campaign.sigclicked.connect
+		(boost::bind
+			(&Fullscreen_Menu_SinglePlayer::end_modal,
+			 boost::ref(*this),
+			 static_cast<int32_t>(Campaign)));
+	load_game.sigclicked.connect
+		(boost::bind
+			(&Fullscreen_Menu_SinglePlayer::end_modal,
+			 boost::ref(*this),
+			 static_cast<int32_t>(Load_Game)));
+	back.sigclicked.connect
+		(boost::bind(&Fullscreen_Menu_SinglePlayer::end_modal, boost::ref(*this), static_cast<int32_t>(Back)));
+
 	back.set_font(font_small());
 	new_game.set_font(font_small());
 	campaign.set_font(font_small());

=== modified file 'src/ui_fsmenu/singleplayer.h'
--- src/ui_fsmenu/singleplayer.h	2010-10-17 19:42:01 +0000
+++ src/ui_fsmenu/singleplayer.h	2011-11-26 13:22:27 +0000
@@ -41,10 +41,10 @@
 	uint32_t                                            m_fs;
 	std::string                                         m_fn;
 	UI::Textarea                                        title;
-	UI::Callback_Button                             new_game;
-	UI::Callback_Button                             campaign;
-	UI::Callback_Button                             load_game;
-	UI::Callback_Button                             back;
+	UI::Button                             new_game;
+	UI::Button                             campaign;
+	UI::Button                             load_game;
+	UI::Button                             back;
 };
 
 #endif

=== modified file 'src/wui/attack_box.cc'
--- src/wui/attack_box.cc	2010-12-04 23:11:18 +0000
+++ src/wui/attack_box.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -105,22 +105,22 @@
 	return result;
 }
 
-UI::Callback_Button & AttackBox::add_button
+UI::Button & AttackBox::add_button
 	(UI::Box           & parent,
 	 char        const * const text,
 	 void         (AttackBox::*fn)(),
 	 std::string const & tooltip_text)
 {
-	UI::Callback_Button & button =
-		*new UI::Callback_Button
+	UI::Button * button =
+		new UI::Button
 			(&parent, text,
 			 8, 8, 26, 26,
 			 g_gr->get_picture(PicMod_UI, "pics/but2.png"),
-			 boost::bind(fn, boost::ref(*this)),
 			 text,
 			 tooltip_text);
-	parent.add(&button, Box::AlignCenter);
-	return button;
+	button->sigclicked.connect(boost::bind(fn, boost::ref(*this)));
+	parent.add(button, Box::AlignCenter);
+	return *button;
 }
 
 void AttackBox::update_attack() {
@@ -198,7 +198,7 @@
 				 "pics/but2.png",
 				 _("Number of soldiers"));
 
-		m_slider_soldiers->changed.set(this, &AttackBox::update_attack);
+		m_slider_soldiers->changed.connect(boost::bind(&AttackBox::update_attack, this));
 
 		sprintf(buf, "%u", max_attackers);
 		m_add_soldiers =
@@ -237,7 +237,7 @@
 				 m_pl->get_retreat_percentage(),
 				 "pics/but2.png",
 				 _("Supported damage before retreat"));
-		m_slider_retreat->changed.set(this, &AttackBox::update_attack);
+		m_slider_retreat->changed.connect(boost::bind(&AttackBox::update_attack, this));
 		add_text(linebox, _("Once injured"));
 		m_slider_retreat->set_enabled(m_pl->is_retreat_change_allowed());
 		linebox.set_visible(m_pl->is_retreat_change_allowed());

=== modified file 'src/wui/attack_box.h'
--- src/wui/attack_box.h	2010-10-17 19:42:01 +0000
+++ src/wui/attack_box.h	2011-11-26 13:22:27 +0000
@@ -69,7 +69,7 @@
 			 uint32_t            alignment = UI::Box::AlignTop,
 			 std::string const & fontname = UI_FONT_NAME,
 			 uint32_t            fontsize = UI_FONT_SIZE_SMALL);
-		UI::Callback_Button & add_button
+		UI::Button & add_button
 			(UI::Box           & parent,
 			 char const * picname,
 			 void (AttackBox::*fn)(),
@@ -89,8 +89,8 @@
 		UI::Textarea          * m_text_soldiers;
 		UI::Textarea          * m_text_retreat;
 
-		UI::Callback_Button * m_less_soldiers;
-		UI::Callback_Button * m_add_soldiers;
+		UI::Button * m_less_soldiers;
+		UI::Button * m_add_soldiers;
 };
 
 #endif

=== modified file 'src/wui/building_statistics_menu.cc'
--- src/wui/building_statistics_menu.cc	2011-02-18 15:33:09 +0000
+++ src/wui/building_statistics_menu.cc	2011-11-26 13:22:27 +0000
@@ -114,7 +114,7 @@
 	m_table.add_column (50, _("Prod"),     UI::Align_Right);
 	m_table.add_column (50, _("Owned"),    UI::Align_Right);
 	m_table.add_column (50, _("Build"),    UI::Align_HCenter);
-	m_table.selected.set(this, &Building_Statistics_Menu::table_changed);
+	m_table.selected.connect(boost::bind(&Building_Statistics_Menu::table_changed, this, _1));
 	m_table.set_column_compare
 		(Columns::Size,
 		 boost::bind
@@ -124,64 +124,70 @@
 	m_progbar.set_total(100);
 
 	m_btn[Prev_Owned] =
-		new UI::Callback_Button
+		new UI::Button
 			(this, "previous_owned",
 			 JUMP_PREV_BUTTON_X, OWNED_Y, 24, 24,
 			 g_gr->get_picture(PicMod_UI, "pics/but4.png"),
 			 g_gr->get_picture(PicMod_UI, "pics/scrollbar_left.png"),
-			 boost::bind(&Building_Statistics_Menu::clicked_jump, boost::ref(*this), Prev_Owned),
 			 _("Show previous"),
 			 false);
+	m_btn[Prev_Owned]->sigclicked.connect
+		(boost::bind(&Building_Statistics_Menu::clicked_jump, boost::ref(*this), Prev_Owned));
 
 	m_btn[Next_Owned] =
-		new UI::Callback_Button
+		new UI::Button
 			(this, "next_owned",
 			 JUMP_NEXT_BUTTON_X, OWNED_Y, 24, 24,
 			 g_gr->get_picture(PicMod_UI, "pics/but4.png"),
 			 g_gr->get_picture(PicMod_UI, "pics/scrollbar_right.png"),
-			 boost::bind(&Building_Statistics_Menu::clicked_jump, boost::ref(*this), Next_Owned),
 			 _("Show next"),
 			 false);
+	m_btn[Next_Owned]->sigclicked.connect
+		(boost::bind(&Building_Statistics_Menu::clicked_jump, boost::ref(*this), Next_Owned));
 
 	m_btn[Prev_Construction] =
-		new UI::Callback_Button
+		new UI::Button
 			(this, "previous_constructed",
 			 JUMP_PREV_BUTTON_X, IN_BUILD_Y, 24, 24,
 			 g_gr->get_picture(PicMod_UI, "pics/but4.png"),
 			 g_gr->get_picture(PicMod_UI, "pics/scrollbar_left.png"),
-			 boost::bind(&Building_Statistics_Menu::clicked_jump, boost::ref(*this), Prev_Construction),
 			 _("Show previous"),
 			 false);
+	m_btn[Prev_Construction]->sigclicked.connect
+		(boost::bind(&Building_Statistics_Menu::clicked_jump, boost::ref(*this), Prev_Construction));
 
 	m_btn[Next_Construction] =
-		new UI::Callback_Button
+		new UI::Button
 			(this, "next_constructed",
 			 JUMP_NEXT_BUTTON_X, IN_BUILD_Y, 24, 24,
 			 g_gr->get_picture(PicMod_UI, "pics/but4.png"),
 			 g_gr->get_picture(PicMod_UI, "pics/scrollbar_right.png"),
-			 boost::bind(&Building_Statistics_Menu::clicked_jump, boost::ref(*this), Next_Construction),
 			 _("Show next"),
 			 false);
+	m_btn[Next_Construction]->sigclicked.connect
+		(boost::bind(&Building_Statistics_Menu::clicked_jump, boost::ref(*this), Next_Construction));
 
 	m_btn[Prev_Unproductive] =
-		new UI::Callback_Button
+		new UI::Button
 			(this, "previous_unproductive",
 			 JUMP_PREV_BUTTON_X, UNPRODUCTIVE_Y, 24, 24,
 			 g_gr->get_picture(PicMod_UI, "pics/but4.png"),
 			 g_gr->get_picture(PicMod_UI, "pics/scrollbar_left.png"),
-			 boost::bind(&Building_Statistics_Menu::clicked_jump, boost::ref(*this), Prev_Unproductive),
 			 _("Show previous"),
 			 false);
+	m_btn[Prev_Unproductive]->sigclicked.connect
+		(boost::bind(&Building_Statistics_Menu::clicked_jump, boost::ref(*this), Prev_Unproductive));
 
 	m_btn[Next_Unproductive] =
-		new UI::Callback_Button
+		new UI::Button
 			(this, "next_unproductive",
 			 JUMP_NEXT_BUTTON_X, UNPRODUCTIVE_Y, 24, 24,
 			 g_gr->get_picture(PicMod_UI, "pics/but4.png"),
 			 g_gr->get_picture(PicMod_UI, "pics/scrollbar_right.png"),
-			 boost::bind(&Building_Statistics_Menu::clicked_jump, boost::ref(*this), Next_Unproductive),
 			 _("Show next"),
 			 false);
+	m_btn[Next_Unproductive]->sigclicked.connect
+		(boost::bind(&Building_Statistics_Menu::clicked_jump, boost::ref(*this), Next_Unproductive));
 }
 
 

=== modified file 'src/wui/building_statistics_menu.h'
--- src/wui/building_statistics_menu.h	2011-02-18 15:33:09 +0000
+++ src/wui/building_statistics_menu.h	2011-11-26 13:22:27 +0000
@@ -28,7 +28,7 @@
 namespace Widelands {struct Building_Descr;}
 struct Interactive_Player;
 namespace UI {
-struct Callback_Button;
+struct Button;
 struct Progress_Bar;
 struct Textarea;
 }
@@ -62,7 +62,7 @@
 	uint32_t                  m_anim;
 	uint32_t                  m_lastupdate;
 	uint32_t                  m_end_of_table_y;
-	UI::Callback_Button * m_btn[6];
+	UI::Button * m_btn[6];
 	int32_t                   m_last_building_index;
 	uint32_t                  m_last_table_index;
 

=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc	2011-11-08 21:25:16 +0000
+++ src/wui/buildingwindow.cc	2011-11-26 13:22:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -164,16 +164,17 @@
 		if (upcast(Widelands::ProductionSite const, productionsite, &m_building))
 			if (not dynamic_cast<Widelands::MilitarySite const *>(productionsite)) {
 				bool const is_stopped = productionsite->is_stopped();
-				capsbuttons->add
-					(new UI::Callback_Button
-						(capsbuttons, is_stopped ? "continue" : "stop",