diff --git a/reactos/subsys/system/explorer/shell/mainframe.cpp b/reactos/subsys/system/explorer/shell/mainframe.cpp index e420cbee336..29b6cae3d3e 100644 --- a/reactos/subsys/system/explorer/shell/mainframe.cpp +++ b/reactos/subsys/system/explorer/shell/mainframe.cpp @@ -59,7 +59,7 @@ MainFrame::MainFrame(HWND hwnd) #endif TBBUTTON toolbarBtns[] = { - {0, 0, 0, TBSTYLE_SEP, {0, 0}, 0, 0}, + {0, 0, 0, BTNS_SEP, {0, 0}, 0, 0}, {0, ID_WINDOW_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, {1, ID_WINDOW_CASCADE, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, {2, ID_WINDOW_TILE_HORZ, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, @@ -75,7 +75,7 @@ MainFrame::MainFrame(HWND hwnd) CheckMenuItem(_menu_info._hMenuOptions, ID_VIEW_TOOL_BAR, MF_BYCOMMAND|MF_CHECKED); - TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, {0, 0}, 0, 0}; + TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; int btn = 1; PTSTR p; diff --git a/reactos/subsys/system/explorer/utility/utility.h b/reactos/subsys/system/explorer/utility/utility.h index d233c66e17d..c9d23b68a18 100644 --- a/reactos/subsys/system/explorer/utility/utility.h +++ b/reactos/subsys/system/explorer/utility/utility.h @@ -46,7 +46,8 @@ #ifndef BTNS_BUTTON -#define BTNS_BUTTON TBSTYLE_BUTTON //@@ -> wingw headers +#define BTNS_BUTTON TBSTYLE_BUTTON //TODO: should be in mingw headers +#define BTNS_SEP TBSTYLE_SEP #endif diff --git a/reactos/subsys/system/explorer/winefile/winefile.c b/reactos/subsys/system/explorer/winefile/winefile.c index c18d7c5dc2f..95a7b470088 100644 --- a/reactos/subsys/system/explorer/winefile/winefile.c +++ b/reactos/subsys/system/explorer/winefile/winefile.c @@ -3538,7 +3538,7 @@ void explorer_show_frame(HWND hwndParent, int cmdshow) { - TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, {0, 0}, 0, 0}; + TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; int btn = 1; PTSTR p; @@ -3599,7 +3599,7 @@ void explorer_show_frame(HWND hwndParent, int cmdshow) { TBBUTTON toolbarBtns[] = { - {0, 0, 0, TBSTYLE_SEP, {0, 0}, 0, 0}, + {0, 0, 0, BTNS_SEP, {0, 0}, 0, 0}, {0, ID_WINDOW_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, {1, ID_WINDOW_CASCADE, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, {2, ID_WINDOW_TILE_HORZ, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, diff --git a/reactos/subsys/system/explorer/winefile/winefile.h b/reactos/subsys/system/explorer/winefile/winefile.h index 99919859d5c..0fa34f88ccb 100644 --- a/reactos/subsys/system/explorer/winefile/winefile.h +++ b/reactos/subsys/system/explorer/winefile/winefile.h @@ -62,6 +62,7 @@ #ifndef BTNS_BUTTON #define BTNS_BUTTON TBSTYLE_BUTTON +#define BTNS_SEP TBSTYLE_SEP #endif