--- np2/win9x/dialog/d_screen.cpp	2003/10/22 14:13:25	1.3
+++ np2/win9x/dialog/d_screen.cpp	2004/04/08 13:08:23	1.7
@@ -6,6 +6,7 @@
 #include	"np2.h"
 #include	"scrnmng.h"
 #include	"sysmng.h"
+#include	"np2class.h"
 #include	"dialog.h"
 #include	"dialogs.h"
 #include	"pccore.h"
@@ -86,8 +87,8 @@ static LRESULT CALLBACK Scropt1DlgProc(H
 					renewal = 1;
 				}
 				if (renewal) {
-					sysmng_update(SYS_UPDATECFG);
 					scrndraw_redraw();
+					sysmng_update(SYS_UPDATECFG);
 				}
 				return(TRUE);
 			}
@@ -114,6 +115,14 @@ static LRESULT CALLBACK Scropt2DlgProc(H
 			}
 			SetDlgItemCheck(hWnd, gdcchip[np2cfg.grcg & 3], TRUE);
 			SetDlgItemCheck(hWnd, IDC_PC980124, np2cfg.color16);
+#if defined(SUPPORT_PC9821)
+			EnableWindow(GetDlgItem(hWnd, IDC_GCBOX), FALSE);
+			EnableWindow(GetDlgItem(hWnd, IDC_GRCGNON), FALSE);
+			EnableWindow(GetDlgItem(hWnd, IDC_GRCG), FALSE);
+			EnableWindow(GetDlgItem(hWnd, IDC_GRCG2), FALSE);
+			EnableWindow(GetDlgItem(hWnd, IDC_EGC), FALSE);
+			EnableWindow(GetDlgItem(hWnd, IDC_PC980124), FALSE);
+#endif
 			return(TRUE);
 
 		case WM_NOTIFY:
@@ -278,12 +287,14 @@ void dialog_scropt(HWND hWnd) {
 
 	ZeroMemory(&psh, sizeof(psh));
 	psh.dwSize = sizeof(PROPSHEETHEADER);
-	psh.dwFlags = PSH_NOAPPLYNOW;
+	psh.dwFlags = PSH_NOAPPLYNOW | PSH_USEHICON | PSH_USECALLBACK;
 	psh.hwndParent = hWnd;
 	psh.hInstance = hinst;
+	psh.hIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_ICON2));
 	psh.nPages = 3;
 	psh.phpage = hpsp;
 	psh.pszCaption = str_scropt;
+	psh.pfnCallback = np2class_propetysheet;
 	PropertySheet(&psh);
 	InvalidateRect(hWndMain, NULL, TRUE);
 }