Changeset 6011 for trunk/src/user32/button.cpp

Timestamp:

Jun 14, 2001, 2:56:51 PM (24 years ago)

Author:

sandervl

Message:

button setcheck bugfix

File:

• trunk/src/user32/button.cpp (modified) (3 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.39 2001-05-03 18:13:10 sandervl Exp $ */
+/* $Id: button.cpp,v 1.40 2001-06-14 12:56:51 sandervl Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -552 +552 @@
 
   if (wParam > maxCheckState[style]) wParam = maxCheckState[style];
+#ifndef __WIN32OS2__
+  //Must clear WS_TABSTOP of control that is already disabled or else 
+  //multiple control can have this style ((auto)radiobutton) and 
+  //GetNextDlgTabItem will return the wrong one
+  //Happens in Opera preferences dialog (multimedia) where all autoradio
+  //buttons have the WS_TABSTOP style.
   if ((infoPtr->state & 3) != wParam)
   {
+#endif
     if ((style == BS_RADIOBUTTON) || (style == BS_AUTORADIOBUTTON))
     {
@@ -565 +572 @@
       if (oldStyle != dwStyle) SetWindowLongA(hwnd,GWL_STYLE,dwStyle);
     }
+#ifdef __WIN32OS2__
+    if ((infoPtr->state & 3) != wParam)
+    {
+#endif
     infoPtr->state = (infoPtr->state & ~3) | wParam;
     PAINT_BUTTON(hwnd,style,ODA_SELECT);