Changeset 5482 for trunk/src/user32/winicon.cpp

Timestamp:

Apr 5, 2001, 11:31:28 AM (24 years ago)

Author:

sandervl

Message:

rewrote ShowCursor

File:

• trunk/src/user32/winicon.cpp (modified) (3 diffs)

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.20 2001-03-27 16:17:52 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.21 2001-04-05 09:31:28 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -54 +54 @@
 #include "oslibres.h"
 #include "oslibwin.h"
+#include "dc.h"
 
 #define DBG_LOCALLOG    DBG_winicon
@@ -410 +411 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API ShowCursor( BOOL bShow)
+INT OPEN32API __ShowCursor(BOOL bShow);
+
+inline INT _ShowCursor (BOOL bShow)
+{
+ INT yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = __ShowCursor(bShow);
+    SetFS(sel);
+
+    return yyrc;
+}
+//******************************************************************************
+static int cursorshowcnt = 0;
+//******************************************************************************
+void RestoreCursor()
+{
+    dprintf2(("USER32: RestoreCursor %d", cursorshowcnt));
+    while(cursorshowcnt != 0)
+    {
+        if(cursorshowcnt > 0 )
+        {
+            ShowCursor(FALSE);
+        }
+        else
+        {
+            ShowCursor(TRUE);
+        }
+    }
+}
+//******************************************************************************
+//******************************************************************************
+int WIN32API ShowCursor(BOOL bShow)
 {
     dprintf2(("USER32: ShowCursor %d", bShow));
-    return O32_ShowCursor(bShow);
-}
-//******************************************************************************
-//******************************************************************************
+    cursorshowcnt = cursorshowcnt + ((bShow) ? 1 : -1);
+    return _ShowCursor(bShow);
+}
 /***********************************************************************
  *           CreateCursorIconIndirect