(svn r16224) -Codechange: Move BuildRailStationWidgets and BuildRailWaypointWidgets enums out of their Window structs, extend horizontal scrollbar by 1 pixel.

src/rail_gui.cpp

@@ -873,10 +873,8 @@ static void HandleStationPlacement(TileIndex start, TileIndex end)
 	ShowSelectStationIfNeeded(cmdcont, w, h);
 }
 
-struct BuildRailStationWindow : public PickerWindowBase {
+/** Enum referring to the widgets of the rail stations window */
-private:
+enum BuildRailStationWidgets {
-	/** Enum referring to the widgets of the rail stations window */
-	enum BuildRailStationWidgets {
 	BRSW_CLOSEBOX = 0,
 	BRSW_CAPTION,
 	BRSW_BACKGROUND,
@@ -910,8 +908,10 @@ private:
 	BRSW_NEWST_DROPDOWN,
 	BRSW_NEWST_LIST,
 	BRSW_NEWST_SCROLL
-	};
+};
 
+struct BuildRailStationWindow : public PickerWindowBase {
+private:
 	/**
 	 * Verify whether the currently selected station size is allowed after selecting a new station class/type.
 	 * If not, change the station size variables ( _settings_client.gui.station_numtracks and _settings_client.gui.station_platlength ).
@@ -1617,10 +1617,8 @@ static void ShowBuildTrainDepotPicker(Window *parent)
 	new BuildRailDepotWindow(&_build_depot_desc, parent);
 }
 
-struct BuildRailWaypointWindow : PickerWindowBase {
+/** Enum referring to the widgets of the build NewGRF rail waypoint window */
-private:
+enum BuildRailWaypointWidgets {
-	/** Enum referring to the widgets of the build NewGRF rail waypoint window */
-	enum BuildRailWaypointWidgets {
 	BRWW_CLOSEBOX = 0,
 	BRWW_CAPTION,
 	BRWW_BACKGROUND,
@@ -1630,9 +1628,9 @@ private:
 	BRWW_WAYPOINT_4,
 	BRWW_WAYPOINT_5,
 	BRWW_SCROLL,
-	};
+};
 
-public:
+struct BuildRailWaypointWindow : PickerWindowBase {
 	BuildRailWaypointWindow(const WindowDesc *desc, Window *parent) : PickerWindowBase(desc, parent)
 	{
 		this->hscroll.cap = 5;
@@ -1702,7 +1700,7 @@ static const Widget _build_waypoint_widgets[] = {
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_DARK_GREEN,   207,   272,    17,    76, 0x0,             STR_WAYPOINT_GRAPHICS_TIP},          // BRWW_WAYPOINT_4
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_DARK_GREEN,   275,   340,    17,    76, 0x0,             STR_WAYPOINT_GRAPHICS_TIP},          // BRWW_WAYPOINT_5
 
-{ WWT_HSCROLLBAR,   RESIZE_NONE,  COLOUR_DARK_GREEN,     1,   343,     80,    91, 0x0,            STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST}, // BRWW_SCROLL
+{ WWT_HSCROLLBAR,   RESIZE_NONE,  COLOUR_DARK_GREEN,     0,   343,     80,    91, 0x0,            STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST}, // BRWW_SCROLL
 {    WIDGETS_END},
 };