diff -r 42bf2d268a86 -r 5077e6ed3788 src/genworld_gui.cpp
--- a/src/genworld_gui.cpp	Sun Feb 11 21:20:30 2007 +0000
+++ b/src/genworld_gui.cpp	Sun Feb 11 22:57:24 2007 +0000
@@ -328,7 +328,7 @@
 		break;
 	case WE_CLICK:
 		switch (e->we.click.widget) {
-		case 0: DeleteWindow(w); break;
+		case 0: w->Close(); break;
 		case GLAND_TEMPERATE: case GLAND_ARCTIC: case GLAND_TROPICAL: case GLAND_TOYLAND:
 			RaiseWindowWidget(w, _opt_newgame.landscape + GLAND_TEMPERATE);
 			SetNewLandscapeType(e->we.click.widget - GLAND_TEMPERATE);
@@ -349,7 +349,7 @@
 			_patches_newgame.generation_seed = InteractiveRandom();
 			snprintf(_genseed_buffer, lengthof(_genseed_buffer), "%u", _patches_newgame.generation_seed);
 			UpdateTextBufferSize(&_genseed_query.text);
-			SetWindowDirty(w);
+			w->SetDirty();
 			break;
 		case GLAND_GENERATE_BUTTON: // Generate
 			if (mode == GLWP_HEIGHTMAP && (
@@ -367,8 +367,8 @@
 		case GLAND_START_DATE_DOWN: case GLAND_START_DATE_UP: // Year buttons
 			/* Don't allow too fast scrolling */
 			if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
-				HandleButtonClick(w, e->we.click.widget);
-				SetWindowDirty(w);
+				w->HandleButtonClick(e->we.click.widget);
+				w->SetDirty();
 
 				_patches_newgame.starting_year = clamp(_patches_newgame.starting_year + e->we.click.widget - GLAND_START_DATE_TEXT, MIN_YEAR, MAX_YEAR);
 			}
@@ -382,8 +382,8 @@
 		case GLAND_SNOW_LEVEL_DOWN: case GLAND_SNOW_LEVEL_UP: // Snow line buttons
 			/* Don't allow too fast scrolling */
 			if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
-				HandleButtonClick(w, e->we.click.widget);
-				SetWindowDirty(w);
+				w->HandleButtonClick(e->we.click.widget);
+				w->SetDirty();
 
 				_patches_newgame.snow_line_height = clamp(_patches_newgame.snow_line_height + e->we.click.widget - GLAND_SNOW_LEVEL_TEXT, 2, 13);
 			}
@@ -467,7 +467,7 @@
 				DoCommandP(0, 13, _opt_newgame.diff.quantity_sea_lakes, NULL, CMD_CHANGE_DIFFICULTY_LEVEL);
 				break;
 		}
-		SetWindowDirty(w);
+		w->SetDirty();
 		break;
 
 	case WE_ON_EDIT_TEXT: {
@@ -485,7 +485,7 @@
 				break;
 			}
 
-			SetWindowDirty(w);
+			w->SetDirty();
 		}
 		break;
 	}
@@ -628,8 +628,8 @@
 		case CSCEN_START_DATE_DOWN: case CSCEN_START_DATE_UP: // Year buttons
 			/* Don't allow too fast scrolling */
 			if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
-				HandleButtonClick(w, e->we.click.widget);
-				SetWindowDirty(w);
+				w->HandleButtonClick(e->we.click.widget);
+				w->SetDirty();
 
 				_patches_newgame.starting_year = clamp(_patches_newgame.starting_year + e->we.click.widget - CSCEN_START_DATE_TEXT, MIN_YEAR, MAX_YEAR);
 			}
@@ -643,8 +643,8 @@
 		case CSCEN_FLAT_LAND_HEIGHT_DOWN: case CSCEN_FLAT_LAND_HEIGHT_UP: // Height level buttons
 			/* Don't allow too fast scrolling */
 			if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
-				HandleButtonClick(w, e->we.click.widget);
-				SetWindowDirty(w);
+				w->HandleButtonClick(e->we.click.widget);
+				w->SetDirty();
 
 				_patches_newgame.se_flat_world_height = clamp(_patches_newgame.se_flat_world_height + e->we.click.widget - CSCEN_FLAT_LAND_HEIGHT_TEXT, 0, 15);
 			}
@@ -663,7 +663,7 @@
 			case CSCEN_MAPSIZE_X_PULLDOWN: _patches_newgame.map_x = e->we.dropdown.index + 6; break;
 			case CSCEN_MAPSIZE_Y_PULLDOWN: _patches_newgame.map_y = e->we.dropdown.index + 6; break;
 		}
-		SetWindowDirty(w);
+		w->SetDirty();
 		break;
 
 	case WE_ON_EDIT_TEXT: {
@@ -681,7 +681,7 @@
 				break;
 			}
 
-			SetWindowDirty(w);
+			w->SetDirty();
 		}
 		break;
 	}
@@ -791,7 +791,7 @@
 		SetDParam(1, _tp.total);
 		DrawStringCentered(90, 58, STR_GENERATION_PROGRESS, 0);
 
-		SetWindowDirty(w);
+		w->SetDirty();
 		break;
 	}
 }