Removed non-functional video2::draw_layering class

Will possibly re-implement this in a different way.

src/controller_base.cpp

@@ -32,7 +32,7 @@ static lg::log_domain log_display("display");
 #define ERR_DP LOG_STREAM(err, log_display)
 
 controller_base::controller_base(const config& game_config)
-	: draw_layering(false)
+	: events::sdl_handler(false)
 	, game_config_(game_config)
 	, key_()
 	, scrolling_(false)

src/controller_base.hpp

@@ -40,7 +40,6 @@
 #include "joystick.hpp"
 #include "key.hpp"
 #include "quit_confirmation.hpp"
-#include "video.hpp"
 
 class display;
 class plugins_context;
@@ -60,7 +59,7 @@ namespace soundsource
 class manager;
 }
 
-class controller_base : public video2::draw_layering
+class controller_base : public events::sdl_handler
 {
 public:
 	controller_base(const config& game_config);

src/display.cpp

@@ -141,7 +141,7 @@ void display::remove_single_overlay(const map_location& loc, const std::string&
 }
 
 display::display(const display_context * dc, std::weak_ptr<wb::manager> wb, reports & reports_object, const config& theme_cfg, const config& level, bool auto_join)
-	: video2::draw_layering(auto_join)
+	: events::sdl_handler(auto_join)
 	, dc_(dc)
 	, halo_man_(new halo::manager())
 	, wb_(wb)

src/display.hpp

@@ -53,6 +53,7 @@ class manager;
 #include "animated.hpp"
 #include "display_context.hpp"
 #include "drawing_queue.hpp"
+#include "events.hpp"
 #include "font/standard_colors.hpp"
 #include "image.hpp" //only needed for enums (!)
 #include "key.hpp"
@@ -77,7 +78,7 @@ class manager;
 
 class gamemap;
 
-class display : public video2::draw_layering
+class display : public events::sdl_handler
 {
 public:
 	display(const display_context* dc,

src/gui/core/event/distributor.hpp

@@ -303,6 +303,7 @@ public:
 	widget* keyboard_focus() const;
 
 private:
+#if 0
 	class layer : public video2::draw_layering
 	{
 	public:
@@ -314,7 +315,6 @@ private:
 	// make sure the appropriate things happens when we close.
 	layer layer_;
 
-#if 0
 	bool hover_pending_;			   /**< Is there a hover event pending? */
 	unsigned hover_id_;                /**< Id of the pending hover event. */
 	SDL_Rect hover_box_;               /**< The area the mouse can move in,

src/show_dialog.hpp

@@ -48,7 +48,7 @@ private:
 	bool reset_to;
 };
 
-class dialog_frame :public video2::draw_layering {
+class dialog_frame :public events::sdl_handler {
 public:
 	struct dimension_measurements {
 		dimension_measurements();

src/video.cpp

@@ -45,24 +45,6 @@ surface frameBuffer = nullptr;
 bool fake_interactive = false;
 }
 
-namespace video2
-{
-std::list<events::sdl_handler*> draw_layers;
-
-draw_layering::draw_layering(const bool auto_join)
-	: sdl_handler(auto_join)
-{
-	draw_layers.push_back(this);
-}
-
-draw_layering::~draw_layering()
-{
-	draw_layers.remove(this);
-}
-
-
-} // video2
-
 CVideo::CVideo(FAKE_TYPES type)
 	: window()
 #ifdef USE_GL_RENDERING

src/video.hpp

@@ -325,14 +325,3 @@ public:
 private:
 	CVideo& video_;
 };
-
-namespace video2
-{
-class draw_layering : public events::sdl_handler
-{
-protected:
-	draw_layering(const bool auto_join = true);
-	virtual ~draw_layering();
-};
-
-}