From fcf0872f58810edae8e169bb3372c5aae952ef96 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Wed, 25 Feb 2004 18:58:26 +0000 Subject: [PATCH] fixed bug #224 svn path=/trunk/; revision=8371 --- reactos/subsys/system/explorer/doxy-footer.html | 2 +- reactos/subsys/system/explorer/explorer_intres.rc | 12 ++++++++++++ reactos/subsys/system/explorer/shell/mainframe.cpp | 13 ++++++------- reactos/subsys/system/explorer/utility/window.h | 1 - 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/reactos/subsys/system/explorer/doxy-footer.html b/reactos/subsys/system/explorer/doxy-footer.html index 3c9901bd1b9..551400d4800 100644 --- a/reactos/subsys/system/explorer/doxy-footer.html +++ b/reactos/subsys/system/explorer/doxy-footer.html @@ -3,7 +3,7 @@
ROS Explorer Source Code Documentation -
generated on 23.02.2004 by +
generated on 24.02.2004 by doxygen
diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc index 60ba1e3ca48..e307e513c07 100644 --- a/reactos/subsys/system/explorer/explorer_intres.rc +++ b/reactos/subsys/system/explorer/explorer_intres.rc @@ -35,7 +35,10 @@ BEGIN POPUP "&Prezentare" BEGIN MENUITEM "&Bara cu instrumente", ID_VIEW_TOOL_BAR + MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "&Bara de stare", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN END POPUP "&Fereastrã" BEGIN @@ -308,7 +311,10 @@ BEGIN POPUP "&Ansicht" BEGIN MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR + MENUITEM "Lauf&werkleiste", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "&Status Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Vollbild\tCtrl+Shift+S", ID_VIEW_FULLSCREEN END POPUP "&Fenster" BEGIN @@ -534,7 +540,10 @@ BEGIN POPUP "&View" BEGIN MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR + MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "&Status Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN END POPUP "&Window" BEGIN @@ -879,7 +888,10 @@ BEGIN POPUP "&Affichage" BEGIN MENUITEM "Barre d'&outils", ID_VIEW_TOOL_BAR + MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "Barre d'&état", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN END POPUP "&Window" BEGIN diff --git a/reactos/subsys/system/explorer/shell/mainframe.cpp b/reactos/subsys/system/explorer/shell/mainframe.cpp index 86f404984ac..36278bc2e6f 100644 --- a/reactos/subsys/system/explorer/shell/mainframe.cpp +++ b/reactos/subsys/system/explorer/shell/mainframe.cpp @@ -46,8 +46,7 @@ MainFrame::MainFrame(HWND hwnd) _hMenuFrame = GetMenu(hwnd); _hMenuWindow = GetSubMenu(_hMenuFrame, GetMenuItemCount(_hMenuFrame)-2); - _menu_info._hMenuView = GetSubMenu(_hMenuFrame, 3); - _menu_info._hMenuOptions = GetSubMenu(_hMenuFrame, 4); + _menu_info._hMenuView = GetSubMenu(_hMenuFrame, 1); _hAccel = LoadAccelerators(g_Globals._hInstance, MAKEINTRESOURCE(IDA_EXPLORER)); @@ -87,7 +86,7 @@ MainFrame::MainFrame(HWND hwnd) IDW_TOOLBAR, 2, g_Globals._hInstance, IDB_TOOLBAR, toolbarBtns, sizeof(toolbarBtns)/sizeof(TBBUTTON), 16, 15, 16, 15, sizeof(TBBUTTON)); - CheckMenuItem(_menu_info._hMenuOptions, ID_VIEW_TOOL_BAR, MF_BYCOMMAND|MF_CHECKED); + CheckMenuItem(_menu_info._hMenuView, ID_VIEW_TOOL_BAR, MF_BYCOMMAND|MF_CHECKED); TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; @@ -97,7 +96,7 @@ MainFrame::MainFrame(HWND hwnd) _hdrivebar = CreateToolbarEx(hwnd, WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, IDW_DRIVEBAR, 2, g_Globals._hInstance, IDB_DRIVEBAR, &drivebarBtn, 1, 16, 13, 16, 13, sizeof(TBBUTTON)); - CheckMenuItem(_menu_info._hMenuOptions, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_CHECKED); + CheckMenuItem(_menu_info._hMenuView, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_CHECKED); GetLogicalDriveStrings(BUFFER_LEN, _drives); @@ -208,7 +207,7 @@ MainFrame::MainFrame(HWND hwnd) hwnd, (HMENU)IDW_STATUSBAR, g_Globals._hInstance, 0);*/ _hstatusbar = CreateStatusWindow(WS_CHILD|WS_VISIBLE, 0, hwnd, IDW_STATUSBAR); - CheckMenuItem(_menu_info._hMenuOptions, ID_VIEW_STATUSBAR, MF_BYCOMMAND|MF_CHECKED); + CheckMenuItem(_menu_info._hMenuView, ID_VIEW_STATUSBAR, MF_BYCOMMAND|MF_CHECKED); } @@ -545,7 +544,7 @@ int MainFrame::Command(int id, int code) break; case ID_VIEW_FULLSCREEN: - CheckMenuItem(_menu_info._hMenuOptions, id, toggle_fullscreen()?MF_CHECKED:0); + CheckMenuItem(_menu_info._hMenuView, id, toggle_fullscreen()?MF_CHECKED:0); break; #ifdef __WINE__ @@ -813,7 +812,7 @@ void MainFrame::toggle_child(HWND hwnd, UINT cmd, HWND hchild) { BOOL vis = IsWindowVisible(hchild); - CheckMenuItem(_menu_info._hMenuOptions, cmd, vis?MF_BYCOMMAND:MF_BYCOMMAND|MF_CHECKED); + CheckMenuItem(_menu_info._hMenuView, cmd, vis?MF_BYCOMMAND:MF_BYCOMMAND|MF_CHECKED); ShowWindow(hchild, vis?SW_HIDE:SW_SHOW); diff --git a/reactos/subsys/system/explorer/utility/window.h b/reactos/subsys/system/explorer/utility/window.h index c5493be0513..cad07b198b7 100644 --- a/reactos/subsys/system/explorer/utility/window.h +++ b/reactos/subsys/system/explorer/utility/window.h @@ -269,7 +269,6 @@ struct IconWindowClass : public WindowClass struct MenuInfo { HMENU _hMenuView; - HMENU _hMenuOptions; }; #define PM_FRM_GET_MENUINFO (WM_APP+0x02)