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

Timestamp:

Feb 23, 2000, 6:05:19 PM (26 years ago)

Author:

cbratschi

Message:

export 55AA pattern for COMCTL32, edit EN_CHANGED fix

File:

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

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.35 2000-02-21 17:25:26 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.36 2000-02-23 17:05:16 cbratschi Exp $ */
 /*
  *      Edit control
@@ -291 +291 @@
 {
         EDIT_EM_ReplaceSel(hwnd, es, TRUE, "");
-        if (es->flags & EF_UPDATE) {
-                es->flags &= ~EF_UPDATE;
-                EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
+        if (es->flags & EF_UPDATE) {
+                es->flags &= ~EF_UPDATE;
+                EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
         }
 }
@@ -2883 +2883 @@
         //                es->undo_insert_count, es->undo_text);
 
-        if (es->flags & EF_UPDATE) {
-                es->flags &= ~EF_UPDATE;
-                EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
-        }
+        if (es->flags & EF_UPDATE) {
+                es->flags &= ~EF_UPDATE;
+                EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
+        }
 
         return TRUE;
@@ -2932 +2932 @@
                         {
                                 EDIT_EM_ReplaceSel(hwnd, es, TRUE, "\r\n");
-                                if (es->flags & EF_UPDATE) {
-                                        es->flags &= ~EF_UPDATE;
-                                        EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
+                                if (es->flags & EF_UPDATE) {
+                                        es->flags &= ~EF_UPDATE;
+                                        EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
                                 }
                         }
@@ -2943 +2943 @@
                 {
                         EDIT_EM_ReplaceSel(hwnd, es, TRUE, "\t");
-                        if (es->flags & EF_UPDATE) {
-                                es->flags &= ~EF_UPDATE;
-                                EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
-                        }
+                        if (es->flags & EF_UPDATE) {
+                                es->flags &= ~EF_UPDATE;
+                                EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
+                        }
                 }
                 break;
@@ -2962 +2962 @@
                 break;
 //CB: are these three keys documented or Linux style???
-        case 0x03: /* ^C */
-                SendMessageA(hwnd, WM_COPY, 0, 0);
-                break;
-        case 0x16: /* ^V */
-                SendMessageA(hwnd, WM_PASTE, 0, 0);
-                break;
-        case 0x18: /* ^X */
-                SendMessageA(hwnd, WM_CUT, 0, 0);
-                break;
+        case 0x03: /* ^C */
+                SendMessageA(hwnd, WM_COPY, 0, 0);
+                break;
+        case 0x16: /* ^V */
+                SendMessageA(hwnd, WM_PASTE, 0, 0);
+                break;
+        case 0x18: /* ^X */
+                SendMessageA(hwnd, WM_CUT, 0, 0);
+                break;
 
         default:
@@ -3126 +3126 @@
            es->selection_start = es->selection_end = 0;
            EDIT_EM_ScrollCaret(hwnd, es);
-           if (es->flags & EF_UPDATE) {
-                es->flags &= ~EF_UPDATE;
-                EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
-           }
+           if (es->flags & EF_UPDATE) {
+                es->flags &= ~EF_UPDATE;
+                EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
+           }
        }
        return 0;
@@ -3143 +3143 @@
 {
         if (!es) /* Protect against multiple destroy messages */
-            return;
+            return;
 
         if (es->hloc) {
@@ -3359 +3359 @@
         HWND hLBox;
 
-        /********************************************************************
-         * This if statement used to check to see if the parent of the
-         * edit control was a 'combobox' by comparing the ATOM of the parent
-         * to a table of internal window control ATOMs.  However, this check
-         * would fail if the parent was a superclassed combobox (Although
-         * having the same basic functionality of a combobox, it has a
-         * different name and ATOM, thus defeating this check.)
-         *
-         * The safe way to determine if the parent is a combobox is to send it
-         * a message only a combo box would understand.  I send it a message
-         * CB_GETCOUNT, if I get 0 then the parent is not a combobox -
+        /********************************************************************
+         * This if statement used to check to see if the parent of the
+         * edit control was a 'combobox' by comparing the ATOM of the parent
+         * to a table of internal window control ATOMs.  However, this check
+         * would fail if the parent was a superclassed combobox (Although
+         * having the same basic functionality of a combobox, it has a
+         * different name and ATOM, thus defeating this check.)
+         *
+         * The safe way to determine if the parent is a combobox is to send it
+         * a message only a combo box would understand.  I send it a message
+         * CB_GETCOUNT, if I get 0 then the parent is not a combobox -
          * return FALSE.  If I get > 0, then the parent IS a combobox
          * (or sub/super classed derrivative thereof)
-         ********************************************************************/
+         ********************************************************************/
 #if 0 //CB: our code
         if (GetClassWord(GetParent(hwnd),GCW_ATOM) ==  GlobalFindAtomA(COMBOBOXCLASSNAME) &&
                         (hLBox = COMBO_GetLBWindow(GetParent(hwnd))))
-#else   
+#else
         if (
              ((SendMessageA(GetParent(hwnd), CB_GETCOUNT, 0, 0)) > 0) &&
@@ -3839 +3839 @@
   if (es->flags & EF_UPDATE)
   {
-    es->flags &= ~EF_UPDATE;
+    //CB: don't reset flag or EN_CHANGE is lost!
+    //es->flags &= ~EF_UPDATE;
     EDIT_NOTIFY_PARENT(hwnd,EN_UPDATE);
   }
@@ -3904 +3905 @@
                 GlobalUnlock(hsrc);
 
-                if (es->flags & EF_UPDATE) {
-                        es->flags &= ~EF_UPDATE;
-                        EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
-                }
+                if (es->flags & EF_UPDATE) {
+                        es->flags &= ~EF_UPDATE;
+                        EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
+                }
         }
         CloseClipboard();