Changeset 4976 for trunk/src

Timestamp:

Jan 20, 2001, 12:03:45 AM (25 years ago)

Author:

sandervl

Message:

Get/SetCaretPos fixes

Location:

trunk/src/user32

Files:

• caret.cpp (modified) (5 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/caret.cpp

@@ -1 @@
-/* $Id: caret.cpp,v 1.15 2000-12-29 18:39:58 sandervl Exp $ */
+/* $Id: caret.cpp,v 1.16 2001-01-19 23:03:45 sandervl Exp $ */
 
 /*
@@ -158 +158 @@
         {
            long height = wnd->getWindowHeight();
-           caretPos.y = height - caretPos.y - 1;
-           xNew = caretPos.x;
+           caretPos.y = height - (caretPos.y + wnd->getClientRectPtr()->top) - 1;
+           xNew = caretPos.x + wnd->getClientRectPtr()->left;
            yNew = caretPos.y - cursorInfo.cy;
         }
@@ -183 +183 @@
    CURSORINFO cursorInfo;
 
-   dprintf(("USER32:  GetCaretPos"));
+   dprintf(("USER32: GetCaretPos"));
 
    if (WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo))
@@ -195 +195 @@
          if (wnd && wnd->isOwnDC())
             hps = wnd->getOwnDC();
-         else
-         {
-           return FALSE;
+
+         if(wnd == NULL) {
+            dprintf(("ERROR: GetCaretPos: wnd == NULL!"));
+            return FALSE;
          }
 
@@ -207 +208 @@
          } 
          else {
-            long height  = wnd->getWindowHeight();
-            caretPos.y  += cursorInfo.cy;
-            cursorInfo.y = height - caretPos.y - 1;
+            long height   = wnd->getWindowHeight();
+            caretPos.y   += cursorInfo.cy;
+            cursorInfo.y  = height - caretPos.y - wnd->getClientRectPtr()->top - 1;
+            cursorInfo.x -= wnd->getClientRectPtr()->left;
          }
       }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.229 2001-01-14 17:15:47 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.230 2001-01-19 23:03:45 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1905 +1905 @@
                     point.x = pt.x;
                     point.y = pt.y;
-            MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), &point, 1);
+                    MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), &point, 1);
                     NotifyParent(Msg,wParam,MAKELPARAM(point.x,point.y));
                 }