openttd-ottdgrfs: comparison src/music

equal deleted inserted replaced

-:2ffe947969ca
+:a2f86b8fd99b
 			ResetMusic();
 		}
 	}
 }
-static void MusicTrackSelectionWndProc(Window *w, WindowEvent *e)
+static void MusicTrackSelectionWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT: {
 		const byte* p;
 		uint i;
 		}
 		break;
 	}
 }
-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},
 {      WWT_PANEL,   RESIZE_NONE,    14,     2,   181,    22,   215, 0x0,                              STR_01FA_CLICK_ON_MUSIC_TRACK_TO},
 {      WWT_PANEL,   RESIZE_NONE,    14,   250,   429,    22,   215, 0x0,                              STR_CLICK_ON_TRACK_TO_REMOVE},
 	MusicTrackSelectionWndProc
 };
 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: {
 		uint i;
 		StringID str;
 		break;
 	}
 }
-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},
 { WWT_PUSHIMGBTN,   RESIZE_NONE,    14,    22,    43,    14,    35, SPR_IMG_SKIP_TO_NEXT,  STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION},
 { WWT_PUSHIMGBTN,   RESIZE_NONE,    14,    44,    65,    14,    35, SPR_IMG_STOP_MUSIC,    STR_01E0_STOP_PLAYING_MUSIC},
 	MusicWindowWndProc
 };
 void ShowMusicWindow(void)
 {
-	AllocateWindowDescFront(&_music_window_desc, 0);
+	BaseWindow::AllocateFront(&_music_window_desc, 0);
 }

branch	cpp_gui
changeset 6258	a2f86b8fd99b
parent 6251	cd413fa2e252
child 6268	4b5241e5dd10