We don't yet want the static control to call DestroyIcon.

1fea6b96 · Huw D M Davies · Alexandre Julliard · be156661 · 1fea6b96
Commit 1fea6b96 authored Dec 07, 1998 by Huw D M Davies Committed by Alexandre Julliard Dec 07, 1998
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

static.c controls/static.c +11 -3

No files found.
--- a/controls/static.c
+++ b/controls/static.c
@@ -218,10 +218,18 @@ LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
        break;

    case WM_NCDESTROY:
-        if (style == SS_ICON)
-            DestroyIcon32( STATIC_SetIcon( wndPtr, 0 ) );
-        else
+        if (style == SS_ICON) {
+/*
+ * FIXME
+ *           DestroyIcon32( STATIC_SetIcon( wndPtr, 0 ) );
+ * 
+ * We don't want to do this yet because DestroyIcon32 is broken. If the icon
+ * had already been loaded by the application the last thing we want to do is
+ * GlobalFree16 the handle.
+ */
+        } else {
            lResult = DefWindowProc32A( hWnd, uMsg, wParam, lParam );
+	}
        break;

    case WM_PAINT: