diff -r 2ffe947969ca -r a2f86b8fd99b src/music_gui.cpp
--- a/src/music_gui.cpp	Sat Feb 17 13:08:51 2007 +0000
+++ b/src/music_gui.cpp	Sun Feb 18 14:17:28 2007 +0000
@@ -192,7 +192,7 @@
 	}
 }
 
-static void MusicTrackSelectionWndProc(Window *w, WindowEvent *e)
+static void MusicTrackSelectionWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT: {
@@ -304,7 +304,7 @@
 	}
 }
 
-static const Widget _music_track_selection_widgets[] = {
+static const OldWidget _music_track_selection_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                         STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   431,     0,    13, STR_01EB_MUSIC_PROGRAM_SELECTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   431,    14,   217, 0x0,                              STR_NULL},
@@ -333,10 +333,10 @@
 
 static void ShowMusicTrackSelection(void)
 {
-	AllocateWindowDescFront(&_music_track_selection_desc, 0);
+	BaseWindow::AllocateFront(&_music_track_selection_desc, 0);
 }
 
-static void MusicWindowWndProc(Window *w, WindowEvent *e)
+static void MusicWindowWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT: {
@@ -470,7 +470,7 @@
 
 }
 
-static const Widget _music_window_widgets[] = {
+static const OldWidget _music_window_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,              STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   299,     0,    13, STR_01D2_JAZZ_JUKEBOX, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHIMGBTN,   RESIZE_NONE,    14,     0,    21,    14,    35, SPR_IMG_SKIP_TO_PREV,  STR_01DE_SKIP_TO_PREVIOUS_TRACK},
@@ -502,5 +502,5 @@
 
 void ShowMusicWindow(void)
 {
-	AllocateWindowDescFront(&_music_window_desc, 0);
+	BaseWindow::AllocateFront(&_music_window_desc, 0);
 }