Changeset 5725 for trunk/src/user32

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)

Location:

trunk/src/user32

Files:

• menu.cpp (modified) (3 diffs)
• win32dlg.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.29 2001-01-01 11:48:10 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.30 2001-05-17 09:50:29 sandervl Exp $*/
 /*
  * Menu functions
@@ -2083 +2083 @@
         if (submenu->hWnd == MENU_GetTopPopupWnd() )
         {
-            ShowWindow( submenu->hWnd, SW_HIDE );
+            DestroyWindow( submenu->hWnd );
+            submenu->hWnd = 0;
+//            ShowWindow( submenu->hWnd, SW_HIDE );
             uSubPWndLevel = 0;
         }
@@ -3036 +3038 @@
         if (menu && menu->wFlags & MF_POPUP)
         {
-            ShowWindow( menu->hWnd, SW_HIDE );
-            uSubPWndLevel = 0;
+                DestroyWindow( menu->hWnd );
+                menu->hWnd = 0;
+//            ShowWindow( menu->hWnd, SW_HIDE );
+                uSubPWndLevel = 0;
         }
         MENU_SelectItem( mt.hOwnerWnd, mt.hTopMenu, NO_SELECTED_ITEM, FALSE, 0 );

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 );
         }
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.257 2001-05-16 07:42:26 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.258 2001-05-17 09:50:30 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -3094 +3094 @@
 
     dprintf(("SetActiveWindow %x", getWindowHandle()));
+    if(GetActiveWindow() == getWindowHandle()) {
+        dprintf(("Window already active"));
+        return getWindowHandle();
+    }
     if (HOOK_IsHooked( WH_CBT ))
     {