Changeset 1042 for trunk/src/user32/oslibres.cpp

Timestamp:

Sep 25, 1999, 4:18:12 PM (26 years ago)

Author:

sandervl

Message:

Cursor fixes + minor change to RedrawWindow

File:

• trunk/src/user32/oslibres.cpp (modified) (6 diffs)

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.3 1999-09-24 22:45:26 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.4 1999-09-25 14:16:05 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -145 +145 @@
 
     if(cursorbitmap == NULL) {
-        dprintf(("OSLibWinCreatePointer cursorbitmap == NULL!!"));
-        return 0;
+        dprintf(("OSLibWinCreatePointer cursorbitmap == NULL!!"));
+        return 0;
     }
     if(bafh->usType == BFT_BITMAPARRAY && bafh->cbSize == sizeof(BITMAPARRAYFILEHEADER2)) {
-        bfh  = &bafh->bfh2;
+        bfh  = &bafh->bfh2;
     }
     else {//single icon
-        bfh  = (BITMAPFILEHEADER2 *)cursorbitmap;
-        bafh = (BITMAPARRAYFILEHEADER2 *)bfh; //for calculation bitmap offset
+        bfh  = (BITMAPFILEHEADER2 *)cursorbitmap;
+    bafh = (BITMAPARRAYFILEHEADER2 *)bfh; //for calculation bitmap offset
     }
     //skip xor/and mask
@@ -172 +172 @@
     pointerInfo.hbmPointer = hbmColor;
     hPointer = WinCreatePointerIndirect(HWND_DESKTOP, &pointerInfo);
+
     if(hPointer == NULL) {
         dprintf(("OSLibWinCreatePointer: WinCreatePointerIndirect failed!"));
@@ -186 +187 @@
 
     switch(type) {
-        case IDI_APPLICATION_W:
+    case IDI_APPLICATION_W:
         os2type = SPTR_PROGRAM;
         break;
@@ -214 +215 @@
 
     switch(type) {
-        case IDC_ARROW_W:
+    case IDC_ARROW_W:
         os2type = SPTR_ARROW;
         break;
-        case IDC_UPARROW_W:
+    case IDC_UPARROW_W:
         os2type = SPTR_ARROW;
         break;
-        case IDC_IBEAM_W:
+    case IDC_IBEAM_W:
         os2type = SPTR_TEXT;
         break;
-        case IDC_ICON_W:
+    case IDC_ICON_W:
         os2type = SPTR_PROGRAM;
         break;
-        case IDC_NO_W:
+    case IDC_NO_W:
         os2type = SPTR_ILLEGAL;
         break;
-        case IDC_CROSS_W:
+    case IDC_CROSS_W:
         os2type = SPTR_MOVE;
         break;
-        case IDC_SIZE_W:
+    case IDC_SIZE_W:
         os2type = SPTR_MOVE;
         break;
-        case IDC_SIZEALL_W:
+    case IDC_SIZEALL_W:
         os2type = SPTR_MOVE;
         break;
-        case IDC_SIZENESW_W:
+    case IDC_SIZENESW_W:
         os2type = SPTR_SIZENESW;
         break;
-        case IDC_SIZENS_W:
+    case IDC_SIZENS_W:
         os2type = SPTR_SIZENS;
         break;
-        case IDC_SIZENWSE_W:
+    case IDC_SIZENWSE_W:
         os2type = SPTR_SIZENWSE;
         break;
-        case IDC_SIZEWE_W:
+    case IDC_SIZEWE_W:
         os2type = SPTR_SIZEWE;
         break;
-        case IDC_WAIT_W:
+    case IDC_WAIT_W:
         os2type = SPTR_WAIT;
         break;
-        case IDC_APPSTARTING_W:
+    case IDC_APPSTARTING_W:
         os2type = SPTR_WAIT;
         break;
@@ -262 +263 @@
         return 0;
     }
-    return WinQuerySysPointer(HWND_DESKTOP, os2type, TRUE);
-}
-//******************************************************************************
-//******************************************************************************
+    //Note: Does not create a copy
+    return WinQuerySysPointer(HWND_DESKTOP, os2type, FALSE);
+}
+//******************************************************************************
+//******************************************************************************