diff Gui/win32/gui.c @ 21140:b42f1c1ef651

Make compilation depending on USE_SUB unconditional. USE_SUB was hardcoded to true in configure, manually turning it off would break compilation, and there's no apparent reason why having all subtitle code under #ifdefs (even working ones) would be worth the clutter.

--- a/Gui/win32/gui.c	Tue Nov 21 20:31:35 2006 +0000
+++ b/Gui/win32/gui.c	Tue Nov 21 20:48:17 2006 +0000
@@ -216,11 +216,9 @@
             if(display_openfilewindow(gui, 0) && (msg == evLoadPlay))
                 handlemsg(hWnd, evDropFile);
             return;
-#ifdef USE_SUB
         case evLoadSubtitle:
             display_opensubtitlewindow(gui);
             break;
-#endif
         case evPreferences:
             display_prefswindow(gui);
             return;
@@ -979,11 +977,9 @@
                 case ID_MUTE:
                     mp_input_queue_cmd(mp_input_parse_cmd("mute"));
                     break;
-#ifdef USE_SUB
                 case IDSUBTITLE_OPEN:
                     display_opensubtitlewindow(gui);
                     break;
-#endif
                 case ID_PTRACK:
                     handlemsg(hWnd, evPrev);
                     break;
@@ -1186,9 +1182,7 @@
     AppendMenu(gui->menu, MF_SEPARATOR, 0, 0);
     AppendMenu(gui->menu, MF_STRING | MF_POPUP, (UINT) gui->diskmenu, "Play &CD/DVD/VCD/SVCD");
     AppendMenu(gui->menu, MF_SEPARATOR, 0, 0);
-#ifdef USE_SUB
     AppendMenu(gui->menu, MF_STRING, IDSUBTITLE_OPEN, "Open Subtitle");
-#endif
     AppendMenu(gui->menu, MF_STRING, ID_SKINBROWSER, "Skin Browser");
     AppendMenu(gui->menu, MF_SEPARATOR, 0, 0);
     AppendMenu(gui->menu, MF_STRING, ID_PREFS, "Preferences");
@@ -1214,9 +1208,7 @@
     AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0);
     AppendMenu(gui->traymenu, MF_STRING, ID_MUTE, "Toggle Mute");
     AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0);
-#ifdef USE_SUB
     AppendMenu(gui->traymenu, MF_STRING, IDSUBTITLE_OPEN, "Open Subtitle");
-#endif
     AppendMenu(gui->traymenu, MF_STRING, ID_PLAYLIST, "Playlist");
     AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0);
     AppendMenu(gui->traymenu, MF_STRING, ID_SHOWHIDE, "Show/Hide");