Changeset 3873 for trunk/src/user32/caret.cpp

Timestamp:

Jul 20, 2000, 8:08:13 PM (25 years ago)

Author:

sandervl

Message:

SetWindowPlacement, CreateCaret & Set/GetCaretPos fixes

File:

• trunk/src/user32/caret.cpp (modified) (9 diffs)

trunk/src/user32/caret.cpp

@@ -1 @@
-/* $Id: caret.cpp,v 1.12 2000-02-16 14:34:04 sandervl Exp $ */
+/* $Id: caret.cpp,v 1.13 2000-07-20 18:08:12 sandervl Exp $ */
 
 /*
@@ -13 +13 @@
 #include <os2sel.h>
 #include <stdlib.h>
-#include "win32type.h"
+#include <win32type.h>
+#include <win32api.h>
 #include <winconst.h>
 #include <wprocess.h>
@@ -62 +63 @@
        wnd->SetFakeOpen32();
 
-       rc = _O32_CreateCaret (wnd->getOS2WindowHandle(), hBmp, width, height);
+       rc = O32_CreateCaret (wnd->getOS2WindowHandle(), hBmp, width, height);
        if (rc)
        {
@@ -98 +99 @@
    BOOL rc;
 
-   dprintf(("USER32:  SetCaretBlinkTime"));
+   dprintf(("USER32: SetCaretBlinkTime %d ms", mSecs));
 
    rc = _SetCaretBlinkTime (mSecs);
@@ -123 +124 @@
    POINTL     caretPos = { x, y };
 
-   dprintf(("USER32:  SetCaretPos"));
+   dprintf(("USER32: SetCaretPos (%d,%d)", x, y));
 
    rc = WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo);
@@ -138 +139 @@
            if (!pHps)
            {
-              _O32_SetLastError (ERROR_INTERNAL_ERROR);
+              SetLastError(ERROR_INTERNAL_ERROR);
               return FALSE;
            }
@@ -151 +152 @@
         else
         {
-           long height = wnd->getClientHeight();
+           long height = wnd->getWindowHeight();
            caretPos.y = height - caretPos.y - 1;
            xNew = caretPos.x;
@@ -166 +167 @@
    if (rc == FALSE)
    {
-      _O32_SetLastError (ERROR_INVALID_PARAMETER);
+      SetLastError (ERROR_INVALID_PARAMETER);
       result = FALSE;
    }
@@ -199 +200 @@
             cursorInfo.x = caretPos.x;
             cursorInfo.y = caretPos.y;
-         } else {
-            long height  = wnd->getClientHeight();
+         } 
+         else {
+            long height  = wnd->getWindowHeight();
             caretPos.y  += cursorInfo.cy;
             cursorInfo.y = height - caretPos.y - 1;