diff -r 2ffe947969ca -r a2f86b8fd99b src/settings_gui.cpp
--- a/src/settings_gui.cpp	Sat Feb 17 13:08:51 2007 +0000
+++ b/src/settings_gui.cpp	Sun Feb 18 14:17:28 2007 +0000
@@ -90,7 +90,7 @@
 
 static void ShowCustCurrency(void);
 
-static void GameOptionsWndProc(Window *w, WindowEvent *e)
+static void GameOptionsWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT: {
@@ -239,7 +239,7 @@
 	return 0;
 }
 
-static const Widget _game_options_widgets[] = {
+static const OldWidget _game_options_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                          STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   369,     0,    13, STR_00B1_GAME_OPTIONS,             STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   369,    14,   238, 0x0,                               STR_NULL},
@@ -292,7 +292,7 @@
 void ShowGameOptions(void)
 {
 	DeleteWindowById(WC_GAME_OPTIONS, 0);
-	AllocateWindowDesc(&_game_options_desc);
+	BaseWindow::Allocate(&_game_options_desc);
 }
 
 typedef struct {
@@ -381,7 +381,7 @@
 // 0x383E = (1 << 13) | (1 << 12) | (1 << 11) | (1 << 5) | (1 << 4) | (1 << 3) | (1 << 2) | (1 << 1)
 #define DIFF_INGAME_DISABLED_BUTTONS 0x383E
 
-static void GameDifficultyWndProc(Window *w, WindowEvent *e)
+static void GameDifficultyWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_CREATE: // Setup disabled buttons when creating window
@@ -527,7 +527,7 @@
 
 #undef DIFF_INGAME_DISABLED_BUTTONS
 
-static const Widget _game_difficulty_widgets[] = {
+static const OldWidget _game_difficulty_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    10,     0,    10,     0,    13, STR_00C5,                     STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    10,    11,   369,     0,    13, STR_6800_DIFFICULTY_LEVEL,    STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    10,     0,   369,    14,    29, 0x0,                          STR_NULL},
@@ -557,7 +557,7 @@
 	/* Copy current settings (ingame or in intro) to temporary holding place
 	 * change that when setting stuff, copy back on clicking 'OK' */
 	_opt_mod_temp = *_opt_ptr;
-	AllocateWindowDesc(&_game_difficulty_desc);
+	BaseWindow::Allocate(&_game_difficulty_desc);
 }
 
 static const char *_patches_ui[] = {
@@ -681,7 +681,7 @@
 /** The main patches window. Shows a number of categories on top and
  * a selection of patches in that category.
  * Uses WP(w, def_d) macro - data_1, data_2, data_3 */
-static void PatchesSelectionWndProc(Window *w, WindowEvent *e)
+static void PatchesSelectionWndProc(BaseWindow *w, WindowEvent *e)
 {
 	static Patches *patches_ptr;
 
@@ -891,7 +891,7 @@
 	}
 }
 
-static const Widget _patches_selection_widgets[] = {
+static const OldWidget _patches_selection_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    10,     0,    10,     0,    13, STR_00C5,                        STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    10,    11,   369,     0,    13, STR_CONFIG_PATCHES_CAPTION,      STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    10,     0,   369,    14,    41, 0x0,                             STR_NULL},
@@ -917,7 +917,7 @@
 void ShowPatchesSelection(void)
 {
 	DeleteWindowById(WC_GAME_OPTIONS, 0);
-	AllocateWindowDesc(&_patches_selection_desc);
+	BaseWindow::Allocate(&_patches_selection_desc);
 }
 
 
@@ -948,7 +948,7 @@
 
 static char _str_separator[2];
 
-static void CustCurrencyWndProc(Window *w, WindowEvent *e)
+static void CustCurrencyWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 		case WE_PAINT: {
@@ -1119,7 +1119,7 @@
 	}
 }
 
-static const Widget _cust_currency_widgets[] = {
+static const OldWidget _cust_currency_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,            STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   229,     0,    13, STR_CURRENCY_WINDOW, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   229,    14,   119, 0x0,                 STR_NULL},
@@ -1140,5 +1140,5 @@
 	_str_separator[1] = '\0';
 
 	DeleteWindowById(WC_CUSTOM_CURRENCY, 0);
-	AllocateWindowDesc(&_cust_currency_desc);
+	BaseWindow::Allocate(&_cust_currency_desc);
 }