--- np2/win9x/dialog/d_serial.cpp 2003/10/21 11:51:16 1.3 +++ np2/win9x/dialog/d_serial.cpp 2003/10/31 04:11:40 1.7 @@ -153,6 +153,7 @@ static LRESULT CALLBACK dlgitem_proc(HWN } str; COMCFG *cfg; UINT update; + COMMNG cm; switch (msg) { case WM_INITDIALOG: @@ -219,7 +220,7 @@ static LRESULT CALLBACK dlgitem_proc(HWN break; case WM_NOTIFY: - if ((((NMHDR *)lp)->code) == PSN_APPLY) { + if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) { cfg = m->cfg; update = 0; r = SendDlgItemMessage(hWnd, m->idc[ID_PORT], @@ -288,12 +289,18 @@ static LRESULT CALLBACK dlgitem_proc(HWN } cfg->def_en = GetDlgItemCheck(hWnd, m->idc[ID_DEFE]); + cm = *m->cm; + if (cm) { + cm->msg(cm, COMMSG_MIMPIDEFEN, cfg->def_en); + } GetDlgItemText(hWnd, m->idc[ID_DEFF], str.mdef, sizeof(str.mdef)); if (milstr_cmp(cfg->def, str.mdef)) { milstr_ncpy(cfg->def, str.mdef, sizeof(cfg->def)); update |= SYS_UPDATEOSCFG; -// commsmidi_toneload(m->comm, str.mdef); + if (cm) { + cm->msg(cm, COMMSG_MIMPIDEFFILE, (long)str.mdef); + } } sysmng_update(update); return(TRUE); @@ -682,7 +689,7 @@ static LRESULT CALLBACK pc9861mainProc(H break; case WM_NOTIFY: - if ((((NMHDR *)lp)->code) == PSN_APPLY) { + if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) { update = 0; r = GetDlgItemCheck(hWnd, IDC_PC9861E); if (np2cfg.pc9861enable != r) { @@ -740,13 +747,14 @@ void dialog_serial(HWND hWnd) { ZeroMemory(&psh, sizeof(psh)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_NOAPPLYNOW; + psh.dwFlags = PSH_NOAPPLYNOW | PSH_USEHICON; psh.hwndParent = hWnd; psh.hInstance = hinst; + psh.hIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_ICON2)); psh.nPages = 4; psh.phpage = hpsp; psh.pszCaption = str_seropt; PropertySheet(&psh); - InvalidateRect(hWndMain, NULL, TRUE); + InvalidateRect(hWnd, NULL, TRUE); }