[STOBJECT] Mark hotplug, power and volume context menu default items

diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp
index 1d2a587..af7d698 100644 (file)
--- a/dll/shellext/stobject/hotplug.cpp
+++ b/dll/shellext/stobject/hotplug.cpp
@@ -219,6 +219,7 @@ static void _ShowContextMenuR(CSysTray * pSysTray)
     CString strMenu((LPWSTR)IDS_HOTPLUG_REMOVE_2);
     HMENU hPopup = CreatePopupMenu();
     AppendMenuW(hPopup, MF_STRING, IDS_HOTPLUG_REMOVE_2, strMenu);
+    SetMenuDefaultItem(hPopup, IDS_HOTPLUG_REMOVE_2, FALSE);
 
     SetForegroundWindow(pSysTray->GetHWnd());
     DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN;

diff --git a/dll/shellext/stobject/power.cpp b/dll/shellext/stobject/power.cpp
index 347fb01..6cb16fd 100644 (file)
--- a/dll/shellext/stobject/power.cpp
+++ b/dll/shellext/stobject/power.cpp
@@ -148,6 +148,7 @@ static void _ShowContextMenu(CSysTray * pSysTray)
     CString strOpen((LPCSTR)IDS_PWR_PROPERTIES);
     HMENU hPopup = CreatePopupMenu();
     AppendMenuW(hPopup, MF_STRING, IDS_PWR_PROPERTIES, strOpen);
+    SetMenuDefaultItem(hPopup, IDS_PWR_PROPERTIES, FALSE);
 
     SetForegroundWindow(pSysTray->GetHWnd());
     DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN;

diff --git a/dll/shellext/stobject/volume.cpp b/dll/shellext/stobject/volume.cpp
index c30df9c..dbc92ad 100644 (file)
--- a/dll/shellext/stobject/volume.cpp
+++ b/dll/shellext/stobject/volume.cpp
@@ -234,6 +234,7 @@ static void _ShowContextMenu(CSysTray * pSysTray)
     HMENU hPopup = CreatePopupMenu();
     AppendMenuW(hPopup, MF_STRING, IDS_VOL_OPEN, strOpen);
     AppendMenuW(hPopup, MF_STRING, IDS_VOL_ADJUST, strAdjust);
+    SetMenuDefaultItem(hPopup, IDS_VOL_OPEN, FALSE);
 
     DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN;
     POINT pt;