Changeset 5725 for trunk/src/user32/win32dlg.cpp

Timestamp:

May 17, 2001, 11:50:30 AM (24 years ago)

Author:

sandervl

Message:

destroy menu window after it has been used (instead of just hiding it)

File:

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

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.62 2001-05-11 08:39:44 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.63 2001-05-17 09:50:30 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -253 +253 @@
 
         HWND hwndPreInitFocus = GetFocus();
-        if(SendInternalMessageA(WM_INITDIALOG, (WPARAM)hwndFocus, param)) {
-            SetFocus(hwndFocus);
+        if(SendInternalMessageA(WM_INITDIALOG, (WPARAM)hwndFocus, param)) 
+        {
+            /* check where the focus is again,
+             * some controls status might have changed in WM_INITDIALOG */
+            hwndFocus = GetNextDlgTabItem( getWindowHandle(), 0, FALSE );
+            if(GetFocus() != hwndFocus) {
+                SetFocus(hwndFocus);
+            }
         }
         else
@@ -260 +266 @@
             /* If the dlgproc has returned FALSE (indicating handling of keyboard focus)
                but the focus has not changed, set the focus where we expect it. */
-                if ( (getStyle() & WS_VISIBLE) && ( GetFocus() == hwndPreInitFocus ) )
-                    SetFocus( hwndFocus );
+            if ( (getStyle() & WS_VISIBLE) && ( GetFocus() == hwndPreInitFocus ) )
+                SetFocus( hwndFocus );
         }