diff --git a/reactos/subsys/system/explorer/res/toolbar.bmp b/reactos/subsys/system/explorer/res/toolbar.bmp index 632b1ec6750..4eb42407264 100644 Binary files a/reactos/subsys/system/explorer/res/toolbar.bmp and b/reactos/subsys/system/explorer/res/toolbar.bmp differ diff --git a/reactos/subsys/system/explorer/shell/mainframe.cpp b/reactos/subsys/system/explorer/shell/mainframe.cpp index 6a88cedec4a..d8b0add60b5 100644 --- a/reactos/subsys/system/explorer/shell/mainframe.cpp +++ b/reactos/subsys/system/explorer/shell/mainframe.cpp @@ -60,6 +60,7 @@ MainFrame::MainFrame(HWND hwnd) {0, 0, 0, BTNS_SEP, {0, 0}, 0, 0}, {7, ID_BROWSE_BACK, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, {8, ID_BROWSE_FORWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, + {9, ID_BROWSE_UP, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, }; _htoolbar = CreateToolbarEx(hwnd, WS_CHILD|WS_VISIBLE, @@ -316,6 +317,10 @@ int MainFrame::Command(int id, int code) { CONTEXT("MainFrame::Command()"); + if (_shellBrowser.get()) + if (!_shellBrowser->Command(id, code)) + return 0; + switch(id) { case ID_FILE_EXIT: SendMessage(_hwnd, WM_CLOSE, 0, 0); diff --git a/reactos/subsys/system/explorer/shell/shellbrowser.cpp b/reactos/subsys/system/explorer/shell/shellbrowser.cpp index 50ab729ed3e..d3b1e958aaf 100644 --- a/reactos/subsys/system/explorer/shell/shellbrowser.cpp +++ b/reactos/subsys/system/explorer/shell/shellbrowser.cpp @@ -528,6 +528,25 @@ LRESULT ShellBrowserChild::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) return 0; } +int ShellBrowserChild::Command(int id, int code) +{ + switch(id) { + case ID_BROWSE_BACK: + break;//@todo + + case ID_BROWSE_FORWARD: + break;//@todo + + case ID_BROWSE_UP: + break;//@todo + + default: + return 1; + } + + return 0; +} + int ShellBrowserChild::Notify(int id, NMHDR* pnmh) { switch(pnmh->code) { diff --git a/reactos/subsys/system/explorer/shell/shellbrowser.h b/reactos/subsys/system/explorer/shell/shellbrowser.h index 5b4875bdd12..0dd5cd0d2d7 100644 --- a/reactos/subsys/system/explorer/shell/shellbrowser.h +++ b/reactos/subsys/system/explorer/shell/shellbrowser.h @@ -119,6 +119,7 @@ protected: public: LRESULT WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam); + int Command(int id, int code); int Notify(int id, NMHDR* pnmh); LRESULT Init(HWND hWndFrame);