1 files changed, 2 insertions, 13 deletions
diff --git a/hw/xwin/winwin32rootlesswindow.c b/hw/xwin/winwin32rootlesswindow.c
index 692c0cfaf..eedfe2f0c 100755
--- a/hw/xwin/winwin32rootlesswindow.c
+++ b/hw/xwin/winwin32rootlesswindow.c
@@ -33,14 +33,6 @@
 #include "win.h"
 #include "winprefs.h"
 
-
-/*
- * External global variables
- */
-
-extern HICON		g_hiconX;
-
-
 #if 0
 /*
  * winMWExtWMReorderWindows
@@ -173,7 +165,7 @@ winMWExtWMUpdateIcon (Window id)
   hIcon = (HICON)winOverrideIcon ((unsigned long)pWin);
 
   if (!hIcon)
-    hIcon = winXIconToHICON (pWin);
+    hIcon = winXIconToHICON (pWin, GetSystemMetrics(SM_CXICON));
 
   if (hIcon)
     {
@@ -186,10 +178,7 @@ winMWExtWMUpdateIcon (Window id)
 					   GCL_HICON,
 					   (int) hIcon);
 	  
-	  /* Delete the icon if its not the default */
-	  if (hiconOld != g_hiconX &&
-	      !winIconIsOverride((unsigned long)hiconOld))
-	    DestroyIcon (hiconOld);
+          winDestroyIcon(hiconOld);
 	}
     }
 }