Changeset 3108 for trunk/src/user32/combo.cpp

Timestamp:

Mar 14, 2000, 4:01:00 PM (25 years ago)

Author:

sandervl

Message:

combobox bug fixes (rp7 infinite loop)

File:

• trunk/src/user32/combo.cpp (modified) (4 diffs)

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.26 2000-02-16 14:34:06 sandervl Exp $ */
+/* $Id: combo.cpp,v 1.27 2000-03-14 15:00:58 sandervl Exp $ */
 /*
  * Combo controls
@@ -1385 +1385 @@
 
            case (EN_UPDATE >> 8):
-                CB_NOTIFY( lphc, CBN_EDITUPDATE );
+                //SvL: Don't send updates either. (Realplayer 7 infinite loops)
+               /*
+                * In some circumstances (when the selection of the combobox
+                * is changed for example) we don't wans the EN_CHANGE notification
+                * to be forwarded to the parent of the combobox. This code
+                * checks a flag that is set in these occasions and ignores the
+                * notification.
+                */
+                if (lphc->wState & CBF_NOEDITNOTIFY)
+                {
+                  lphc->wState &= ~CBF_NOEDITNOTIFY;
+                }
+                else
+                {
+                        CB_NOTIFY( lphc, CBN_EDITUPDATE );
+                }
                 break;
 
@@ -2105 +2120 @@
   if( lphc->wState & CBF_SELCHANGE )
   {
+    //SvL: Clear the flag here; doing it after calling CBUpdateEdit causes
+    //     an infinite loop in RealPlayer 7
+    lphc->wState &= ~CBF_SELCHANGE;
+
     /* no LBN_SELCHANGE in this case, update manually */
     if( lphc->wState & CBF_EDIT )
@@ -2110 +2129 @@
     else
         InvalidateRect(CB_HWND(lphc), &lphc->textRect, TRUE);
-
-    lphc->wState &= ~CBF_SELCHANGE;
   }