--- a/src/misc_gui.cpp	Mon May 05 12:35:38 2008 +0000
+++ b/src/misc_gui.cpp	Wed May 07 21:09:51 2008 +0000
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-/** @file misc_gui.cpp */
+/** @file misc_gui.cpp GUIs for a number of misc windows. */
 
 #include "stdafx.h"
 #include "openttd.h"
@@ -43,6 +43,7 @@
 #include "settings_type.h"
 #include "newgrf_cargo.h"
 #include "rail_gui.h"
+#include "tilehighlight_func.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
@@ -291,7 +292,7 @@
 			if (--WP(w, scroller_d).counter == 0) {
 				WP(w, scroller_d).counter = 5;
 				WP(w, scroller_d).height--;
-				SetWindowDirty(w);
+				w->SetDirty();
 			}
 			break;
 	}
@@ -558,11 +559,11 @@
 			break;
 
 		case WE_MOUSELOOP:
-			if (_right_button_down) DeleteWindow(w);
+			if (_right_button_down) delete w;
 			break;
 
 		case WE_4:
-			if (--_errmsg_duration == 0) DeleteWindow(w);
+			if (--_errmsg_duration == 0) delete w;
 			break;
 
 		case WE_DESTROY:
@@ -575,7 +576,7 @@
 			if (e->we.keypress.keycode == WKC_SPACE) {
 				/* Don't continue. */
 				e->we.keypress.cont = false;
-				DeleteWindow(w);
+				delete w;
 			}
 			break;
 	}
@@ -711,9 +712,9 @@
 			/* We can show tooltips while dragging tools. These are shown as long as
 			 * we are dragging the tool. Normal tooltips work with rmb */
 			if (WP(w, tooltips_d).paramcount == 0 ) {
-				if (!_right_button_down) DeleteWindow(w);
+				if (!_right_button_down) delete w;
 			} else {
-				if (!_left_button_down) DeleteWindow(w);
+				if (!_left_button_down) delete w;
 			}
 
 			break;
@@ -1164,14 +1165,14 @@
 							WindowEvent e;
 							e.event = WE_ON_EDIT_TEXT;
 							e.we.edittext.str = qs->text.buf;
-							parent->wndproc(parent, &e);
+							parent->HandleWindowEvent(&e);
 						} else {
 							HandleOnEditText(qs->text.buf);
 						}
 					}
 					/* Fallthrough */
 				case QUERY_STR_WIDGET_CANCEL:
-					DeleteWindow(w);
+					delete w;
 					break;
 			}
 			break;
@@ -1183,7 +1184,7 @@
 		case WE_KEYPRESS:
 			switch (HandleEditBoxKey(w, qs, QUERY_STR_WIDGET_TEXT, e)) {
 				case 1: goto press_ok; // Enter pressed, confirms change
-				case 2: DeleteWindow(w); break; // ESC pressed, closes window, abandons changes
+				case 2: delete w; break; // ESC pressed, closes window, abandons changes
 			}
 			break;
 
@@ -1194,7 +1195,7 @@
 
 				qs->handled = true;
 				e.event = WE_ON_EDIT_TEXT_CANCEL;
-				parent->wndproc(parent, &e);
+				parent->HandleWindowEvent(&e);
 			}
 			ClrBit(_no_scroll, SCROLL_EDIT);
 			break;
@@ -1296,7 +1297,7 @@
 					if (q->proc != NULL) q->proc(w->parent, true);
 					/* Fallthrough */
 				case QUERY_WIDGET_NO:
-					DeleteWindow(w);
+					delete w;
 					break;
 				}
 			break;
@@ -1310,7 +1311,7 @@
 					/* Fallthrough */
 				case WKC_ESC:
 					e->we.keypress.cont = false;
-					DeleteWindow(w);
+					delete w;
 					break;
 			}
 			break;
@@ -1547,19 +1548,19 @@
 					_savegame_sort_order = (_savegame_sort_order == SORT_BY_NAME) ?
 						SORT_BY_NAME | SORT_DESCENDING : SORT_BY_NAME;
 					_savegame_sort_dirty = true;
-					SetWindowDirty(w);
+					w->SetDirty();
 					break;
 
 				case 3: // Sort save names by date
 					_savegame_sort_order = (_savegame_sort_order == SORT_BY_DATE) ?
 						SORT_BY_DATE | SORT_DESCENDING : SORT_BY_DATE;
 					_savegame_sort_dirty = true;
-					SetWindowDirty(w);
+					w->SetDirty();
 					break;
 
 				case 6: // OpenTTD 'button', jumps to OpenTTD directory
 					FiosBrowseTo(&o_dir);
-					SetWindowDirty(w);
+					w->SetDirty();
 					BuildFileList();
 					break;
 
@@ -1581,13 +1582,13 @@
 							ttd_strlcpy(_file_to_saveload.name, name, sizeof(_file_to_saveload.name));
 							ttd_strlcpy(_file_to_saveload.title, file->title, sizeof(_file_to_saveload.title));
 
-							DeleteWindow(w);
+							delete w;
 						} else if (_saveload_mode == SLD_LOAD_HEIGHTMAP) {
 							SetFiosType(file->type);
 							ttd_strlcpy(_file_to_saveload.name, name, sizeof(_file_to_saveload.name));
 							ttd_strlcpy(_file_to_saveload.title, file->title, sizeof(_file_to_saveload.title));
 
-							DeleteWindow(w);
+							delete w;
 							ShowHeightmapLoad();
 						} else {
 							/* SLD_SAVE_GAME, SLD_SAVE_SCENARIO copy clicked name to editbox */
@@ -1597,7 +1598,7 @@
 						}
 					} else {
 						/* Changed directory, need repaint. */
-						SetWindowDirty(w);
+						w->SetDirty();
 						BuildFileList();
 					}
 					break;
@@ -1620,7 +1621,7 @@
 
 		case WE_KEYPRESS:
 			if (e->we.keypress.keycode == WKC_ESC) {
-				DeleteWindow(w);
+				delete w;
 				return;
 			}
 
@@ -1645,7 +1646,7 @@
 				}
 
 				UpdateTextBufferSize(&WP(w, querystr_d).text);
-				SetWindowDirty(w);
+				w->SetDirty();
 			} else if (w->IsWidgetLowered(12)) { // Save button clicked
 				_switch_mode = SM_SAVE;
 				FiosMakeSavegameName(_file_to_saveload.name, WP(w, querystr_d).text.buf, sizeof(_file_to_saveload.name));