Changeset 2384 for trunk/src/user32/loadres.cpp

Timestamp:

Jan 9, 2000, 4:56:06 PM (26 years ago)

Author:

sandervl

Message:

win32 look update

File:

• trunk/src/user32/loadres.cpp (modified) (2 diffs)

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.18 2000-01-09 14:37:09 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.19 2000-01-09 15:56:02 sandervl Exp $ */
 
 /*
@@ -390 +390 @@
  HBITMAP hBitmap = 0;
 
-  return LoadBitmapA((hinst == 0) ? hInstanceUser32:hinst,lpszBitmap,0,0,0);
-#if 0
   if (!hinst)
   {
     if(IsSystemBitmap((ULONG *)&lpszBitmap))
     {
-      hBitmap = O32_LoadBitmap(hInstanceUser32,lpszBitmap);
-      if (!hBitmap) hBitmap = O32_LoadBitmap(hinst,lpszBitmap);
-    } else hBitmap = 0;
-  } else hBitmap = LoadBitmapA(hinst, lpszBitmap, 0, 0, 0);
+         hBitmap =  LoadBitmapA(hInstanceUser32, lpszBitmap, 0, 0, 0);
+    } 
+    else hBitmap = 0;
+  } 
+  else hBitmap = LoadBitmapA(hinst, lpszBitmap, 0, 0, 0);
+
   dprintf(("LoadBitmapA returned %08xh\n", hBitmap));
-#endif
+
   return(hBitmap);
 }