# HG changeset patch # User ib # Date 1323345900 0 # Node ID ecb8df1774599b732ef4b2c997245d9989909b8b # Parent b2c01a543421e6fa88764764fcbaba537c0421c9 Remove event evDropFile from Win32 GUI. This event doesn't exist in the X11/GTK GUI and it is identical to evLoadPlay. diff -r b2c01a543421 -r ecb8df177459 gui/win32/gui.c --- a/gui/win32/gui.c Thu Dec 08 02:44:19 2011 +0000 +++ b/gui/win32/gui.c Thu Dec 08 12:05:00 2011 +0000 @@ -238,7 +238,7 @@ case evLoadPlay: case evLoad: if(display_openfilewindow(gui, 0) && (msg == evLoadPlay)) - handlemsg(hWnd, evDropFile); + handlemsg(hWnd, evLoadPlay); return; case evLoadSubtitle: display_opensubtitlewindow(gui); @@ -501,13 +501,13 @@ gui->playlist->add_track(gui->playlist, file, NULL, NULL, 0); } DragFinish((HDROP) wParam); - handlemsg(hWnd, evDropFile); + handlemsg(hWnd, evLoadPlay); } else { gui->playlist->clear_playlist(gui->playlist); gui->playlist->add_track(gui->playlist, (const char *) wParam, NULL, NULL, 0); - handlemsg(hWnd, evDropFile); + handlemsg(hWnd, evLoadPlay); } SetForegroundWindow(gui->subwindow); return 0; @@ -790,13 +790,13 @@ gui->playlist->add_track(gui->playlist, file, NULL, NULL, 0); } DragFinish((HDROP) wParam); - handlemsg(hWnd, evDropFile); + handlemsg(hWnd, evLoadPlay); } else { gui->playlist->clear_playlist(gui->playlist); gui->playlist->add_track(gui->playlist, (const char *) wParam, NULL, NULL, 0); - handlemsg(hWnd, evDropFile); + handlemsg(hWnd, evLoadPlay); } SetForegroundWindow(gui->mainwindow); return 0; @@ -1118,7 +1118,7 @@ static void startplay(gui_t *gui) { - handlemsg(gui->mainwindow, evDropFile); + handlemsg(gui->mainwindow, evLoadPlay); } /* returns the bits per pixel of the desktop */ diff -r b2c01a543421 -r ecb8df177459 gui/win32/interface.c --- a/gui/win32/interface.c Thu Dec 08 02:44:19 2011 +0000 +++ b/gui/win32/interface.c Thu Dec 08 12:05:00 2011 +0000 @@ -227,7 +227,6 @@ mp_input_queue_cmd(cmd); break; } - case evDropFile: case evLoadPlay: { switch(guiInfo.StreamType) diff -r b2c01a543421 -r ecb8df177459 gui/win32/skinload.c --- a/gui/win32/skinload.c Thu Dec 08 02:44:19 2011 +0000 +++ b/gui/win32/skinload.c Thu Dec 08 12:05:00 2011 +0000 @@ -47,7 +47,6 @@ { { evNone, "evNone" }, { evPlay, "evPlay" }, - { evDropFile, "evDropFile" }, { evStop, "evStop" }, { evPause, "evPause" }, { evPrev, "evPrev" }, diff -r b2c01a543421 -r ecb8df177459 gui/win32/skinload.h --- a/gui/win32/skinload.h Thu Dec 08 02:44:19 2011 +0000 +++ b/gui/win32/skinload.h Thu Dec 08 12:05:00 2011 +0000 @@ -183,7 +183,6 @@ #define evSetAspect 44 #define evSetAudio 45 #define evSetVideo 46 -#define evDropFile 47 #define evPlayCD 48 #define evExit 1000