Owen Rudge : shell32: Ensure status bar in control panel is reset when menu closed. Also reset to blank when item deselected.
Alexandre Julliard
julliard at winehq.org
Tue Jul 29 07:16:11 CDT 2008
Module: wine
Branch: master
Commit: 6d598150596318d7514ae2266f6509a61e3d4848
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d598150596318d7514ae2266f6509a61e3d4848
Author: Owen Rudge <owen at owenrudge.net>
Date: Mon Jul 28 16:15:46 2008 +0100
shell32: Ensure status bar in control panel is reset when menu closed. Also reset to blank when item deselected.
---
dlls/shell32/control.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c
index a339dbc..aa5abfe 100644
--- a/dlls/shell32/control.c
+++ b/dlls/shell32/control.c
@@ -511,6 +511,8 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg,
if (item)
SetWindowTextW(panel->hWndStatusBar,
item->applet->info[item->id].szInfo);
+ else
+ SetWindowTextW(panel->hWndStatusBar, NULL);
return 0;
}
@@ -533,6 +535,18 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg,
if (item)
SetWindowTextW(panel->hWndStatusBar, item->applet->info[item->id].szInfo);
}
+ else if ((HIWORD(lParam1) == 0xFFFF) && (lParam2 == 0))
+ {
+ /* reset status bar description to that of the selected icon */
+ CPlItem *item = Control_GetCPlItem_From_ListView(panel);
+
+ if (item)
+ SetWindowTextW(panel->hWndStatusBar, item->applet->info[item->id].szInfo);
+ else
+ SetWindowTextW(panel->hWndStatusBar, NULL);
+
+ return 0;
+ }
else
SetWindowTextW(panel->hWndStatusBar, NULL);
More information about the wine-cvs
mailing list