Changeset 2204 for trunk/src/user32/edit.cpp

Timestamp:

Dec 26, 1999, 6:30:20 PM (26 years ago)

Author:

cbratschi

Message:

non-client fixes, DefWndProc enhancements, several other bugs fixed

File:

• trunk/src/user32/edit.cpp (modified) (7 diffs)

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.24 1999-12-21 17:03:43 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.25 1999-12-26 17:30:14 cbratschi Exp $ */
 /*
  *      Edit control
@@ -176 +176 @@
 static void     EDIT_MoveWordForward(HWND hwnd, EDITSTATE *es, BOOL extend);
 static void     EDIT_PaintLine(HWND hwnd, EDITSTATE *es, HDC hdc, INT line, BOOL rev);
-static INT      EDIT_PaintText(HWND hwnd, EDITSTATE *es, HDC hdc, INT x, INT y, INT line, INT col, INT count, BOOL rev);
+static VOID     EDIT_PaintText(HWND hwnd, EDITSTATE *es, HDC hdc, INT x, INT y, INT line, INT col, INT count, BOOL rev);
 static void     EDIT_SetCaretPos(HWND hwnd, EDITSTATE *es, INT pos, BOOL after_wrap);
 static void     EDIT_SetRectNP(HWND hwnd, EDITSTATE *es, LPRECT lprc);
@@ -1633 +1633 @@
  *
  */
-static INT EDIT_PaintText(HWND hwnd, EDITSTATE *es, HDC dc, INT x, INT y, INT line, INT col, INT count, BOOL rev)
+static VOID EDIT_PaintText(HWND hwnd, EDITSTATE *es, HDC dc, INT x, INT y, INT line, INT col, INT count, BOOL rev)
 {
         COLORREF BkColor;
         COLORREF TextColor;
-        INT ret;
         INT li;
 
         if (!count)
-                return 0;
+                return;
         BkColor = GetBkColor(dc);
         TextColor = GetTextColor(dc);
@@ -1652 +1651 @@
         if (es->style & ES_MULTILINE)
         {
-                ret = (INT)LOWORD(TabbedTextOutA(dc, x, y, es->text + li + col, count,
-                                        es->tabs_count, es->tabs, es->format_rect.left - es->x_offset));
+                TabbedTextOutA(dc, x, y, es->text + li + col, count,
+                               es->tabs_count, es->tabs, es->format_rect.left - es->x_offset);
         } else
         {
           LPSTR text = EDIT_GetPasswordPointer_SL(hwnd, es);
           POINT pt;
-          UINT oldAlign = GetTextAlign(dc);
-
-          MoveToEx(dc,x,y,NULL);
-          SetTextAlign(dc,(oldAlign & ~TA_NOUPDATECP) | TA_UPDATECP);
 
           TextOutA(dc,x,y,text+li+col,count);
-          GetCurrentPositionEx(dc,&pt);
-          SetTextAlign(dc,oldAlign);
-          ret = pt.x-x;
           if (es->style & ES_PASSWORD)
             HeapFree(es->heap, 0, text);
@@ -1675 +1667 @@
                 SetTextColor(dc, TextColor);
         }
-        return ret;
 }
 
@@ -1715 +1706 @@
 {
         CopyRect(&es->format_rect, rc);
-        if (es->style & WS_BORDER) {
-                INT bw = GetSystemMetrics(SM_CXBORDER) + 1;
-                es->format_rect.left += bw;
-                es->format_rect.top += bw;
-                es->format_rect.right -= bw;
-                es->format_rect.bottom -= bw;
+        if (es->style & WS_BORDER)
+        {
+          INT bw = GetSystemMetrics(SM_CXBORDER)+1,bh = GetSystemMetrics(SM_CYBORDER)+1;
+
+          es->format_rect.left += bw;
+          es->format_rect.top += bh;
+          es->format_rect.right -= bw;
+          es->format_rect.bottom -= bh;
         }
         es->format_rect.left += es->left_margin;
@@ -2745 +2738 @@
         ORDER_UINT(start, old_start);
         ORDER_UINT(old_start, old_end);
+        if (start == old_start && end == old_end) return;
         if (end != old_start)
         {