From: <kr_...@us...> - 2003-03-27 14:05:07
|
Update of /cvsroot/htoolkit/port/src/cbits/Win32 In directory sc8-pr-cvs1:/tmp/cvs-serv28930/port/src/cbits/Win32 Modified Files: Window.c Log Message: bugfixes Index: Window.c =================================================================== RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Window.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Window.c 27 Mar 2003 13:36:23 -0000 1.15 --- Window.c 27 Mar 2003 14:05:03 -0000 1.16 *************** *** 854,858 **** } ! return checkWindow(hWnd, "HWINDOW"); }; --- 854,858 ---- } ! return hWnd; }; *************** *** 887,891 **** hDlg = CreateDialogIndirectParam (ghModule, (LPCDLGTEMPLATE) dlgtemplate, parent, (DLGPROC) NULL, (LPARAM) 0); ! return checkWindow(hDlg, "HDIALOG"); }; --- 887,891 ---- hDlg = CreateDialogIndirectParam (ghModule, (LPCDLGTEMPLATE) dlgtemplate, parent, (DLGPROC) NULL, (LPARAM) 0); ! return hDlg; }; *************** *** 1222,1226 **** BOOL osGetControlEnabled(WindowHandle ctrl) { ! return IsWindowEnabled(ctrl); } --- 1222,1237 ---- BOOL osGetControlEnabled(WindowHandle ctrl) { ! int i; ! WindowData *pData = (WindowData *) GetWindowLong(GetParent(ctrl),GWL_USERDATA); ! ! if (pData->enabled) ! return IsWindowEnabled(ctrl); ! else ! { ! pData->disabledCtrls[pData->disabledCtrlsCount] = ctrl; ! for (i = 0; pData->disabledCtrls[i] != ctrl; i++); ! ! return (i >= pData->disabledCtrlsCount); ! } } |