Changeset 951 for trunk/src/3rdparty/os2/xsystray/apilib/xsystray.c

Timestamp:

Aug 9, 2011, 10:34:15 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: xsystray: Paint empty box for NULL icon.

This is what tray widgets on Windows and Linux do. Previously,
xsystray would leave an old icon if NULL icon was sent to it,
which was totally confusing.

File:

• trunk/src/3rdparty/os2/xsystray/apilib/xsystray.c (modified) (4 diffs)

trunk/src/3rdparty/os2/xsystray/apilib/xsystray.c

@@ -316 +316 @@
 
     // give all processes temporary access to hIcon
-    brc = WinSetPointerOwner(hIcon, 0, FALSE);
+    brc = ;
     if (brc)
     {
@@ -340 +340 @@
 
         // revoke temporary access to hIcon
-        DosGetInfoBlocks(NULL, &ppib);
-        WinSetPointerOwner(hIcon, ppib->pib_ulpid, TRUE);
+        if (hIcon != NULLHANDLE)
+        {
+            DosGetInfoBlocks(NULL, &ppib);
+            WinSetPointerOwner(hIcon, ppib->pib_ulpid, TRUE);
+        }
     }
 
@@ -402 +405 @@
 
     // give all processes temporary access to hIcon
-    brc = WinSetPointerOwner(hIcon, 0, FALSE);
+    brc = ;
     if (brc)
     {
@@ -414 +417 @@
 
         // revoke temporary access to hIcon
-        DosGetInfoBlocks(NULL, &ppib);
-        WinSetPointerOwner(hIcon, ppib->pib_ulpid, TRUE);
+        if (hIcon != NULLHANDLE)
+        {
+            DosGetInfoBlocks(NULL, &ppib);
+            WinSetPointerOwner(hIcon, ppib->pib_ulpid, TRUE);
+        }
     }