Change Win32GUI.

diff --git a/ChangeLog b/ChangeLog
index 490359e..fecf734 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-23  Saito <saito2@digitalme.com>
+
+       * interface/w32g_res.[h,rc], interface/w32g_i.c,
+         interface/w32g_subwin.c, interface/w32g_pref.c:
+         Change and add some items.
+
 2004-02-22  Saito <saito2@digitalme.com>
 
        * timidity/reverb.c, timidity/playmidi.c:

diff --git a/interface/w32g_i.c b/interface/w32g_i.c
index 4c1d490..a460817 100644 (file)
--- a/interface/w32g_i.c
+++ b/interface/w32g_i.c
@@ -459,6 +459,73 @@ void OnHide(void);
 static int MainWndInfoReset(HWND hwnd);
 static int MainWndInfoApply(void);
 
+extern void reload_cfg(void);
+// OUTPUT MENU
+#define IDM_OUTPUT 0x4000
+static HMENU outputMenu;
+
+static void InitOutputMenu(HWND hWnd)
+{
+       HMENU hMenu;
+       MENUITEMINFO mii;
+       int i;
+
+       hMenu = GetMenu(hWnd);
+       if (outputMenu != NULL) {DestroyMenu (outputMenu);}
+       outputMenu = CreateMenu();
+
+       mii.cbSize = sizeof (MENUITEMINFO);
+       mii.fMask = MIIM_TYPE | MIIM_SUBMENU;
+       mii.fType = MFT_STRING;
+       mii.hSubMenu = outputMenu;
+       if (PlayerLanguage == LANGUAGE_JAPANESE) {
+               mii.dwTypeData = TEXT("\8fo\97Í(&O)");
+       } else {
+               mii.dwTypeData = TEXT("Output(&O)");
+       }
+       InsertMenuItem(hMenu, GetMenuItemCount(hMenu) - 1, TRUE, &mii);
+
+       for (i = 0; play_mode_list[i] != 0; i++) {
+               mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE;
+               mii.wID = IDM_OUTPUT + i;
+               mii.fType = MFT_STRING;
+               if (st_temp->opt_playmode[0] == play_mode_list[i]->id_character) {
+                       mii.fState = MFS_CHECKED;
+               } else {
+                       mii.fState = MFS_UNCHECKED;
+               }
+               mii.dwTypeData = play_mode_list[i]->id_name;
+               InsertMenuItem(outputMenu, i, TRUE, &mii);
+       }
+
+       SetMenu(hWnd , hMenu);
+}
+
+static void UpdateOutputMenu(HWND hWnd, UINT wId)
+{
+       MENUITEMINFO mii;
+       int i, num = -1, oldnum;
+
+       for (i = 0; play_mode_list[i] != 0; i++) {
+               mii.cbSize = sizeof (MENUITEMINFO);
+               mii.fMask = MIIM_STATE | MIIM_ID;
+               GetMenuItemInfo(outputMenu, i, TRUE, &mii);
+               if (wId == mii.wID) {
+                       mii.fState = MFS_CHECKED;
+                       num = i;
+               } else {mii.fState = MFS_UNCHECKED;}
+               SetMenuItemInfo(outputMenu, i, TRUE, &mii);
+               if (st_temp->opt_playmode[0] == play_mode_list[i]->id_character) {
+                       oldnum = i;
+               }
+       }
+       if (num != oldnum) {
+               if (num >= 0) {st_temp->opt_playmode[0] = play_mode_list[num]->id_character;}
+               else {st_temp->opt_playmode[0] = 'd';}
+               if(!w32g_play_active) {PrefSettingApplyReally();}
+       }
+}
+
 static void InitMainWnd(HWND hParentWnd)
 {
        HICON hIcon = LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON_TIMIDITY), IMAGE_ICON, 16, 16, 0);
@@ -469,6 +536,8 @@ static void InitMainWnd(HWND hParentWnd)
          hMainWnd = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_MAIN),hParentWnd,MainProc);
        else
          hMainWnd = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_MAIN_EN),hParentWnd,MainProc);
+       InitOutputMenu(hMainWnd);
+
        if (hIcon!=NULL) SendMessage(hMainWnd,WM_SETICON,FALSE,(LPARAM)hIcon);
        {  // Set the title of the main window again.
        char buffer[256];
@@ -966,9 +1035,15 @@ void MainCmdProc(HWND hwnd, int wId, HWND hwndCtl, UINT wNotifyCode)
       case IDM_MHTIMIDITY:
                  TiMidityWnd(hwnd);
                  break;
+      case IDM_FORCE_RELOAD:
+                 if (!w32g_play_active) {reload_cfg();}
+                 break;
       case IDM_MHSUPPLEMENT:
                  SupplementWnd(hwnd);
                  break;
+         default:
+                 UpdateOutputMenu(hwnd, wId);
+                 break;
     }
 }
 

diff --git a/interface/w32g_pref.c b/interface/w32g_pref.c
index ab1d76b..5eb43b0 100644 (file)
--- a/interface/w32g_pref.c
+++ b/interface/w32g_pref.c
@@ -387,6 +387,20 @@ static void PrefSettingApply(void)
 #endif
 }
 
+void reload_cfg(void)
+{
+       free_instrument_map();
+       clean_up_pathlist();
+       free_instruments(0);
+       tmdy_free_config();
+       timidity_start_initialize();
+       read_config_file ( sp_temp->ConfigFile, 0 );
+       PrefSettingApply();
+#ifndef IA_W32G_SYN
+       TracerWndApplyQuietChannel(st_temp->quietchannels);
+#endif
+}
+
 static BOOL APIENTRY
 PrefPlayerDialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
 {
@@ -459,19 +473,10 @@ PrefPlayerDialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
                case IDC_BUTTON_CFG_RELOAD:
                {
                        int i;
-                       for ( i = 0; i < PREF_PAGE_MAX; i++ ) {
+                       for (i = 0; i < PREF_PAGE_MAX; i++ ) {
                                SendMessage ( pref_pages[i].hwnd, WM_MYSAVE, (WPARAM)0, (LPARAM)0 );
                        }
-                       free_instrument_map();
-                       clean_up_pathlist();
-                   free_instruments(0);
-                       tmdy_free_config();
-                       timidity_start_initialize();
-                       read_config_file ( sp_temp->ConfigFile, 0 );
-                       PrefSettingApply();
-#ifndef IA_W32G_SYN
-                       TracerWndApplyQuietChannel(st_temp->quietchannels);
-#endif
+                       reload_cfg();
                        SetWindowLong(hwnd,     DWL_MSGRESULT, TRUE);
                }
                        break;
@@ -1164,6 +1169,21 @@ PrefTiMidity2DialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
        return FALSE;
 }
 
+// IDC_COMBO_SAMPLE_RATE
+#define cb_num_IDC_COMBO_SAMPLE_RATE 10
+static char *cb_info_IDC_COMBO_SAMPLE_RATE[] = {
+       "4000",
+       "8000",
+       "11025",
+       "16000",
+       "22050",
+       "24000",
+       "32000",
+       "40000",
+       "44100",
+       "48000",
+};
+
 // IDC_COMBO_BANDWIDTH
 #define cb_num_IDC_COMBO_BANDWIDTH 3
 enum {
@@ -1209,7 +1229,6 @@ static BOOL APIENTRY
 PrefTiMidity3DialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
 {
        static int initflag = 1;
-       int i;
        switch (uMess){
    case WM_INITDIALOG:
                {
@@ -1307,10 +1326,12 @@ PrefTiMidity3DialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
                        SendDlgItemMessage(hwnd,IDC_RADIO_STEREO,BM_SETCHECK,1,0);
                        SendDlgItemMessage(hwnd,IDC_RADIO_MONO,BM_SETCHECK,0,0);
                }
-               SetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,st_temp->output_rate,FALSE);
-#if 0          // Buggy
-               EnableWindow(GetDlgItem(hwnd,IDC_RADIOBUTTON_LIST_MIDI_EVENT),FALSE);
-#endif
+               // SAMPLE_RATE
+               for (i = 0; i < cb_num_IDC_COMBO_SAMPLE_RATE; i++)
+                       SendDlgItemMessage(hwnd, IDC_COMBO_SAMPLE_RATE,
+                                       CB_INSERTSTRING, (WPARAM) -1,
+                                       (LPARAM) cb_info_IDC_COMBO_SAMPLE_RATE[i]);
+               SetDlgItemInt(hwnd, IDC_COMBO_SAMPLE_RATE, st_temp->output_rate, FALSE);
                }
                initflag = 0;
                break;
@@ -1351,36 +1372,6 @@ PrefTiMidity3DialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
                        }
                 }
                        break;
-               case IDC_BUTTON_LOW:
-                       SetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,11025,FALSE);
-               break;
-               case IDC_BUTTON_MIDDLE:
-                       SetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,22050,FALSE);
-               break;
-               case IDC_BUTTON_HIGH:
-                       SetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,44100,FALSE);
-               break;
-               case IDC_BUTTON_4:
-                       SetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,4000,FALSE);
-               break;
-               case IDC_BUTTON_8:
-                       SetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,8000,FALSE);
-               break;
-               case IDC_BUTTON_16:
-                       SetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,16000,FALSE);
-               break;
-               case IDC_BUTTON_24:
-                       SetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,24000,FALSE);
-               break;
-               case IDC_BUTTON_32:
-                       SetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,32000,FALSE);
-               break;
-               case IDC_BUTTON_40:
-                       SetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,40000,FALSE);
-               break;
-               case IDC_BUTTON_48:
-                       SetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,48000,FALSE);
-               break;
                case IDC_CHECKBOX_ULAW:
                        if(SendDlgItemMessage(hwnd,IDC_CHECKBOX_ULAW,BM_GETCHECK,0,0)){
                                SendDlgItemMessage(hwnd,IDC_CHECKBOX_ULAW,BM_SETCHECK,1,0);
@@ -1578,7 +1569,7 @@ PrefTiMidity3DialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
                if(SendDlgItemMessage(hwnd,IDC_RADIO_MONO,BM_GETCHECK,0,0))
                        st_temp->opt_playmode[i++] = 'M';
                st_temp->opt_playmode[i] = '\0';
-               st_temp->output_rate = GetDlgItemInt(hwnd,IDC_EDIT_SAMPLE_RATE,NULL,FALSE);
+               st_temp->output_rate = GetDlgItemInt(hwnd, IDC_COMBO_SAMPLE_RATE, NULL, FALSE);
                if(st_temp->auto_output_mode==0)
                        GetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputName,(WPARAM)sizeof(st_temp->OutputName));
                else

diff --git a/interface/w32g_res.h b/interface/w32g_res.h
index 2b7c4da..bafdc43 100644 (file)
--- a/interface/w32g_res.h
+++ b/interface/w32g_res.h
@@ -245,6 +245,7 @@
 #define IDC_BUTTON_OUTPUT_OPTIONS       2005
 #define IDC_COMBO_BANDWIDTH             2006
 #define IDC_CHECK_DEFAULT               2007
+#define IDC_COMBO_SAMPLE_RATE           2007
 #define IDC_COMBO_MODE                  2008
 #define IDC_CHECK_USE_TAG               2009
 #define IDC_COMBO_OUTPUT_FORMAT         2013
@@ -328,6 +329,7 @@
 #define IDC_COMBO_DELAY                 2106
 #define IDC_COMBO_LPF                   2107
 #define IDM_MHSUPPLEMENT                40002
+#define IDM_FORCE_RELOAD                40003
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
@@ -335,7 +337,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        157
-#define _APS_NEXT_COMMAND_VALUE         40003
+#define _APS_NEXT_COMMAND_VALUE         40004
 #define _APS_NEXT_CONTROL_VALUE         2105
 #define _APS_NEXT_SYMED_VALUE           101
 #endif

diff --git a/interface/w32g_res.rc b/interface/w32g_res.rc
index 07071b7..75bfbee 100644 (file)
--- a/interface/w32g_res.rc
+++ b/interface/w32g_res.rc
@@ -156,59 +156,59 @@ END
 IDD_PREF_PLAYER_EN DIALOGEX 0, 0, 211, 187\r
 STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | \r
     WS_CAPTION\r
-FONT 9, "Times New Roman", 0, 0, 0x1\r
+FONT 9, "Times New Roman"\r
 BEGIN\r
     PUSHBUTTON      "Config File",IDC_BUTTON_CONFIG_FILE,3,11,52,11,\r
                     BS_CENTER\r
-    EDITTEXT        IDC_EDIT_CONFIG_FILE,62,10,137,14,ES_AUTOHSCROLL | \r
+    EDITTEXT        IDC_EDIT_CONFIG_FILE,57,10,142,14,ES_AUTOHSCROLL | \r
                     ES_OEMCONVERT\r
-    GROUPBOX        "Player",IDC_GROUPBOX_PLAYERMODE,0,28,106,60,WS_GROUP\r
+    GROUPBOX        "Player",IDC_GROUPBOX_PLAYERMODE,2,45,106,60,WS_GROUP\r
     CONTROL         "Not Continue",IDC_CHECKBOX_NOT_CONTINUE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,40,97,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,57,97,8\r
     CONTROL         "Not Drag Start",IDC_CHECKBOX_NOT_DRAG_START,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,52,97,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,69,97,8\r
     CONTROL         "Not Looping",IDC_CHECKBOX_NOT_LOOPING,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,64,97,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,81,97,8\r
     CONTROL         "Auto Start",IDC_CHECKBOX_AUTOSTART,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,76,97,8\r
-    GROUPBOX        "PlayList",IDC_STATIC,112,28,84,64\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,93,97,8\r
+    GROUPBOX        "PlayList",IDC_STATIC,114,45,84,64\r
     CONTROL         "Auto Quit",IDC_CHECKBOX_AUTOQUIT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,36,77,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,118,53,77,8\r
     CONTROL         "Auto Uniq",IDC_CHECKBOX_AUTOUNIQ,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,44,76,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,118,61,76,8\r
     CONTROL         "Auto Refine",IDC_CHECKBOX_AUTOREFINE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,52,75,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,118,69,75,8\r
     CONTROL         "Random Mode",IDC_CHECKBOX_RANDOM,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,60,75,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,118,77,75,8\r
     CONTROL         "Auto Load",IDC_CHECK_AUTOLOAD_PLAYLIST,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,72,75,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,118,89,75,8\r
     CONTROL         "Auto Save",IDC_CHECK_AUTOSAVE_PLAYLIST,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,80,75,8\r
-    GROUPBOX        "Document",IDC_STATIC,4,92,68,38\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,118,97,75,8\r
+    GROUPBOX        "Document",IDC_STATIC,6,109,68,38\r
     CONTROL         "Not Auto Display",IDC_CHECK_DOCWNDINDEPENDENT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,104,63,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,121,63,8\r
     CONTROL         "Popup",IDC_CHECK_DOCWNDAUTOPOPUP,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,116,59,10\r
-    GROUPBOX        "Directory",IDC_STATIC,4,132,67,20\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,133,59,10\r
+    GROUPBOX        "Directory",IDC_STATIC,6,149,67,20\r
     CONTROL         "Recursive walk",IDC_CHECK_SEACHDIRRECURSIVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,140,57,10\r
-    GROUPBOX        "Sub Window",IDC_STATIC,76,96,60,28\r
-    LTEXT           "MAX",IDC_STATIC,80,108,18,8\r
-    EDITTEXT        IDC_EDIT_SUBWINDOW_MAX,100,108,24,12,ES_CENTER,\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,157,57,10\r
+    GROUPBOX        "Sub Window",IDC_STATIC,78,113,60,28\r
+    LTEXT           "MAX",IDC_STATIC,82,125,18,8\r
+    EDITTEXT        IDC_EDIT_SUBWINDOW_MAX,102,125,24,12,ES_CENTER,\r
                     WS_EX_RIGHT\r
-    GROUPBOX        "INI File",IDC_STATIC,76,128,60,24\r
+    GROUPBOX        "INI File",IDC_STATIC,78,145,60,24\r
     CONTROL         "Auto Save",IDC_CHECK_INIFILE_AUTOSAVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,80,136,48,10\r
-    GROUPBOX        "Language",IDC_GROUPBOX_LANGUAGE,140,96,56,28,WS_GROUP\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,82,153,48,10\r
+    GROUPBOX        "Language",IDC_GROUPBOX_LANGUAGE,142,113,56,28,WS_GROUP\r
     CONTROL         "Japanese",IDC_RADIOBUTTON_JAPANESE,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,144,104,42,8\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,146,121,42,8\r
     CONTROL         "English",IDC_RADIOBUTTON_ENGLISH,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,144,112,43,8\r
-    GROUPBOX        "Window",IDC_STATIC,5,153,56,24\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,146,129,43,8\r
+    GROUPBOX        "Window",IDC_STATIC,142,145,56,24\r
     CONTROL         "save pos,size",IDC_CHECK_POS_SIZE_SAVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,9,163,48,10\r
-    PUSHBUTTON      "Forced Reload\n   of config File",IDC_BUTTON_CFG_RELOAD,\r
-                    143,129,50,25,BS_MULTILINE\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,146,155,48,10\r
+    PUSHBUTTON      "Reload Config File",IDC_BUTTON_CFG_RELOAD,3,29,73,12,\r
+                    BS_MULTILINE\r
 END\r
 \r
 IDD_PREF_TIMIDITY1_EN DIALOG DISCARDABLE  0, 0, 219, 173\r
@@ -370,32 +370,25 @@ BEGIN
                     WS_TABSTOP,8,51,36,10\r
     CONTROL         "Mono",IDC_RADIO_MONO,"Button",BS_AUTORADIOBUTTON | \r
                     WS_TABSTOP,8,63,35,8\r
-    LTEXT           "Sample rate (Hz)",IDC_STATIC,65,46,50,8,WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_SAMPLE_RATE,122,44,32,12,ES_NUMBER | WS_GROUP\r
-    PUSHBUTTON      "L",IDC_BUTTON_LOW,60,60,16,14,BS_CENTER\r
-    PUSHBUTTON      "M",IDC_BUTTON_MIDDLE,76,60,16,14,BS_CENTER\r
-    PUSHBUTTON      "H",IDC_BUTTON_HIGH,92,60,16,14,BS_CENTER\r
-    PUSHBUTTON      "4",IDC_BUTTON_4,108,60,12,14,BS_CENTER\r
-    PUSHBUTTON      "8",IDC_BUTTON_8,120,60,12,14,BS_CENTER\r
-    PUSHBUTTON      "16",IDC_BUTTON_16,132,60,12,14,BS_CENTER\r
-    PUSHBUTTON      "24",IDC_BUTTON_24,144,60,12,14,BS_CENTER\r
-    PUSHBUTTON      "32",IDC_BUTTON_32,156,60,12,14,BS_CENTER\r
-    PUSHBUTTON      "40",IDC_BUTTON_40,168,60,12,14,BS_CENTER\r
-    PUSHBUTTON      "48",IDC_BUTTON_48,180,60,12,14,BS_CENTER\r
-    GROUPBOX        "Output",IDC_GROUPBOX_OUTPUT,4,80,193,41,WS_GROUP | \r
+    GROUPBOX        "Output",IDC_GROUPBOX_OUTPUT,4,78,193,41,WS_GROUP | \r
                     WS_TABSTOP\r
-    COMBOBOX        IDC_COMBO_OUTPUT,8,89,151,64,CBS_DROPDOWNLIST | CBS_SORT | \r
+    COMBOBOX        IDC_COMBO_OUTPUT,8,87,151,64,CBS_DROPDOWNLIST | CBS_SORT | \r
                     WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "Option",IDC_BUTTON_OUTPUT_OPTIONS,160,88,34,14\r
-    COMBOBOX        IDC_COMBO_OUTPUT_MODE,8,105,186,72,CBS_DROPDOWNLIST | \r
+    PUSHBUTTON      "Option",IDC_BUTTON_OUTPUT_OPTIONS,160,86,34,14\r
+    COMBOBOX        IDC_COMBO_OUTPUT_MODE,8,103,186,72,CBS_DROPDOWNLIST | \r
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "Output File",IDC_BUTTON_OUTPUT_FILE,4,123,42,14,\r
+    PUSHBUTTON      "Output File",IDC_BUTTON_OUTPUT_FILE,4,121,42,14,\r
                     BS_CENTER | WS_GROUP\r
-    EDITTEXT        IDC_EDIT_OUTPUT_FILE,47,123,130,15,ES_AUTOHSCROLL | \r
+    EDITTEXT        IDC_EDIT_OUTPUT_FILE,47,121,130,15,ES_AUTOHSCROLL | \r
                     ES_OEMCONVERT | WS_GROUP\r
-    PUSHBUTTON      "DEL",IDC_BUTTON_OUTPUT_FILE_DEL,178,123,19,14,BS_CENTER\r
+    PUSHBUTTON      "DEL",IDC_BUTTON_OUTPUT_FILE_DEL,178,121,19,14,BS_CENTER\r
     COMBOBOX        IDC_COMBO_BANDWIDTH,8,19,48,64,CBS_DROPDOWNLIST | \r
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_COMBO_SAMPLE_RATE,58,54,36,64,CBS_DROPDOWN | \r
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    GROUPBOX        "Sample rate",IDC_STATIC,54,41,61,33,WS_GROUP | \r
+                    WS_TABSTOP\r
+    LTEXT           "Hz",IDC_STATIC,98,56,10,8\r
 END\r
 \r
 IDD_PREF_TIMIDITY4_EN DIALOG DISCARDABLE  0, 0, 211, 206\r
@@ -476,7 +469,7 @@ BEGIN
                     BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,9,124,95,13\r
     PUSHBUTTON      "Reverse",IDC_BUTTON_REVERSE,141,18,31,61\r
     GROUPBOX        "Channel",IDC_STATIC,1,3,179,138\r
-    GROUPBOX        "Mute temperament type",IDC_STATIC,1,144,192,39\r
+    GROUPBOX        "Mute temperament type",IDC_STATIC,1,144,195,39\r
     CONTROL         "Equal",IDC_CHECKBOX_TEMPER_EQUAL,"Button",\r
                     BS_AUTOCHECKBOX | WS_TABSTOP,5,155,37,8\r
     CONTROL         "Pythagoras",IDC_CHECKBOX_TEMPER_PYTHA,"Button",\r
@@ -484,7 +477,7 @@ BEGIN
     CONTROL         "Mean-tone",IDC_CHECKBOX_TEMPER_MEANTONE,"Button",\r
                     BS_AUTOCHECKBOX | WS_TABSTOP,105,155,45,8\r
     CONTROL         "Pure int.",IDC_CHECKBOX_TEMPER_PUREINT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,155,155,45,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,155,155,35,8\r
     CONTROL         "User #0",IDC_CHECKBOX_TEMPER_USER0,"Button",\r
                     BS_AUTOCHECKBOX | WS_TABSTOP,5,168,45,8\r
     CONTROL         "User #1",IDC_CHECKBOX_TEMPER_USER1,"Button",\r
@@ -492,7 +485,7 @@ BEGIN
     CONTROL         "User #2",IDC_CHECKBOX_TEMPER_USER2,"Button",\r
                     BS_AUTOCHECKBOX | WS_TABSTOP,105,168,45,8\r
     CONTROL         "User #3",IDC_CHECKBOX_TEMPER_USER3,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,155,168,45,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,155,168,36,8\r
 END\r
 \r
 IDD_DIALOG_VORBIS_EN DIALOG DISCARDABLE  0, 0, 197, 93\r
@@ -671,13 +664,13 @@ IDM_MENU_MAIN_EN MENU DISCARDABLE
 BEGIN\r
     POPUP "File(&F)"\r
     BEGIN\r
-        MENUITEM "open File(&F)",               IDM_MFOPENFILE\r
-        MENUITEM "open Directory(&D)",          IDM_MFOPENDIR\r
+        MENUITEM "Open File(&F)",               IDM_MFOPENFILE\r
+        MENUITEM "Open Directory(&D)",          IDM_MFOPENDIR\r
         MENUITEM SEPARATOR\r
-        MENUITEM "load Playlist(&P)",           IDM_MFLOADPLAYLIST\r
+        MENUITEM "Load Playlist(&P)",           IDM_MFLOADPLAYLIST\r
         MENUITEM "Save Playlist as(&S)",        IDM_MFSAVEPLAYLISTAS\r
         MENUITEM SEPARATOR\r
-        MENUITEM "eXit(&X)",                    IDM_MFEXIT\r
+        MENUITEM "Exit(&X)",                    IDM_MFEXIT\r
     END\r
     POPUP "Config(&C)"\r
     BEGIN\r
@@ -685,24 +678,26 @@ BEGIN
         MENUITEM SEPARATOR\r
         MENUITEM "Load ini file(&L)",           IDM_MCLOADINIFILE\r
         MENUITEM "Save ini file(&S)",           IDM_MCSAVEINIFILE\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Reload cfg file(&F)",         IDM_FORCE_RELOAD\r
     END\r
     POPUP "Window(&W)"\r
     BEGIN\r
-        MENUITEM "play List(&L)",               IDM_MWPLAYLIST\r
+        MENUITEM "Play List(&L)",               IDM_MWPLAYLIST\r
         MENUITEM "Tracer(&T)",                  IDM_MWTRACER\r
         MENUITEM "Document(&D)",                IDM_MWDOCUMENT\r
         MENUITEM "Wrd tracer(&W)",              IDM_MWWRDTRACER\r
-        MENUITEM "sound Spectogram(&S)",        IDM_MWSOUNDSPEC, GRAYED\r
+        MENUITEM "Sound Spectogram(&S)",        IDM_MWSOUNDSPEC, GRAYED\r
         MENUITEM "Console(&C)",                 IDM_MWCONSOLE\r
         MENUITEM SEPARATOR\r
-        MENUITEM "deBug(&B)",                   IDM_MWDEBUG\r
+        MENUITEM "Debug(&B)",                   IDM_MWDEBUG\r
     END\r
     POPUP "Help(&H)"\r
     BEGIN\r
         MENUITEM "Topic(&T)",                   IDM_MHTOPIC, GRAYED\r
         MENUITEM "Help(&H)",                    IDM_MHHELP, GRAYED\r
         MENUITEM SEPARATOR\r
-        MENUITEM "TiMidity(&T)",                IDM_MHTIMIDITY\r
+        MENUITEM "TiMidity++(&T)",              IDM_MHTIMIDITY\r
         MENUITEM "Version(&V)",                 IDM_MHVERSION\r
         MENUITEM SEPARATOR\r
         MENUITEM "Supplement(&S)",              IDM_MHSUPPLEMENT\r
@@ -863,61 +858,61 @@ END
 IDD_PREF_PLAYER DIALOGEX 0, 0, 211, 215\r
 STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | \r
     WS_CAPTION\r
-FONT 9, "\82l\82r \82o\83S\83V\83b\83N", 0, 0, 0x1\r
+FONT 9, "\82l\82r \82o\83S\83V\83b\83N"\r
 BEGIN\r
     PUSHBUTTON      "\90Ý\92è\83t\83@\83C\83\8b",IDC_BUTTON_CONFIG_FILE,3,11,52,14,\r
                     BS_CENTER\r
-    EDITTEXT        IDC_EDIT_CONFIG_FILE,57,9,154,17,ES_AUTOHSCROLL | \r
+    EDITTEXT        IDC_EDIT_CONFIG_FILE,57,11,154,15,ES_AUTOHSCROLL | \r
                     ES_OEMCONVERT\r
-    GROUPBOX        "\83v\83\8c\83C\83\84\81[",IDC_GROUPBOX_PLAYERMODE,2,32,106,61,\r
+    GROUPBOX        "\83v\83\8c\83C\83\84\81[",IDC_GROUPBOX_PLAYERMODE,2,52,106,61,\r
                     WS_GROUP\r
     CONTROL         "\88ê\8bÈ\89\89\91t\82µ\82Ä\92â\8e~",IDC_CHECKBOX_NOT_CONTINUE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,44,64,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,64,64,8\r
     CONTROL         "\83h\83\89\83b\83O&&\83h\83\8d\83b\83v\82Å\8dÄ\90¶\82µ\82È\82¢",\r
                     IDC_CHECKBOX_NOT_DRAG_START,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,7,56,97,8\r
+                    WS_TABSTOP,7,76,97,8\r
     CONTROL         "\83\8a\83s\81[\83g\82µ\82È\82¢",IDC_CHECKBOX_NOT_LOOPING,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,68,51,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,88,51,8\r
     CONTROL         "\83I\81[\83g\83X\83^\81[\83g",IDC_CHECKBOX_AUTOSTART,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,80,56,8\r
-    GROUPBOX        "\83v\83\8c\83C\83\8a\83X\83g",IDC_STATIC,112,32,88,85\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,100,56,8\r
+    GROUPBOX        "\83v\83\8c\83C\83\8a\83X\83g",IDC_STATIC,112,52,88,85\r
     CONTROL         "\91S\8bÈ\89\89\91t\8cã\8fI\97¹",IDC_CHECKBOX_AUTOQUIT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,117,44,61,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,117,64,61,8\r
     CONTROL         "\8fd\95¡\93o\98^\82ð\96h\8e~",IDC_CHECKBOX_AUTOUNIQ,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,117,56,59,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,117,76,59,8\r
     CONTROL         "\89\89\91t\83t\83@\83C\83\8b\82Ì\82Ý\93o\98^",IDC_CHECKBOX_AUTOREFINE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,117,68,75,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,117,88,75,8\r
     CONTROL         "\83\89\83\93\83_\83\80\8dÄ\90¶",IDC_CHECKBOX_RANDOM,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,117,80,50,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,117,100,50,8\r
     CONTROL         "\8e©\93®\93Ç\8d\9e",IDC_CHECK_AUTOLOAD_PLAYLIST,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,117,91,50,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,117,111,50,8\r
     CONTROL         "\8e©\93®\95Û\91¶",IDC_CHECK_AUTOSAVE_PLAYLIST,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,117,104,50,8\r
-    GROUPBOX        "\83T\83u\83E\83C\83\93\83h\83E",IDC_STATIC,4,96,104,24\r
-    LTEXT           "\8dÅ\91å\90\94",IDC_STATIC,8,108,24,8\r
-    EDITTEXT        IDC_EDIT_SUBWINDOW_MAX,32,104,24,14,ES_CENTER,\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,117,124,50,8\r
+    GROUPBOX        "\83T\83u\83E\83C\83\93\83h\83E",IDC_STATIC,4,116,104,24\r
+    LTEXT           "\8dÅ\91å\90\94",IDC_STATIC,8,128,24,8\r
+    EDITTEXT        IDC_EDIT_SUBWINDOW_MAX,32,124,24,14,ES_CENTER,\r
                     WS_EX_RIGHT\r
-    GROUPBOX        "\83h\83L\83\85\83\81\83\93\83g",IDC_STATIC,2,122,75,38\r
+    GROUPBOX        "\83h\83L\83\85\83\81\83\93\83g",IDC_STATIC,2,142,75,38\r
     CONTROL         "\8e©\93®\95\\8e¦\82µ\82È\82¢",IDC_CHECK_DOCWNDINDEPENDENT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,133,56,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,153,56,8\r
     CONTROL         "\83|\83b\83v\83A\83b\83v",IDC_CHECK_DOCWNDAUTOPOPUP,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,145,59,10\r
-    GROUPBOX        "\83E\83C\83\93\83h\83E",IDC_STATIC,3,163,72,28\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,165,59,10\r
+    GROUPBOX        "\83E\83C\83\93\83h\83E",IDC_STATIC,3,183,72,28\r
     CONTROL         "\88Ê\92u\81E\83T\83C\83Y\95Û\91¶",IDC_CHECK_POS_SIZE_SAVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,176,64,10\r
-    GROUPBOX        "\83t\83H\83\8b\83_",IDC_STATIC,83,122,70,23\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,8,196,64,10\r
+    GROUPBOX        "\83t\83H\83\8b\83_",IDC_STATIC,83,142,70,23\r
     CONTROL         "\8dÄ\8bA\8c\9f\8dõ",IDC_CHECK_SEACHDIRRECURSIVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,88,132,41,10\r
-    GROUPBOX        "\90Ý\92è",IDC_STATIC,83,150,70,25\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,88,152,41,10\r
+    GROUPBOX        "\90Ý\92è",IDC_STATIC,83,170,70,25\r
     CONTROL         "\90Ý\92è\82Ì\8e©\93®\95Û\91¶",IDC_CHECK_INIFILE_AUTOSAVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,88,161,59,10\r
-    GROUPBOX        "Language",IDC_GROUPBOX_LANGUAGE,160,122,47,38,WS_GROUP\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,88,181,59,10\r
+    GROUPBOX        "Language",IDC_GROUPBOX_LANGUAGE,160,142,43,38,WS_GROUP\r
     CONTROL         "\93ú\96{\8cê",IDC_RADIOBUTTON_JAPANESE,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,163,134,30,8\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,163,154,30,8\r
     CONTROL         "English",IDC_RADIOBUTTON_ENGLISH,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,163,147,36,8\r
-    PUSHBUTTON      "\90Ý\92è\83t\83@\83C\83\8b\n(cfg)\82Ì\8b­\90§\n\81@\81@\8dÄ\93Ç\8d\9e",\r
-                    IDC_BUTTON_CFG_RELOAD,159,165,47,32,BS_MULTILINE\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,163,167,36,8\r
+    PUSHBUTTON      "\90Ý\92è\83t\83@\83C\83\8b\82Ì\8b­\90§\8dÄ\93Ç\8d\9e",IDC_BUTTON_CFG_RELOAD,3,31,93,\r
+                    15,BS_MULTILINE\r
 END\r
 \r
 IDD_PREF_TIMIDITY1 DIALOG DISCARDABLE  0, 0, 211, 207\r
@@ -1060,7 +1055,7 @@ STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE |
     WS_CAPTION\r
 FONT 9, "\82l\82r \82o\83S\83V\83b\83N"\r
 BEGIN\r
-    GROUPBOX        "\8fo\97Í",IDC_STATIC,1,0,203,180,WS_GROUP | WS_TABSTOP\r
+    GROUPBOX        "\8fo\97Í",IDC_STATIC,1,0,203,173,WS_GROUP | WS_TABSTOP\r
     GROUPBOX        "\8fo\97Í\83\82\81[\83h",IDC_STATIC,4,14,193,33,WS_GROUP | \r
                     WS_TABSTOP\r
     CONTROL         "U-Law",IDC_CHECKBOX_ULAW,"Button",BS_AUTOCHECKBOX | \r
@@ -1080,33 +1075,25 @@ BEGIN
                     WS_TABSTOP,8,65,36,10\r
     CONTROL         "\83\82\83m\83\89\83\8b",IDC_RADIO_MONO,"Button",BS_AUTORADIOBUTTON | \r
                     WS_TABSTOP,8,77,35,8\r
-    LTEXT           "\83T\83\93\83v\83\8b\83\8c\81[\83g(Hz)",IDC_STATIC,65,60,56,8,WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_SAMPLE_RATE,122,58,32,10,ES_NUMBER | WS_GROUP\r
-    PUSHBUTTON      "L",IDC_BUTTON_LOW,65,73,8,14,BS_CENTER\r
-    PUSHBUTTON      "M",IDC_BUTTON_MIDDLE,73,73,10,14,BS_CENTER\r
-    PUSHBUTTON      "H",IDC_BUTTON_HIGH,84,73,10,14,BS_CENTER\r
-    PUSHBUTTON      "4",IDC_BUTTON_4,95,73,8,14,BS_CENTER\r
-    PUSHBUTTON      "8",IDC_BUTTON_8,103,73,8,14,BS_CENTER\r
-    PUSHBUTTON      "16",IDC_BUTTON_16,111,73,12,14,BS_CENTER\r
-    PUSHBUTTON      "24",IDC_BUTTON_24,123,73,12,14,BS_CENTER\r
-    PUSHBUTTON      "32",IDC_BUTTON_32,135,73,12,14,BS_CENTER\r
-    PUSHBUTTON      "40",IDC_BUTTON_40,147,73,12,14,BS_CENTER\r
-    PUSHBUTTON      "48",IDC_BUTTON_48,159,73,12,14,BS_CENTER\r
-    GROUPBOX        "\8fo\97Í\95û\96@",IDC_GROUPBOX_OUTPUT,4,102,193,49,WS_GROUP | \r
+    LTEXT           "Hz",IDC_STATIC,103,72,8,8,WS_TABSTOP\r
+    GROUPBOX        "\8fo\97Í\95û\96@",IDC_GROUPBOX_OUTPUT,4,97,193,49,WS_GROUP | \r
                     WS_TABSTOP\r
-    COMBOBOX        IDC_COMBO_OUTPUT,8,116,151,64,CBS_DROPDOWNLIST | \r
+    COMBOBOX        IDC_COMBO_OUTPUT,8,111,151,64,CBS_DROPDOWNLIST | \r
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "\83I\83v\83V\83\87\83\93",IDC_BUTTON_OUTPUT_OPTIONS,160,115,34,14\r
-    COMBOBOX        IDC_COMBO_OUTPUT_MODE,8,134,186,72,CBS_DROPDOWNLIST | \r
+    PUSHBUTTON      "\83I\83v\83V\83\87\83\93",IDC_BUTTON_OUTPUT_OPTIONS,160,110,34,14\r
+    COMBOBOX        IDC_COMBO_OUTPUT_MODE,8,129,186,72,CBS_DROPDOWNLIST | \r
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "\8fo\97Í\83t\83@\83C\83\8b",IDC_BUTTON_OUTPUT_FILE,4,156,42,14,\r
+    PUSHBUTTON      "\8fo\97Í\83t\83@\83C\83\8b",IDC_BUTTON_OUTPUT_FILE,4,151,42,14,\r
                     BS_CENTER | WS_GROUP\r
-    EDITTEXT        IDC_EDIT_OUTPUT_FILE,47,156,130,15,ES_AUTOHSCROLL | \r
+    EDITTEXT        IDC_EDIT_OUTPUT_FILE,47,151,130,15,ES_AUTOHSCROLL | \r
                     ES_OEMCONVERT | WS_GROUP\r
-    PUSHBUTTON      "\8dí\8f\9c",IDC_BUTTON_OUTPUT_FILE_DEL,178,156,19,14,\r
+    PUSHBUTTON      "\8dí\8f\9c",IDC_BUTTON_OUTPUT_FILE_DEL,178,151,19,14,\r
                     BS_CENTER\r
     COMBOBOX        IDC_COMBO_BANDWIDTH,8,27,48,64,CBS_DROPDOWNLIST | \r
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_COMBO_SAMPLE_RATE,63,69,36,64,CBS_DROPDOWN | \r
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    GROUPBOX        "\83T\83\93\83v\83\8b\83\8c\81[\83g",IDC_STATIC,56,55,60,33\r
 END\r
 \r
 IDD_PREF_TIMIDITY4 DIALOG DISCARDABLE  0, 0, 211, 195\r
@@ -1414,6 +1401,8 @@ BEGIN
         MENUITEM SEPARATOR\r
         MENUITEM "\90Ý\92è\93Ç\8d\9e(&L)",                IDM_MCLOADINIFILE\r
         MENUITEM "\90Ý\92è\95Û\91¶(&S)",                IDM_MCSAVEINIFILE\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "cfg\8b­\90§\8dÄ\93Ç\8d\9e(&F)",           IDM_FORCE_RELOAD\r
     END\r
     POPUP "\83E\83B\83\93\83h\83E(&W)"\r
     BEGIN\r
@@ -1431,7 +1420,7 @@ BEGIN
         MENUITEM "\83g\83s\83b\83N(&T)",                IDM_MHTOPIC, GRAYED\r
         MENUITEM "\83w\83\8b\83v(&H)",                  IDM_MHHELP, GRAYED\r
         MENUITEM SEPARATOR\r
-        MENUITEM "TiMidity\82É\82Â\82¢\82Ä(&T)",        IDM_MHTIMIDITY\r
+        MENUITEM "TiMidity++\82É\82Â\82¢\82Ä(&T)",      IDM_MHTIMIDITY\r
         MENUITEM "\83o\81[\83W\83\87\83\93\8fî\95ñ(&V)",          IDM_MHVERSION\r
         MENUITEM SEPARATOR\r
         MENUITEM "\95â\91«(&S)",                    IDM_MHSUPPLEMENT\r

diff --git a/interface/w32g_subwin.c b/interface/w32g_subwin.c
index 5b5b352..ad4d2b1 100644 (file)
--- a/interface/w32g_subwin.c
+++ b/interface/w32g_subwin.c
@@ -398,7 +398,7 @@ void InitListWnd(HWND hParentWnd)
                AppendMenu(ListWndInfo.hPopupMenu,MF_STRING,IDM_LISTWND_CURRENT,"\8c»\8dÝ\88Ê\92u");
                AppendMenu(ListWndInfo.hPopupMenu,MF_STRING,IDM_LISTWND_SEARCH,"\8c\9f\8dõ");
                AppendMenu(ListWndInfo.hPopupMenu,MF_SEPARATOR,0,0);
-               AppendMenu(ListWndInfo.hPopupMenu,MF_STRING,IDM_LISTWND_REMOVE,"\8f\9c\82­");
+               AppendMenu(ListWndInfo.hPopupMenu,MF_STRING,IDM_LISTWND_REMOVE,"\8dí\8f\9c");
                AppendMenu(ListWndInfo.hPopupMenu,MF_SEPARATOR,0,0);
                AppendMenu(ListWndInfo.hPopupMenu,MF_STRING,IDM_LISTWND_CHOOSEFONT,"\83t\83H\83\93\83g\82Ì\91I\91ð");
                break;