Changeset 6241

Timestamp:

Jul 8, 2001, 9:15:10 AM (24 years ago)

Author:

sandervl

Message:

some icon fixes

Location:

trunk/src/user32

Files:

• win32wdesktop.cpp (modified) (2 diffs)
• winicon.cpp (modified) (3 diffs)

trunk/src/user32/win32wdesktop.cpp ¶

@@ -1 @@
-/* $Id: win32wdesktop.cpp,v 1.17 2001-06-09 14:50:22 sandervl Exp $ */
+/* $Id: win32wdesktop.cpp,v 1.18 2001-07-08 07:15:09 sandervl Exp $ */
 /*
  * Win32 Desktop Window for OS/2
@@ -128 +128 @@
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = 0;
-    wndClass.hCursor       = (HCURSOR)IDC_ARROWA;
+    wndClass.hCursor       = LoadCursorA(0, IDC_ARROWA);
     wndClass.hbrBackground = 0;
     wndClass.lpszClassName = DESKTOP_CLASS_NAMEA;

trunk/src/user32/winicon.cpp ¶

@@ -1 @@
-/* $Id: winicon.cpp,v 1.26 2001-07-06 13:47:00 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.27 2001-07-08 07:15:10 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -613 +613 @@
 
             if (loadflags & LR_SHARED )
-                CURSORICON_AddSharedIcon( -1, hIcon, -1, hObj );
+                CURSORICON_AddSharedIcon( -1, hCursor, -1, hIcon );
 
             GlobalUnlock( hObj );
@@ -1190 +1190 @@
     if ( !(flags & CID_NONSHARED) )
     {
-#ifdef __WIN32OS2__
-        INT count = CURSORICON_DelSharedIcon( hIcon );
-#else
         INT count = CURSORICON_DelSharedIcon( handle );
-#endif
 
         if ( count != -1 )