From f7a2b5112e392784c79ba8321f61e6419ac2f375 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Wed, 23 Aug 2017 15:51:08 +1100
Subject: [PATCH] GUI2/Dispatcher: changed dispatcher signals to take a widget
 reference as a first parameter

This fixes an issue where functions taking `widget` as a parameter couldn't be bound to a signal function
with the first argument passed via placeholder since `std::bind` requires arguments match exactly when using
the placeholders.

The dispatcher's `this` was cast to `widget` before the signal functions were fired anyway, so this doesn't
really constitute any functional change.
---
 src/gui/core/event/dispatcher.cpp |  2 +-
 src/gui/core/event/dispatcher.hpp | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gui/core/event/dispatcher.cpp b/src/gui/core/event/dispatcher.cpp
index 1d8e0ba77d15..119e9749c8b8 100644
--- a/src/gui/core/event/dispatcher.cpp
+++ b/src/gui/core/event/dispatcher.cpp
@@ -198,7 +198,7 @@ bool dispatcher::execute_hotkey(const hotkey::HOTKEY_COMMAND id)
 		return false;
 	}
 
-	return itor->second(*this, id);
+	return itor->second(dynamic_cast<widget&>(*this), id);
 }
 
 } // namespace event
diff --git a/src/gui/core/event/dispatcher.hpp b/src/gui/core/event/dispatcher.hpp
index 3d4e6a547e2b..75237b930146 100644
--- a/src/gui/core/event/dispatcher.hpp
+++ b/src/gui/core/event/dispatcher.hpp
@@ -51,7 +51,7 @@ struct message;
  *
  * This function is used for the callbacks in set_event.
  */
-typedef std::function<void(dispatcher& dispatcher,
+typedef std::function<void(widget& dispatcher,
 							const ui_event event,
 							bool& handled, bool& halt)> signal_function;
 
@@ -60,7 +60,7 @@ typedef std::function<void(dispatcher& dispatcher,
  *
  * This function is used for the callbacks in set_event_mouse.
  */
-typedef std::function<void(dispatcher& dispatcher,
+typedef std::function<void(widget& dispatcher,
 							 const ui_event event,
 							 bool& handled,
 							 bool& halt,
@@ -71,7 +71,7 @@ typedef std::function<void(dispatcher& dispatcher,
  *
  * This function is used for the callbacks in set_event_keyboard.
  */
-typedef std::function<void(dispatcher& dispatcher,
+typedef std::function<void(widget& dispatcher,
 							 const ui_event event,
 							 bool& handled,
 							 bool& halt,
@@ -84,7 +84,7 @@ typedef std::function<void(dispatcher& dispatcher,
  *
  * This function is used for the callbacks in set_event_touch.
  */
-typedef std::function<void(dispatcher& dispatcher,
+typedef std::function<void(widget& dispatcher,
 							 const ui_event event,
 							 bool& handled,
 							 bool& halt,
@@ -98,7 +98,7 @@ typedef std::function<void(dispatcher& dispatcher,
  * Added the dummy void* parameter which will be nullptr to get a different
  * signature as signal_function's callback.
  */
-typedef std::function<void(dispatcher& dispatcher,
+typedef std::function<void(widget& dispatcher,
 							 const ui_event event,
 							 bool& handled,
 							 bool& halt,
@@ -109,7 +109,7 @@ typedef std::function<void(dispatcher& dispatcher,
  *
  * This function is used for the callbacks in set_event_message.
  */
-typedef std::function<void(dispatcher& dispatcher,
+typedef std::function<void(widget& dispatcher,
 							 const ui_event event,
 							 bool& handled,
 							 bool& halt,
@@ -120,7 +120,7 @@ typedef std::function<void(dispatcher& dispatcher,
  *
  * This function is used for the callbacks in set_event_raw_event.
  */
-typedef std::function<void(dispatcher& dispatcher,
+typedef std::function<void(widget& dispatcher,
 						   const ui_event event,
 						   bool& handled,
 						   bool& halt,
@@ -131,7 +131,7 @@ typedef std::function<void(dispatcher& dispatcher,
  *
  * This function is used for the callbacks in set_event_text_input.
  */
-typedef std::function<void(dispatcher& dispatcher,
+typedef std::function<void(widget& dispatcher,
 						   const ui_event event,
 						   bool& handled,
 						   bool& halt,
@@ -140,7 +140,7 @@ typedef std::function<void(dispatcher& dispatcher,
 						   int32_t select_len)> signal_text_input_function;
 
 /** Hotkey function handler signature. */
-typedef std::function<bool(dispatcher& dispatcher,
+typedef std::function<bool(widget& dispatcher,
 							 hotkey::HOTKEY_COMMAND id)> hotkey_function;
 
 /**
@@ -155,7 +155,7 @@ typedef std::function<bool(dispatcher& dispatcher,
  * track the mouse location and fire MOUSE_ENTER and MOUSE_LEAVE events to the
  * widgets involved.
  *
- * [1] Not really sure whether it will be a base clase for a widget or
+ * [1] Not really sure whether it will be a base class for a widget or
  * styled_widget yet.
  */
 class dispatcher