moved wml/widget separators to their own header;

drop widget/button dependency on wodget/menu

src/actions.cpp

@@ -33,6 +33,7 @@
 #include "unit_display.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/menu.hpp"
 

src/dialogs.cpp

@@ -27,6 +27,7 @@
 #include "show_dialog.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/menu.hpp"
 #include "widgets/progressbar.hpp"

src/editor/editor.cpp

@@ -31,6 +31,7 @@
 #include "../team.hpp"
 #include "../util.hpp"
 #include "../video.hpp"
+#include "../wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 
 #include "editor.hpp"

src/game.cpp

@@ -51,6 +51,7 @@
 #include "unit.hpp"
 #include "video.hpp"
 #include "wassert.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/button.hpp"
 #include "widgets/menu.hpp"

src/help.cpp

@@ -25,6 +25,7 @@
 #include "unit.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/button.hpp"
 #include "widgets/menu.hpp"

src/leader_list.cpp

@@ -12,6 +12,7 @@
 */
 
 #include "leader_list.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/menu.hpp"
 

src/multiplayer_lobby.cpp

@@ -16,6 +16,7 @@
 #include "filesystem.hpp"
 #include "font.hpp"
 #include "wassert.hpp"
+#include "wml_separators.hpp"
 
 namespace mp {
 

src/multiplayer_wait.cpp

@@ -11,12 +11,13 @@
    See the COPYING file for more details.
 */
 
+#include "log.hpp"
 #include "multiplayer_wait.hpp"
 #include "preferences.hpp"
-#include "log.hpp"
-#include "wassert.hpp"
-#include "util.hpp"
 #include "replay.hpp"
+#include "util.hpp"
+#include "wassert.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 
 #define LOG_NW lg::info(lg::network)

src/playturn.cpp

@@ -34,6 +34,7 @@
 #include "unit_display.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/menu.hpp"
 

src/preferences.cpp

@@ -26,12 +26,13 @@
 #include "show_dialog.hpp"
 #include "sound.hpp"
 #include "util.hpp"
+#include "wesconfig.h"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/button.hpp"
 #include "widgets/label.hpp"
 #include "widgets/menu.hpp"
 #include "widgets/slider.hpp"
-#include "wesconfig.h"
 
 #include <cstdlib>
 #include <iostream>

src/widgets/button.cpp

@@ -14,7 +14,6 @@
 #include "../global.hpp"
 
 #include "button.hpp"
-#include "menu.hpp"
 #include "../display.hpp"
 #include "../game.hpp"
 #include "../font.hpp"
@@ -22,6 +21,7 @@
 #include "../log.hpp"
 #include "../util.hpp"
 #include "../video.hpp"
+#include "../wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 
 namespace gui {

src/widgets/file_chooser.cpp

@@ -20,6 +20,7 @@
 #include "../font.hpp"
 #include "../language.hpp"
 #include "../show_dialog.hpp"
+#include "../wml_separators.hpp"
 #include "file_chooser.hpp"
 
 #include <sstream>

src/widgets/menu.cpp

@@ -7,6 +7,7 @@
 #include "../show_dialog.hpp"
 #include "../util.hpp"
 #include "../video.hpp"
+#include "../wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 
 #include <numeric>

src/widgets/menu.hpp

@@ -12,9 +12,6 @@
 
 #include "SDL.h"
 
-char const HELP_STRING_SEPARATOR = '|', DEFAULT_ITEM = '*', COLUMN_SEPARATOR = '=',
-           IMAGE_PREFIX = '&', IMG_TEXT_SEPARATOR = 1;
-
 namespace gui {
 
 class menu : public scrollarea

src/wml_separators.hpp

@@ -0,0 +1,7 @@
+#ifndef WIDGET_DEFINES_HPP_INCLUDED
+#define WIDGET_DEFINES_HPP_INCLUDED
+
+char const HELP_STRING_SEPARATOR = '|', DEFAULT_ITEM = '*', COLUMN_SEPARATOR = '=',
+           IMAGE_PREFIX = '&', IMG_TEXT_SEPARATOR = 1;
+
+#endif