Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-11 13:48:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RSHELL]

Browse source 
* Use a better way to toggle using TBSTYLE_EX_VERTICAL instead of TBSTATE_WRAP.
CORE-7586

svn path=/branches/shell-experiments/; revision=62511
This commit is contained in:
David Quintana 2014-03-16 01:21:54 +00:00
parent 75f35dbf96
commit ea3e04f67f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
base/shell/rshell/CMenuToolbars.cpp
View file

@ -35,7 +35,7 @@ HRESULT WINAPI SHGetImageList(
); );
// FIXME: Enable if/when wine comctl supports this flag properly // FIXME: Enable if/when wine comctl supports this flag properly
//#define TBSTYLE_EX_VERTICAL 4 #define USE_TBSTYLE_EX_VERTICAL 0
#define TIMERID_HOTTRACK 1 #define TIMERID_HOTTRACK 1
#define SUBCLASS_ID_MENUBAND 1 #define SUBCLASS_ID_MENUBAND 1
@ -287,7 +287,7 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags)
{ {
tbStyles |= CCS_VERT; tbStyles |= CCS_VERT;
#ifdef TBSTYLE_EX_VERTICAL #if USE_TBSTYLE_EX_VERTICAL
// FIXME: Use when it works in ros (?) // FIXME: Use when it works in ros (?)
tbExStyles |= TBSTYLE_EX_VERTICAL | WS_EX_TOOLWINDOW; tbExStyles |= TBSTYLE_EX_VERTICAL | WS_EX_TOOLWINDOW;
#endif #endif
@ -747,7 +747,7 @@ HRESULT CMenuToolbarBase::AddButton(DWORD commandId, LPCWSTR caption, BOOL hasSu
TBBUTTON tbb = { 0 }; TBBUTTON tbb = { 0 };
tbb.fsState = TBSTATE_ENABLED; tbb.fsState = TBSTATE_ENABLED;
#ifndef TBSTYLE_EX_VERTICAL #if !USE_TBSTYLE_EX_VERTICAL
if (!last && (m_toolbarFlags & SMINIT_VERTICAL)) if (!last && (m_toolbarFlags & SMINIT_VERTICAL))
tbb.fsState |= TBSTATE_WRAP; tbb.fsState |= TBSTATE_WRAP;
#endif #endif
@ -776,7 +776,7 @@ HRESULT CMenuToolbarBase::AddSeparator(BOOL last)
TBBUTTON tbb = { 0 }; TBBUTTON tbb = { 0 };
tbb.fsState = TBSTATE_ENABLED; tbb.fsState = TBSTATE_ENABLED;
#ifndef TBSTYLE_EX_VERTICAL #if !USE_TBSTYLE_EX_VERTICAL
if (!last && (m_toolbarFlags & SMINIT_VERTICAL)) if (!last && (m_toolbarFlags & SMINIT_VERTICAL))
tbb.fsState |= TBSTATE_WRAP; tbb.fsState |= TBSTATE_WRAP;
#endif #endif