gui2/tpreferences: Macro scope cleanup

wesnoth · Feb 21, 2016 · b04c158 · b04c158
1 parent eabe55b
commit b04c158
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/data/gui/default/window/preferences.cfg b/data/gui/default/window/preferences.cfg
@@ -246,3 +246,4 @@
 #undef _GUI_PREFS_PAGE5
 #undef _GUI_PREFS_PAGE
 #undef _GUI_INFO_TAB_PADDING
+#undef _GUI_TAB_BAR
diff --git a/data/gui/default/window/preferences/01_general.cfg b/data/gui/default/window/preferences/01_general.cfg
@@ -317,3 +317,4 @@
 
 #undef _GUI_PREFERENCES_GENERAL_GRID_1
 #undef _GUI_PREFERENCES_GENERAL_GRID_2
+#undef _GUI_PREFERENCES_MAIN_COMPOSITE_SLIDER
diff --git a/data/gui/default/window/preferences/02_display.cfg b/data/gui/default/window/preferences/02_display.cfg
@@ -261,4 +261,3 @@
 
 #undef _GUI_PREFERENCES_DISPLAY_GRID_1
 #undef _GUI_PREFERENCES_DISPLAY_GRID_2
-#undef _GUI_PREFERENCES_DISPLAY_GRID_2
diff --git a/data/gui/default/window/preferences/04_multiplayer.cfg b/data/gui/default/window/preferences/04_multiplayer.cfg
@@ -484,3 +484,4 @@
 #undef _GUI_PREFERENCES_MP_PAGE_1_GRID_2
 #undef _GUI_PREFERENCES_MP_PAGE_2
 #undef _GUI_PREFERENCES_MP_SWITCH_ROW
+#undef _GUI_LOBBY_SOUNDS_ENTRY
diff --git a/data/gui/default/window/preferences/_final.cfg b/data/gui/default/window/preferences/_final.cfg
@@ -1,3 +1,3 @@
 #undef _GUI_PREFERENCES_SPACER_ROW
 #undef _GUI_PREFERENCES_CHECKBOX_ALIGN_SPACER
-
+#undef _GUI_PREFERENCES_CHECKBOX_ALIGN_BORDER