(svn r1380) -Fix: missed widget fixes; thanks Jango and TestMan57

4 files changed, 6 insertions, 6 deletions

diff --git a/bridge_gui.c b/bridge_gui.c
index 66fac9fe7..b544c7132 100644
--- a/bridge_gui.c
+++ b/bridge_gui.c
@@ -79,8 +79,8 @@ static void BuildBridgeWndProc(Window *w, WindowEvent *e)
 static const Widget _build_bridge_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,										STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,     7,    11,   199,     0,    13, STR_100D_SELECT_RAIL_BRIDGE,	STR_018C_WINDOW_TITLE_DRAG_THIS},
-{     WWT_MATRIX,   RESIZE_NONE,     7,     0,   188,    14,   101, 0x401,												STR_101F_BRIDGE_SELECTION_CLICK},
-{  WWT_SCROLLBAR,   RESIZE_NONE,     7,   189,   199,    14,   101, 0x0,													STR_0190_SCROLL_BAR_SCROLLS_LIST},
+{     WWT_MATRIX,   RESIZE_NONE,     7,     0,   187,    14,   101, 0x401,												STR_101F_BRIDGE_SELECTION_CLICK},
+{  WWT_SCROLLBAR,   RESIZE_NONE,     7,   188,   199,    14,   101, 0x0,													STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {   WIDGETS_END},
 };
 
diff --git a/rail_gui.c b/rail_gui.c
index 6ecac2090..21bf28101 100644
--- a/rail_gui.c
+++ b/rail_gui.c
@@ -1115,7 +1115,7 @@ static const Widget _build_waypoint_widgets[] = {
 {      WWT_PANEL,   RESIZE_NONE,     7,   207,   272,    17,    76, 0x0, STR_WAYPOINT_GRAPHICS_TIP},
 {      WWT_PANEL,   RESIZE_NONE,     7,   275,   340,    17,    76, 0x0, STR_WAYPOINT_GRAPHICS_TIP},
 
-{ WWT_HSCROLLBAR,   RESIZE_NONE,    7,     1,   343,    80,    91, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
+{ WWT_HSCROLLBAR,   RESIZE_NONE,    7,     1,   343,     80,    91, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {    WIDGETS_END},
 };
 
diff --git a/train_gui.c b/train_gui.c
index 760f8121b..ec7dde994 100644
--- a/train_gui.c
+++ b/train_gui.c
@@ -604,7 +604,7 @@ static const Widget _train_depot_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,							STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,  RESIZE_RIGHT,    14,    11,   336,     0,    13, STR_8800_TRAIN_DEPOT,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {  WWT_STICKYBOX,     RESIZE_LR,    14,   337,   348,     0,    13, 0x0,                   STR_STICKY_BUTTON},
-{     WWT_MATRIX,     RESIZE_RB,    14,     0,   313,    14,    97, 0x601,									STR_883F_TRAINS_CLICK_ON_TRAIN_FOR},
+{     WWT_MATRIX,     RESIZE_RB,    14,     0,   313,    14,    96, 0x601,									STR_883F_TRAINS_CLICK_ON_TRAIN_FOR},
 {      WWT_PANEL,    RESIZE_LRB,    14,   314,   336,    14,    13, 0x0,										STR_NULL},
 {      WWT_PANEL,   RESIZE_LRTB,    14,   314,   336,    14,    54, 0x2A9,									STR_8841_DRAG_TRAIN_VEHICLE_TO_HERE},
 {      WWT_PANEL,   RESIZE_LRTB,    14,   314,   336,    55,   108, 0x2BF,									STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP},
@@ -612,7 +612,7 @@ static const Widget _train_depot_widgets[] = {
 {  WWT_SCROLLBAR,    RESIZE_LRB,    14,   337,   348,    14,   108, 0x0,										STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,     RESIZE_TB,    14,     0,   167,   109,   120, STR_8815_NEW_VEHICLES,	STR_8840_BUILD_NEW_TRAIN_VEHICLE},
 { WWT_PUSHTXTBTN,     RESIZE_TB,    14,   168,   336,   109,   120, STR_00E4_LOCATION,			STR_8842_CENTER_MAIN_VIEW_ON_TRAIN},
-{ WWT_HSCROLLBAR,    RESIZE_RTB,    14,     0,   313,    98,   108, 0x0,										STR_0190_SCROLL_BAR_SCROLLS_LIST},
+{ WWT_HSCROLLBAR,    RESIZE_RTB,    14,     0,   313,    97,   108, 0x0,										STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {      WWT_PANEL,    RESIZE_RTB,    14,   337,   336,   109,   120, 0x0,										STR_NULL},
 {  WWT_RESIZEBOX,   RESIZE_LRTB,    14,   337,   348,   109,   120, 0x0,										STR_RESIZE_BUTTON},
 {   WIDGETS_END},
diff --git a/widget.c b/widget.c
index 95df1b8ec..17c168523 100644
--- a/widget.c
+++ b/widget.c
@@ -337,7 +337,7 @@ void DrawWindowWidgets(Window *w)
 			Point pt;
 			int c1,c2;
 
-			assert(r.bottom - r.top == 13); // XXX - to ensure the same sizes are used everywhere!
+			assert(r.bottom - r.top == 11); // XXX - to ensure the same sizes are used everywhere!
 
 			DrawFrameRect(r.left, r.top, r.left + 9, r.bottom, wi->color, (w->flags4 & (WF_SCROLL_UP | WF_HSCROLL)) == (WF_SCROLL_UP | WF_HSCROLL) ? 0x20 : 0);
 			DrawFrameRect(r.right-9, r.top, r.right, r.bottom, wi->color, (w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL)) == (WF_SCROLL_DOWN | WF_HSCROLL) ? 0x20 : 0);