Changeset 7095 for trunk/src/user32/windlg.cpp

Timestamp:

Oct 17, 2001, 4:30:10 PM (24 years ago)

Author:

sandervl

Message:

SetFocus fix

File:

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

trunk/src/user32/windlg.cpp

@@ -1 @@
-/* $Id: windlg.cpp,v 1.26 2001-10-13 00:49:28 sandervl Exp $ */
+/* $Id: windlg.cpp,v 1.27 2001-10-17 14:30:10 sandervl Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -552 +552 @@
         /* No ctrl specified -> start from the beginning */
         if (!(hwndCtrl = GetWindow( hwndDlg, GW_CHILD ))) return 0;
-#ifdef __WIN32OS2__
-        if (fPrevious) hwndCtrl = GetWindow( hwndCtrl, GW_HWNDLASTCHILD );
-#else
         if (fPrevious) hwndCtrl = GetWindow( hwndCtrl, GW_HWNDLAST );
-#endif
     }
 
     retvalue = hwndCtrl;
-#ifdef __WIN32OS2__
-    hwnd = GetWindow( hwndCtrl, GW_HWNDNEXTCHILD );
-#else
     hwnd = GetWindow( hwndCtrl, GW_HWNDNEXT );
-#endif
     while (1)
     {
@@ -572 +564 @@
             HWND tmp;
 
+            hwnd = GetWindow( hwndDlg, GW_CHILD );
 #ifdef __WIN32OS2__
-            hwnd = GetWindow( hwndDlg, GW_HWNDFIRSTCHILD );
             if(!hwnd) break;
-
-            for (tmp = hwnd; tmp; tmp = GetWindow( tmp, GW_HWNDNEXTCHILD ) )
-#else
-            hwnd = GetWindow( hwndDlg, GW_CHILD );
+#endif
             for (tmp = hwnd; tmp; tmp = GetWindow( tmp, GW_HWNDNEXT ) )
-#endif
             {
                 if (GetWindowLongW( tmp, GWL_STYLE ) & WS_GROUP) hwnd = tmp;
@@ -592 +580 @@
             if (!fPrevious) break;
         }
-#ifdef __WIN32OS2__
-        hwnd = GetWindow( hwnd, GW_HWNDNEXTCHILD );
-#else
         hwnd = GetWindow( hwnd, GW_HWNDNEXT );
-#endif
     }
     return retvalue;