Commit f795f692 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Fix the 'never disappearing' popup menu - anchor it to our (hidden)
  global window, which allows TrackPopupMenu to lose focus when any other
  window is selected.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90236 13f79535-47bb-0310-9956-ffa450edef68
parent 0febe670

support/win32/ApacheMonitor.c

+8 −4
Original line number Diff line number Diff line
@@ -326,9 +326,11 @@ void ShowTryPopupMenu(HWND hWnd) 
        appendMenuItem(hMenu, 0, "", FALSE, TRUE);

        appendMenuItem(hMenu, IDM_EXIT,  g_lpMsg[IDS_MSG_MNUEXIT-IDS_MSG_FIRST], FALSE, TRUE);



        GetCursorPos(&pt);

        if (!SetForegroundWindow(hWnd))

            SetForegroundWindow(NULL);

        TrackPopupMenu(hMenu, TPM_LEFTALIGN|TPM_RIGHTBUTTON, pt.x, pt.y, 0, hWnd, NULL);

        GetCursorPos(&pt);

        TrackPopupMenu(hMenu, TPM_LEFTALIGN|TPM_RIGHTBUTTON, 

                       pt.x, pt.y, 0, hWnd, NULL);

        DestroyMenu(hMenu);

    }

}
@@ -350,9 +352,11 @@ void ShowTryServicesMenu(HWND hWnd) 
        }

        if (i)

        {

            GetCursorPos(&pt);

            if (!SetForegroundWindow(hWnd))

                SetForegroundWindow(NULL);

            TrackPopupMenu(hMenu, TPM_LEFTALIGN|TPM_RIGHTBUTTON, pt.x, pt.y, 0, hWnd, NULL);

            GetCursorPos(&pt);

            TrackPopupMenu(hMenu, TPM_LEFTALIGN|TPM_RIGHTBUTTON, 

                           pt.x, pt.y, 0, hWnd, NULL);

            DestroyMenu(hMenu);

        }

    }