Changeset 154 for trunk/src/helpers/shapewin.c

Timestamp:

Apr 16, 2002, 8:27:19 AM (23 years ago)

Author:

umoeller

Message:

Misc changes.

File:

• trunk/src/helpers/shapewin.c (modified) (1 diff)

trunk/src/helpers/shapewin.c

@@ -1355 +1355 @@
     psb->hab = hab;
 
-    psb->hdc = DevOpenDC(hab, OD_MEMORY, "*", 0, NULL, NULLHANDLE);
-    if (psb->hdc)
+    if (psb->hdc = DevOpenDC(hab, OD_MEMORY, "*", 0, NULL, NULLHANDLE))
     {
         siz.cx = siz.cy = 0;
-        psb->hps = GpiCreatePS(hab, psb->hdc, &siz,
-                PU_PELS | GPIF_DEFAULT | GPIT_MICRO | GPIA_ASSOC);
-
-        if (psb->hps)
+        if (psb->hps = GpiCreatePS(hab,
+                                   psb->hdc,
+                                   &siz,
+                                   PU_PELS | GPIF_DEFAULT | GPIT_MICRO | GPIA_ASSOC))
         {
             if (pszBitmapFile)
             {
                 // load bitmap file
-                ULONG ulError;
-                psb->hbm = gpihLoadBitmapFile(psb->hps,
-                                              pszBitmapFile,
-                                              &ulError);
-            } else
+                if (gpihLoadBitmapFile(&psb->hbm,
+                                       psb->hps,
+                                       pszBitmapFile))
+                    psb->hbm = NULLHANDLE;
+            }
+            else
                 // load resource bitmap
                 psb->hbm = GpiLoadBitmap(psb->hps,