Hi, All your diffs seem to work almost correctly (see below), but still testing.
In windialogs.c:- Should SM_CXICONSM be SM_CXSMICON, SM_CYICONSM be SM_CYSMICON ? Also had to remove the conditional on XWIN_MULTIWINDOW to get X icons i.e. --- my_windialogs.c 2005-09-03 22:36:08.000000000 +0100 +++ windialogs.c 2005-09-04 11:44:22.000000000 +0100 @@ -213,18 +213,13 @@ 0, 0, SWP_NOSIZE); -#if defined(XWIN_MULTIWINDOW) - hIcon = g_hIconX; - hIconSmall = g_hSmallIconX; -#else - hIcon = LoadIcon (g_hInstance, MAKEINTRESOURCE(IDI_XWIN))); + hIcon = LoadIcon (g_hInstance, MAKEINTRESOURCE(IDI_XWIN)); hIconSmall = LoadImage (g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON, - GetSystemMetrics(SM_CXICONSM), - GetSystemMetrics(SM_CYICONSM), - LR_SHARED)); -#endif + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + LR_SHARED); PostMessage (hwndDlg, WM_SETICON, ICON_BIG, (LPARAM) hIcon); PostMessage (hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall); In winmultiwindowwindow.c:- Get some unused variables warnings, I just removed them:- --- my_winmultiwindowwindow.c 2005-09-04 11:13:28.000000000 +0100 +++ winmultiwindowwindow.c 2005-09-04 11:14:32.000000000 +0100 @@ -520,10 +520,6 @@ winWindowPriv(pWin); HICON hIcon; HICON hIconSmall; -#define CLASS_NAME_LENGTH 512 - char pszClass[CLASS_NAME_LENGTH], pszWindowID[12]; - char *res_name, *res_class, *res_role; - static int s_iWindowID = 0; winPrivScreenPtr pScreenPriv = pWinPriv->pScreenPriv; WinXSizeHints hints; @@ -610,11 +606,6 @@ { MSG msg; winWindowPriv(pWin); - HICON hiconClass; - HICON hiconSmClass; - HMODULE hInstance; - int iReturn; - char pszClass[512]; BOOL oldstate = winInDestroyWindowsWindow; #if CYGMULTIWINDOW_DEBUG In winmultiwindowicons.c (LPARAM) cast missing in > hIconOld = (HICON) SendMessage (pWinPriv->hWnd, > WM_SETICON, ICON_SMALL, hIconSmall); We probably need to work through bugzilla to get these changes into the xorg tree? Thanks Colin Harrison -- Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple Problem reports: http://cygwin.com/problems.html Documentation: http://x.cygwin.com/docs/ FAQ: http://x.cygwin.com/docs/faq/