From b01de1ffd4aeb40badd51292e992bd42fdd3244e Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Sun, 3 Apr 2005 11:38:08 +0000 Subject: [PATCH] show logoff dialog in lean explorer svn path=/trunk/; revision=14470 --- reactos/subsys/system/explorer/explorer_intres.rc | 2 +- reactos/subsys/system/explorer/taskbar/startmenu.cpp | 6 +++--- reactos/subsys/system/explorer/taskbar/startmenu.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc index c52477216bc..e52dea5750c 100644 --- a/reactos/subsys/system/explorer/explorer_intres.rc +++ b/reactos/subsys/system/explorer/explorer_intres.rc @@ -1926,7 +1926,7 @@ BEGIN IDS_TITLE "Explorador do Reactos" IDS_START "Iniciar" IDS_LOGOFF "Terminar sessão..." - IDS_TERMINATE "Terminar" + IDS_TERMINATE "Terminar ROS Explorador" IDS_SHUTDOWN "Desligar..." IDS_LAUNCH "Executar..." IDS_START_HELP "Ajuda" diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp index b860076f02f..95d91435eeb 100644 --- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp +++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp @@ -1834,7 +1834,7 @@ int StartMenuHandler::Command(int id, int code) case IDC_LOGOFF: CloseStartMenu(id); - ShowLogoffDialog(g_Globals._hwndDesktopBar, EWX_LOGOFF); + ShowLogoffDialog(g_Globals._hwndDesktopBar); break; case IDC_TERMINATE: @@ -1979,7 +1979,7 @@ void StartMenuHandler::ShowLaunchDialog(HWND hwndOwner) } } -void StartMenuHandler::ShowLogoffDialog(HWND hwndOwner, UINT flags) +void StartMenuHandler::ShowLogoffDialog(HWND hwndOwner) { static DynamicFct LogoffWindowsDialog(TEXT("SHELL32"), 54); // static DynamicFct RestartDialog(TEXT("SHELL32"), 59); @@ -1988,7 +1988,7 @@ void StartMenuHandler::ShowLogoffDialog(HWND hwndOwner, UINT flags) (*LogoffWindowsDialog)(0); /* The RestartDialog function prompts about some system setting change. This is not what we want to display here. else if (RestartDialog) - return (*RestartDialog)(hwndOwner, (LPWSTR)L"You selected .\n\n", flags) == 1; ///@todo ANSI string conversion if needed + return (*RestartDialog)(hwndOwner, (LPWSTR)L"You selected .\n\n", EWX_LOGOFF) == 1; ///@todo ANSI string conversion if needed */ else MessageBox(hwndOwner, TEXT("LogoffWindowsDialog() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.h b/reactos/subsys/system/explorer/taskbar/startmenu.h index 67b2b6310f6..1840bc9f7f3 100644 --- a/reactos/subsys/system/explorer/taskbar/startmenu.h +++ b/reactos/subsys/system/explorer/taskbar/startmenu.h @@ -349,7 +349,7 @@ protected: int Command(int id, int code); static void ShowLaunchDialog(HWND hwndOwner); - static void ShowLogoffDialog(HWND hwndOwner, UINT flags); + static void ShowLogoffDialog(HWND hwndOwner); static void ShowSearchDialog(); static void ShowSearchComputer(); };