(svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron)

-Fix: added WIDGETS_END macro for WWT_LAST which does this for all last widget-types

1 files changed, 149 insertions, 149 deletions

diff --git a/main_gui.c b/main_gui.c
index d387eaded..3ddd5ceb1 100644
--- a/main_gui.c
+++ b/main_gui.c
@@ -437,14 +437,14 @@ static void MenuWndProc(Window *w, WindowEvent *e)
 }
 
 static Widget _menu_widgets[] = {
-{      WWT_PANEL,    14,     0,   159,     0, 65535,     0},
-{      WWT_LAST},
+{      WWT_PANEL,    14,     0,   159,     0, 65535,     0,	STR_NULL},
+{   WIDGETS_END},
 };
 
 
 static Widget _player_menu_widgets[] = {
-{      WWT_PANEL,    14,     0,   240,     0,    81,     0},
-{      WWT_LAST},
+{      WWT_PANEL,    14,     0,   240,     0,    81,     0,	STR_NULL},
+{   WIDGETS_END},
 };
 
 
@@ -930,12 +930,12 @@ void ResetLandscape()
 } 
 
 static const Widget _ask_reset_landscape_widgets[] = {
-{    WWT_TEXTBTN,     4,     0,    10,     0,    13, STR_00C5},
-{    WWT_CAPTION,     4,    11,   179,     0,    13, STR_022C_RESET_LANDSCAPE},
-{     WWT_IMGBTN,     4,     0,   179,    14,    91, 0x0},
-{    WWT_TEXTBTN,    12,    25,    84,    72,    83, STR_00C9_NO},
-{    WWT_TEXTBTN,    12,    95,   154,    72,    83, STR_00C8_YES},
-{      WWT_LAST},
+{    WWT_TEXTBTN,     4,     0,    10,     0,    13, STR_00C5,									STR_NULL},
+{    WWT_CAPTION,     4,    11,   179,     0,    13, STR_022C_RESET_LANDSCAPE,	STR_NULL},
+{     WWT_IMGBTN,     4,     0,   179,    14,    91, 0x0,												STR_NULL},
+{    WWT_TEXTBTN,    12,    25,    84,    72,    83, STR_00C9_NO,								STR_NULL},
+{    WWT_TEXTBTN,    12,    95,   154,    72,    83, STR_00C8_YES,							STR_NULL},
+{   WIDGETS_END},
 };
 
 // Ask first to reset landscape or to make a random landscape
@@ -1095,22 +1095,22 @@ void PlaceProc_Desert(uint tile)
 }
 
 static const Widget _scen_edit_land_gen_widgets[] = {
-{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,     7,    11,   153,     0,    13, STR_0223_LAND_GENERATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
-{     WWT_IMGBTN,     7,     0,   153,    14,    99, 0x0, 0},
-{     WWT_IMGBTN,    14,    22,    43,    14,    35, 0x2B6, STR_018F_RAISE_A_CORNER_OF_LAND},
-{     WWT_IMGBTN,    14,    44,    65,    14,    35, 0x2B7, STR_018E_LOWER_A_CORNER_OF_LAND},
-{     WWT_IMGBTN,    14,     0,    21,    14,    35, 0x2BF, STR_018D_DEMOLISH_BUILDINGS_ETC},
-{    WWT_TEXTBTN,    14,   125,   135,    43,    54, STR_0224, STR_0228_INCREASE_SIZE_OF_LAND_AREA},
-{    WWT_TEXTBTN,    14,   125,   135,    56,    67, STR_0225, STR_0229_DECREASE_SIZE_OF_LAND_AREA},
-{    WWT_TEXTBTN,    14,    20,   135,    75,    86, STR_0226_RANDOM_LAND, STR_022A_GENERATE_RANDOM_LAND},
-{    WWT_TEXTBTN,    14,    20,   135,    88,    99, STR_0227_RESET_LAND, STR_022B_RESET_LANDSCAPE},
-
-{     WWT_IMGBTN,    14,    88,   109,    14,    35, 0xFF4, STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE},
-{     WWT_IMGBTN,    14,   110,   131,    14,    35, 0xFF5, STR_028D_PLACE_LIGHTHOUSE},
-{     WWT_IMGBTN,    14,   132,   153,    14,    35, 0xFF6, STR_028E_PLACE_TRANSMITTER},
-{     WWT_IMGBTN,    14,    66,    87,    14,    35, SPR_OPENTTD_BASE+68, STR_LEVEL_LAND_TOOLTIP},
-{      WWT_LAST},
+{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,	STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,     7,    11,   153,     0,    13, STR_0223_LAND_GENERATION,STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_IMGBTN,     7,     0,   153,    14,    99, 0x0,				STR_NULL},
+{     WWT_IMGBTN,    14,    22,    43,    14,    35, 0x2B6,			STR_018F_RAISE_A_CORNER_OF_LAND},
+{     WWT_IMGBTN,    14,    44,    65,    14,    35, 0x2B7,			STR_018E_LOWER_A_CORNER_OF_LAND},
+{     WWT_IMGBTN,    14,     0,    21,    14,    35, 0x2BF,			STR_018D_DEMOLISH_BUILDINGS_ETC},
+{    WWT_TEXTBTN,    14,   125,   135,    43,    54, STR_0224,	STR_0228_INCREASE_SIZE_OF_LAND_AREA},
+{    WWT_TEXTBTN,    14,   125,   135,    56,    67, STR_0225,	STR_0229_DECREASE_SIZE_OF_LAND_AREA},
+{    WWT_TEXTBTN,    14,    20,   135,    75,    86, STR_0226_RANDOM_LAND,		STR_022A_GENERATE_RANDOM_LAND},
+{    WWT_TEXTBTN,    14,    20,   135,    88,    99, STR_0227_RESET_LAND,			STR_022B_RESET_LANDSCAPE},
+
+{     WWT_IMGBTN,    14,    88,   109,    14,    35, 0xFF4,			STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE},
+{     WWT_IMGBTN,    14,   110,   131,    14,    35, 0xFF5,			STR_028D_PLACE_LIGHTHOUSE},
+{     WWT_IMGBTN,    14,   132,   153,    14,    35, 0xFF6,			STR_028E_PLACE_TRANSMITTER},
+{     WWT_IMGBTN,    14,    66,    87,    14,    35, SPR_OPENTTD_BASE+68,			STR_LEVEL_LAND_TOOLTIP},
+{   WIDGETS_END},
 };
 
 static const int8 _multi_terraform_coords[][2] = {
@@ -1264,16 +1264,16 @@ void PlaceProc_Town(uint tile)
 
 
 static const Widget _scen_edit_town_gen_widgets[] = {
-{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,     7,    11,   159,     0,    13, STR_0233_TOWN_GENERATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
-{     WWT_IMGBTN,     7,     0,   159,    14,    81, 0x0},
-{    WWT_TEXTBTN,    14,     2,   157,    16,    27, STR_0234_NEW_TOWN, STR_0235_CONSTRUCT_NEW_TOWN},
-{    WWT_TEXTBTN,    14,     2,   157,    29,    40, STR_023D_RANDOM_TOWN, STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION},
-{    WWT_TEXTBTN,    14,     2,   157,    42,    53, STR_MANY_RANDOM_TOWNS, STR_RANDOM_TOWNS_TIP},
-{    WWT_TEXTBTN,    14,     2,    53,    68,    79, STR_02A1_SMALL, STR_02A4_SELECT_TOWN_SIZE},
-{    WWT_TEXTBTN,    14,    54,   105,    68,    79, STR_02A2_MEDIUM, STR_02A4_SELECT_TOWN_SIZE},
-{    WWT_TEXTBTN,    14,   106,   157,    68,    79, STR_02A3_LARGE, STR_02A4_SELECT_TOWN_SIZE},
-{      WWT_LAST},
+{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,									STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,     7,    11,   159,     0,    13, STR_0233_TOWN_GENERATION,	STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_IMGBTN,     7,     0,   159,    14,    81, 0x0,												STR_NULL},
+{    WWT_TEXTBTN,    14,     2,   157,    16,    27, STR_0234_NEW_TOWN,					STR_0235_CONSTRUCT_NEW_TOWN},
+{    WWT_TEXTBTN,    14,     2,   157,    29,    40, STR_023D_RANDOM_TOWN,			STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION},
+{    WWT_TEXTBTN,    14,     2,   157,    42,    53, STR_MANY_RANDOM_TOWNS,			STR_RANDOM_TOWNS_TIP},
+{    WWT_TEXTBTN,    14,     2,    53,    68,    79, STR_02A1_SMALL,						STR_02A4_SELECT_TOWN_SIZE},
+{    WWT_TEXTBTN,    14,    54,   105,    68,    79, STR_02A2_MEDIUM,						STR_02A4_SELECT_TOWN_SIZE},
+{    WWT_TEXTBTN,    14,   106,   157,    68,    79, STR_02A3_LARGE,						STR_02A4_SELECT_TOWN_SIZE},
+{   WIDGETS_END},
 };
 
 static void ScenEditTownGenWndProc(Window *w, WindowEvent *e)
@@ -1349,91 +1349,91 @@ static void ToolbarScenGenTown(Window *w)
 
 
 static const Widget _scenedit_industry_normal_widgets[] = {
-{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5},
-{    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION},
-{     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0},
-
-{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES, STR_RANDOM_INDUSTRIES_TIP},
-
-{    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0240_COAL_MINE, STR_0262_CONSTRUCT_COAL_MINE},
-{    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION},
-{    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_0242_SAWMILL, STR_0264_CONSTRUCT_SAWMILL},
-{    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_0243_FOREST, STR_0265_PLANT_FOREST},
-{    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
-{    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_0245_OIL_RIG, STR_0267_CONSTRUCT_OIL_RIG_CAN_ONLY},
-{    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY},
-{    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_0247_STEEL_MILL, STR_0269_CONSTRUCT_STEEL_MILL},
-{    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_0248_FARM, STR_026A_CONSTRUCT_FARM},
-{    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_0249_IRON_ORE_MINE, STR_026B_CONSTRUCT_IRON_ORE_MINE},
-{    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_024A_OIL_WELLS, STR_026C_CONSTRUCT_OIL_WELLS},
-{    WWT_TEXTBTN,    14,     2,   167,   185,   196, STR_024B_BANK, STR_026D_CONSTRUCT_BANK_CAN_ONLY},
-{      WWT_LAST},
+{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,								STR_NULL},
+{    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION,	STR_NULL},
+{     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0,											STR_NULL},
+
+{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES,		STR_RANDOM_INDUSTRIES_TIP},
+
+{    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0240_COAL_MINE,			STR_0262_CONSTRUCT_COAL_MINE},
+{    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0241_POWER_STATION,	STR_0263_CONSTRUCT_POWER_STATION},
+{    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_0242_SAWMILL,				STR_0264_CONSTRUCT_SAWMILL},
+{    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_0243_FOREST,					STR_0265_PLANT_FOREST},
+{    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_0244_OIL_REFINERY,		STR_0266_CONSTRUCT_OIL_REFINERY},
+{    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_0245_OIL_RIG,				STR_0267_CONSTRUCT_OIL_RIG_CAN_ONLY},
+{    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_0246_FACTORY,				STR_0268_CONSTRUCT_FACTORY},
+{    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_0247_STEEL_MILL,			STR_0269_CONSTRUCT_STEEL_MILL},
+{    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_0248_FARM,						STR_026A_CONSTRUCT_FARM},
+{    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_0249_IRON_ORE_MINE,	STR_026B_CONSTRUCT_IRON_ORE_MINE},
+{    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_024A_OIL_WELLS,			STR_026C_CONSTRUCT_OIL_WELLS},
+{    WWT_TEXTBTN,    14,     2,   167,   185,   196, STR_024B_BANK,						STR_026D_CONSTRUCT_BANK_CAN_ONLY},
+{   WIDGETS_END},
 };
 
 
 static const Widget _scenedit_industry_hilly_widgets[] = {
-{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5},
-{    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION},
-{     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0},
-
-{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES, STR_RANDOM_INDUSTRIES_TIP},
-
-{    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0240_COAL_MINE, STR_0262_CONSTRUCT_COAL_MINE},
-{    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION},
-{    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_024C_PAPER_MILL, STR_026E_CONSTRUCT_PAPER_MILL},
-{    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_0243_FOREST, STR_0265_PLANT_FOREST},
-{    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
-{    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
-{    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_024E_PRINTING_WORKS, STR_0270_CONSTRUCT_PRINTING_WORKS},
-{    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_024F_GOLD_MINE, STR_0271_CONSTRUCT_GOLD_MINE},
-{    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_0248_FARM, STR_026A_CONSTRUCT_FARM},
-{    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_024B_BANK, STR_0272_CONSTRUCT_BANK_CAN_ONLY},
-{    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_024A_OIL_WELLS, STR_026C_CONSTRUCT_OIL_WELLS},
-{      WWT_LAST},
+{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,								STR_NULL},
+{    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION,	STR_NULL},
+{     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0,											STR_NULL},
+
+{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES,		STR_RANDOM_INDUSTRIES_TIP},
+
+{    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0240_COAL_MINE,			STR_0262_CONSTRUCT_COAL_MINE},
+{    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0241_POWER_STATION,	STR_0263_CONSTRUCT_POWER_STATION},
+{    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_024C_PAPER_MILL,			STR_026E_CONSTRUCT_PAPER_MILL},
+{    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_0243_FOREST,					STR_0265_PLANT_FOREST},
+{    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_0244_OIL_REFINERY,		STR_0266_CONSTRUCT_OIL_REFINERY},
+{    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_024D_FOOD_PROCESSING_PLANT,	STR_026F_CONSTRUCT_FOOD_PROCESSING},
+{    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_024E_PRINTING_WORKS,	STR_0270_CONSTRUCT_PRINTING_WORKS},
+{    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_024F_GOLD_MINE,			STR_0271_CONSTRUCT_GOLD_MINE},
+{    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_0248_FARM,						STR_026A_CONSTRUCT_FARM},
+{    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_024B_BANK,						STR_0272_CONSTRUCT_BANK_CAN_ONLY},
+{    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_024A_OIL_WELLS,			STR_026C_CONSTRUCT_OIL_WELLS},
+{   WIDGETS_END},
 };
 
 static const Widget _scenedit_industry_desert_widgets[] = {
-{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5},
-{    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION},
-{     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0},
-
-{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES, STR_RANDOM_INDUSTRIES_TIP},
-
-{    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0250_LUMBER_MILL, STR_0273_CONSTRUCT_LUMBER_MILL_TO},
-{    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0251_FRUIT_PLANTATION, STR_0274_PLANT_FRUIT_PLANTATION},
-{    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_0252_RUBBER_PLANTATION, STR_0275_PLANT_RUBBER_PLANTATION},
-{    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
-{    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
-{    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY},
-{    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_0253_WATER_SUPPLY, STR_0276_CONSTRUCT_WATER_SUPPLY},
-{    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_0248_FARM, STR_026A_CONSTRUCT_FARM},
-{    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_0254_WATER_TOWER, STR_0277_CONSTRUCT_WATER_TOWER_CAN},
-{    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_024A_OIL_WELLS, STR_026C_CONSTRUCT_OIL_WELLS},
-{    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_024B_BANK, STR_0272_CONSTRUCT_BANK_CAN_ONLY},
-{    WWT_TEXTBTN,    14,     2,   167,   185,   196, STR_0255_DIAMOND_MINE, STR_0278_CONSTRUCT_DIAMOND_MINE},
-{    WWT_TEXTBTN,    14,     2,   167,   198,   209, STR_0256_COPPER_ORE_MINE, STR_0279_CONSTRUCT_COPPER_ORE_MINE},
-{      WWT_LAST},
+{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,									STR_NULL},
+{    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION,		STR_NULL},
+{     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0,												STR_NULL},
+
+{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES,			STR_RANDOM_INDUSTRIES_TIP},
+
+{    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0250_LUMBER_MILL,			STR_0273_CONSTRUCT_LUMBER_MILL_TO},
+{    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0251_FRUIT_PLANTATION,	STR_0274_PLANT_FRUIT_PLANTATION},
+{    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_0252_RUBBER_PLANTATION,STR_0275_PLANT_RUBBER_PLANTATION},
+{    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_0244_OIL_REFINERY,			STR_0266_CONSTRUCT_OIL_REFINERY},
+{    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_024D_FOOD_PROCESSING_PLANT,	STR_026F_CONSTRUCT_FOOD_PROCESSING},
+{    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_0246_FACTORY,					STR_0268_CONSTRUCT_FACTORY},
+{    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_0253_WATER_SUPPLY,			STR_0276_CONSTRUCT_WATER_SUPPLY},
+{    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_0248_FARM,							STR_026A_CONSTRUCT_FARM},
+{    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_0254_WATER_TOWER,			STR_0277_CONSTRUCT_WATER_TOWER_CAN},
+{    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_024A_OIL_WELLS,				STR_026C_CONSTRUCT_OIL_WELLS},
+{    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_024B_BANK,							STR_0272_CONSTRUCT_BANK_CAN_ONLY},
+{    WWT_TEXTBTN,    14,     2,   167,   185,   196, STR_0255_DIAMOND_MINE,			STR_0278_CONSTRUCT_DIAMOND_MINE},
+{    WWT_TEXTBTN,    14,     2,   167,   198,   209, STR_0256_COPPER_ORE_MINE,	STR_0279_CONSTRUCT_COPPER_ORE_MINE},
+{   WIDGETS_END},
 };
 
 static const Widget _scenedit_industry_candy_widgets[] = {
-{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5},
-{    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION},
-{     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0},
-
-{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES, STR_RANDOM_INDUSTRIES_TIP},
-
-{    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0257_COTTON_CANDY_FOREST, STR_027A_PLANT_COTTON_CANDY_FOREST},
-{    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0258_CANDY_FACTORY, STR_027B_CONSTRUCT_CANDY_FACTORY},
-{    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_0259_BATTERY_FARM, STR_027C_CONSTRUCT_BATTERY_FARM},
-{    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_025A_COLA_WELLS, STR_027D_CONSTRUCT_COLA_WELLS},
-{    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_025B_TOY_SHOP, STR_027E_CONSTRUCT_TOY_SHOP},
-{    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_025C_TOY_FACTORY, STR_027F_CONSTRUCT_TOY_FACTORY},
-{    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_025D_PLASTIC_FOUNTAINS, STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS},
-{    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_025E_FIZZY_DRINK_FACTORY, STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},
-{    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_025F_BUBBLE_GENERATOR, STR_0282_CONSTRUCT_BUBBLE_GENERATOR},
-{    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_0260_TOFFEE_QUARRY, STR_0283_CONSTRUCT_TOFFEE_QUARRY},
-{    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_0261_SUGAR_MINE, STR_0284_CONSTRUCT_SUGAR_MINE},
-{      WWT_LAST},
+{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,										STR_NULL},
+{    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION,STR_NULL},
+{     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0,													STR_NULL},
+
+{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES,	STR_RANDOM_INDUSTRIES_TIP},
+
+{    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0257_COTTON_CANDY_FOREST,STR_027A_PLANT_COTTON_CANDY_FOREST},
+{    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0258_CANDY_FACTORY,			STR_027B_CONSTRUCT_CANDY_FACTORY},
+{    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_0259_BATTERY_FARM,				STR_027C_CONSTRUCT_BATTERY_FARM},
+{    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_025A_COLA_WELLS,					STR_027D_CONSTRUCT_COLA_WELLS},
+{    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_025B_TOY_SHOP,						STR_027E_CONSTRUCT_TOY_SHOP},
+{    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_025C_TOY_FACTORY,				STR_027F_CONSTRUCT_TOY_FACTORY},
+{    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_025D_PLASTIC_FOUNTAINS,	STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS},
+{    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_025E_FIZZY_DRINK_FACTORY,STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},
+{    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_025F_BUBBLE_GENERATOR,		STR_0282_CONSTRUCT_BUBBLE_GENERATOR},
+{    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_0260_TOFFEE_QUARRY,			STR_0283_CONSTRUCT_TOFFEE_QUARRY},
+{    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_0261_SUGAR_MINE,					STR_0284_CONSTRUCT_SUGAR_MINE},
+{   WIDGETS_END},
 };
 
 int _industry_type_to_place;
@@ -1770,7 +1770,7 @@ static const Widget _toolb_normal_widgets[] = {
 {      WWT_PANEL,    14,   574,   595,     0,    21, 0x2C9, STR_01D4_SHOW_SOUND_MUSIC_WINDOW},
 {      WWT_PANEL,    14,   596,   617,     0,    21, 0x2A8, STR_0203_SHOW_LAST_MESSAGE_NEWS},
 {      WWT_PANEL,    14,   618,   639,     0,    21, 0x2D3, STR_0186_LAND_BLOCK_INFORMATION},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 
 static const WindowDesc _toolb_normal_desc = {
@@ -1791,40 +1791,40 @@ static const WindowDesc _toolb_intro_desc = {
 
 
 static const Widget _toolb_scen_widgets[] = {
-{      WWT_PANEL,    14,     0,    21,     0,    21, 0x2D6, STR_0171_PAUSE_GAME},
-{      WWT_PANEL,    14,    22,    43,     0,    21, SPR_OPENTTD_BASE + 57, STR_FAST_FORWARD},
-{      WWT_PANEL,    14,    44,    65,     0,    21, 0x2EF, STR_0187_OPTIONS},
-{    WWT_PANEL_2,    14,    66,    87,     0,    21, 0x2D4, STR_0297_SAVE_SCENARIO_LOAD_SCENARIO	},
-
-{      WWT_PANEL,    14,    96,   225,     0,    21, 0x0},
-
-{      WWT_PANEL,    14,   233,   362,     0,    21, 0x0},
-{   WWT_CLOSEBOX,    14,   236,   246,     5,    16, STR_0225, STR_029E_MOVE_THE_STARTING_DATE},
-{   WWT_CLOSEBOX,    14,   347,   357,     5,    16, STR_0224, STR_029F_MOVE_THE_STARTING_DATE},
-
-{      WWT_PANEL,    14,   371,   392,     0,    21, 0x2C4, STR_0175_DISPLAY_MAP_TOWN_DIRECTORY},
-
-{      WWT_PANEL,    14,   400,   421,     0,    21, 0x2DF, STR_017F_ZOOM_THE_VIEW_IN},
-{      WWT_PANEL,    14,   422,   443,     0,    21, 0x2E0, STR_0180_ZOOM_THE_VIEW_OUT},
-
-{      WWT_PANEL,    14,   452,   473,     0,    21, 0xFF3, STR_022E_LANDSCAPE_GENERATION},
-{      WWT_PANEL,    14,   474,   495,     0,    21, 0xFED, STR_022F_TOWN_GENERATION},
-{      WWT_PANEL,    14,   496,   517,     0,    21, 0x2E5, STR_0230_INDUSTRY_GENERATION},
-{      WWT_PANEL,    14,   518,   539,     0,    21, 0x2D8, STR_0231_ROAD_CONSTRUCTION},
-{      WWT_PANEL,    14,   540,   561,     0,    21, 0x2E6, STR_0288_PLANT_TREES},
-{      WWT_PANEL,    14,   562,   583,     0,    21, 0xFF2, STR_0289_PLACE_SIGN},
-
-{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
-{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
-{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
-{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
-{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
-{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
-{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
-{      WWT_PANEL,    14,   596,   617,     0,    21, 0x2C9,STR_01D4_SHOW_SOUND_MUSIC_WINDOW},
-{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
-{      WWT_PANEL,    14,   618,   639,     0,    21, 0x2D3, STR_0186_LAND_BLOCK_INFORMATION},
-{      WWT_LAST},
+{      WWT_PANEL,    14,     0,    21,     0,    21, 0x2D6,				STR_0171_PAUSE_GAME},
+{      WWT_PANEL,    14,    22,    43,     0,    21, SPR_OPENTTD_BASE + 57,	STR_FAST_FORWARD},
+{      WWT_PANEL,    14,    44,    65,     0,    21, 0x2EF,				STR_0187_OPTIONS},
+{    WWT_PANEL_2,    14,    66,    87,     0,    21, 0x2D4,				STR_0297_SAVE_SCENARIO_LOAD_SCENARIO},
+
+{      WWT_PANEL,    14,    96,   225,     0,    21, 0x0,					STR_NULL},
+
+{      WWT_PANEL,    14,   233,   362,     0,    21, 0x0,					STR_NULL},
+{   WWT_CLOSEBOX,    14,   236,   246,     5,    16, STR_0225,		STR_029E_MOVE_THE_STARTING_DATE},
+{   WWT_CLOSEBOX,    14,   347,   357,     5,    16, STR_0224,		STR_029F_MOVE_THE_STARTING_DATE},
+
+{      WWT_PANEL,    14,   371,   392,     0,    21, 0x2C4,				STR_0175_DISPLAY_MAP_TOWN_DIRECTORY},
+
+{      WWT_PANEL,    14,   400,   421,     0,    21, 0x2DF,				STR_017F_ZOOM_THE_VIEW_IN},
+{      WWT_PANEL,    14,   422,   443,     0,    21, 0x2E0,				STR_0180_ZOOM_THE_VIEW_OUT},
+
+{      WWT_PANEL,    14,   452,   473,     0,    21, 0xFF3,				STR_022E_LANDSCAPE_GENERATION},
+{      WWT_PANEL,    14,   474,   495,     0,    21, 0xFED,				STR_022F_TOWN_GENERATION},
+{      WWT_PANEL,    14,   496,   517,     0,    21, 0x2E5,				STR_0230_INDUSTRY_GENERATION},
+{      WWT_PANEL,    14,   518,   539,     0,    21, 0x2D8,				STR_0231_ROAD_CONSTRUCTION},
+{      WWT_PANEL,    14,   540,   561,     0,    21, 0x2E6,				STR_0288_PLANT_TREES},
+{      WWT_PANEL,    14,   562,   583,     0,    21, 0xFF2,				STR_0289_PLACE_SIGN},
+
+{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
+{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
+{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
+{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
+{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
+{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
+{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
+{      WWT_PANEL,    14,   596,   617,     0,    21, 0x2C9,				STR_01D4_SHOW_SOUND_MUSIC_WINDOW},
+{      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
+{      WWT_PANEL,    14,   618,   639,     0,    21, 0x2D3,				STR_0186_LAND_BLOCK_INFORMATION},
+{   WIDGETS_END},
 };
 
 static ToolbarButtonProc* const _scen_toolbar_button_procs[] = {
@@ -2053,10 +2053,10 @@ static void ScrollMainViewport(int x, int y)
 
 
 static const Widget _main_status_widgets[] = {
-{     WWT_IMGBTN,    14,     0,   139,     0,    11, 0x0, 0},
+{     WWT_IMGBTN,    14,     0,   139,     0,    11, 0x0,	STR_NULL},
 { WWT_PUSHIMGBTN,    14,   140,   499,     0,    11, 0x0, STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS},
-{ WWT_PUSHIMGBTN,    14,   500,   639,     0,    11, 0x0, 0},
-{      WWT_LAST},
+{ WWT_PUSHIMGBTN,    14,   500,   639,     0,    11, 0x0, STR_NULL},
+{   WIDGETS_END},
 };
 
 static WindowDesc _main_status_desc = {