Author: dquintana Date: Sun Mar 16 01:21:54 2014 New Revision: 62511
URL: http://svn.reactos.org/svn/reactos?rev=62511&view=rev Log: [RSHELL] * Use a better way to toggle using TBSTYLE_EX_VERTICAL instead of TBSTATE_WRAP. CORE-7586
Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp
Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rsh... ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Sun Mar 16 01:21:54 2014 @@ -35,7 +35,7 @@ );
// 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 SUBCLASS_ID_MENUBAND 1 @@ -287,7 +287,7 @@ { tbStyles |= CCS_VERT;
-#ifdef TBSTYLE_EX_VERTICAL +#if USE_TBSTYLE_EX_VERTICAL // FIXME: Use when it works in ros (?) tbExStyles |= TBSTYLE_EX_VERTICAL | WS_EX_TOOLWINDOW; #endif @@ -747,7 +747,7 @@ TBBUTTON tbb = { 0 };
tbb.fsState = TBSTATE_ENABLED; -#ifndef TBSTYLE_EX_VERTICAL +#if !USE_TBSTYLE_EX_VERTICAL if (!last && (m_toolbarFlags & SMINIT_VERTICAL)) tbb.fsState |= TBSTATE_WRAP; #endif @@ -776,7 +776,7 @@ TBBUTTON tbb = { 0 };
tbb.fsState = TBSTATE_ENABLED; -#ifndef TBSTYLE_EX_VERTICAL +#if !USE_TBSTYLE_EX_VERTICAL if (!last && (m_toolbarFlags & SMINIT_VERTICAL)) tbb.fsState |= TBSTATE_WRAP; #endif