From e978fab10babba27885fe6b8a3f8dd72fecbc792 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 9 Sep 2009 15:19:40 +0000 Subject: Synchronised with released branch. --- xorg-server/hw/xwin/windialogs.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'xorg-server/hw/xwin/windialogs.c') diff --git a/xorg-server/hw/xwin/windialogs.c b/xorg-server/hw/xwin/windialogs.c index 94afcd989..75a2c7c65 100644 --- a/xorg-server/hw/xwin/windialogs.c +++ b/xorg-server/hw/xwin/windialogs.c @@ -194,7 +194,7 @@ winInitDialog (HWND hwndDlg) HWND hwndDesk; RECT rc, rcDlg, rcDesk; HICON hIcon, hIconSmall; - + hwndDesk = GetParent (hwndDlg); if (!hwndDesk || IsIconic (hwndDesk)) hwndDesk = GetDesktopWindow (); @@ -237,22 +237,23 @@ winInitDialog (HWND hwndDlg) if (g_hIconX) hIcon=g_hIconX; else #endif - hIcon = LoadIcon (g_hInstance, MAKEINTRESOURCE(IDI_XWIN)); + hIcon = LoadIcon (g_hInstance, MAKEINTRESOURCE(IDI_XWIN)); #ifdef XWIN_MULTIWINDOW if (g_hSmallIconX) hIconSmall=g_hSmallIconX; else #endif - hIconSmall = LoadImage (g_hInstance, - MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), - LR_SHARED); + hIconSmall = LoadImage (g_hInstance, + MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + LR_SHARED); PostMessage (hwndDlg, WM_SETICON, ICON_BIG, (LPARAM) hIcon); PostMessage (hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall); } + /* * Display the Exit dialog box */ -- cgit v1.2.3