include cleanup: widgets/*

src/widgets/combo.hpp

@@ -16,7 +16,7 @@
 #include "SDL.h"
 
 #include "button.hpp"
-#include "../display.hpp"
+class display;
 
 namespace gui {
 

src/widgets/file_chooser.cpp

@@ -14,7 +14,8 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "../display.hpp"
+class display;
+
 #include "../events.hpp"
 #include "../filesystem.hpp"
 #include "../font.hpp"

src/widgets/menu.cpp

@@ -2,6 +2,7 @@
 
 #include "menu.hpp"
 
+#include "../display.hpp"
 #include "../font.hpp"
 #include "../sdl_utils.hpp"
 #include "../show_dialog.hpp"

src/widgets/menu.hpp

@@ -4,7 +4,8 @@
 #include <string>
 #include <vector>
 
-#include "../display.hpp"
+class display;
+
 #include "../events.hpp"
 #include "../sdl_utils.hpp"
 

src/widgets/scrollarea.cpp

@@ -13,10 +13,9 @@
 
 #include "../global.hpp"
 
+class display;
+
 #include "scrollarea.hpp"
-#include "../display.hpp"
-#include "../image.hpp"
-#include "../video.hpp"
 
 #include <algorithm>
 #include <iostream>

src/widgets/scrollpane.hpp

@@ -20,7 +20,6 @@
 #include "SDL.h"
 #include "../sdl_utils.hpp"
 #include "scrollarea.hpp"
-#include "widget.hpp"
 
 namespace gui {
 

src/widgets/textbox.hpp

@@ -14,8 +14,6 @@
 #ifndef TEXTBOX_HPP_INCLUDED
 #define TEXTBOX_HPP_INCLUDED
 
-#include "../events.hpp"
-#include "../key.hpp"
 #include "../serialization/string_utils.hpp"
 #include "../sdl_utils.hpp"
 

src/widgets/widget.hpp

@@ -6,6 +6,7 @@
 
 #include "SDL.h"
 
+#include <string>
 #include <vector>
 
 class display;