Changeset 1320 for trunk/src

Timestamp:

Oct 16, 1999, 1:05:38 PM (26 years ago)

Author:

sandervl

Message:

YD's button fix + windlg costmetic changes

Location:

trunk/src/user32

Files:

• button.cpp (modified) (2 diffs)
• win32dlg.cpp (modified) (2 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.10 1999-10-16 10:28:30 sandervl Exp $ */
+/* $Id: button.cpp,v 1.11 1999-10-16 11:05:37 sandervl Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -946 +946 @@
     parent = GetParent(hwnd);
     /* assure that starting control is not disabled or invisible */
-    start = sibling = GetNextDlgGroupItem( parent, hwnd, TRUE );
+//    start = sibling = GetNextDlgGroupItem( parent, hwnd, TRUE );
+    //@YD: bugfix       
+    start = sibling = GetNextDlgGroupItem( parent, hwnd, FALSE );
     do
     {

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.14 1999-10-14 09:22:41 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.15 1999-10-16 11:05:38 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -1069 +1069 @@
             for(pWndTemp = nextchild;pWndTemp;pWndTemp = (Win32BaseWindow *)pWndTemp->getNextChild())
             {
-                if (pWndTemp->getStyle() & WS_GROUP) nextchild = pWndTemp;
-                if (pWndTemp == child) break;
+                if (pWndTemp->getStyle() & WS_GROUP)
+                    nextchild = pWndTemp;
+
+                if (pWndTemp == child)
+                    break;
             }
 
         }
-        if (nextchild == child) break;
-
-            if ((nextchild->getStyle() & WS_VISIBLE) && !(nextchild->getStyle() & WS_DISABLED))
-            {
-                lastchild = nextchild;
-            if (!fPrevious) break;
+        if (nextchild == child)
+            break;
+
+        if ((nextchild->getStyle() & WS_VISIBLE) && !(nextchild->getStyle() & WS_DISABLED))
+        {
+            lastchild = nextchild;
+
+            if (!fPrevious)
+                break;
         }