Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
37e0a1a5
Commit
37e0a1a5
authored
Feb 22, 2014
by
Christoph von Wittich
Committed by
Alexandre Julliard
Feb 24, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comctl32: Rename TBSTYLE_EX_UNDOC1 to TBSTYLE_EX_VERTICAL.
parent
ad7e889c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
toolbar.c
dlls/comctl32/toolbar.c
+4
-4
commctrl.h
include/commctrl.h
+2
-1
No files found.
dlls/comctl32/toolbar.c
View file @
37e0a1a5
...
@@ -219,7 +219,7 @@ typedef enum
...
@@ -219,7 +219,7 @@ typedef enum
/* Used to find undocumented extended styles */
/* Used to find undocumented extended styles */
#define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \
#define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \
TBSTYLE_EX_
UNDOC1
| \
TBSTYLE_EX_
VERTICAL
| \
TBSTYLE_EX_MIXEDBUTTONS | \
TBSTYLE_EX_MIXEDBUTTONS | \
TBSTYLE_EX_DOUBLEBUFFER | \
TBSTYLE_EX_DOUBLEBUFFER | \
TBSTYLE_EX_HIDECLIPPEDBUTTONS)
TBSTYLE_EX_HIDECLIPPEDBUTTONS)
...
@@ -1271,7 +1271,7 @@ TOOLBAR_CalcStrings (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize)
...
@@ -1271,7 +1271,7 @@ TOOLBAR_CalcStrings (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize)
* the toolbar wrapping on its own, it can use the TBSTYLE_WRAPABLE
* the toolbar wrapping on its own, it can use the TBSTYLE_WRAPABLE
* flag, and set the TBSTATE_WRAP flags manually on the appropriate items.
* flag, and set the TBSTATE_WRAP flags manually on the appropriate items.
*
*
* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_
UNDOC1
can be used also to allow
* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_
VERTICAL
can be used also to allow
* vertical toolbar lists.
* vertical toolbar lists.
*/
*/
...
@@ -1287,7 +1287,7 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr)
...
@@ -1287,7 +1287,7 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr)
/* no layout is necessary. Applications may use this style */
/* no layout is necessary. Applications may use this style */
/* to perform their own layout on the toolbar. */
/* to perform their own layout on the toolbar. */
if
(
!
(
infoPtr
->
dwStyle
&
TBSTYLE_WRAPABLE
)
&&
if
(
!
(
infoPtr
->
dwStyle
&
TBSTYLE_WRAPABLE
)
&&
!
(
infoPtr
->
dwExStyle
&
TBSTYLE_EX_
UNDOC1
)
)
return
;
!
(
infoPtr
->
dwExStyle
&
TBSTYLE_EX_
VERTICAL
)
)
return
;
btnPtr
=
infoPtr
->
buttons
;
btnPtr
=
infoPtr
->
buttons
;
x
=
infoPtr
->
nIndent
;
x
=
infoPtr
->
nIndent
;
...
@@ -3037,7 +3037,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr)
...
@@ -3037,7 +3037,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr)
cy
=
TOP_BORDER
+
infoPtr
->
nRows
*
infoPtr
->
nButtonHeight
+
BOTTOM_BORDER
;
cy
=
TOP_BORDER
+
infoPtr
->
nRows
*
infoPtr
->
nButtonHeight
+
BOTTOM_BORDER
;
cx
=
parent_rect
.
right
-
parent_rect
.
left
;
cx
=
parent_rect
.
right
-
parent_rect
.
left
;
if
((
infoPtr
->
dwStyle
&
TBSTYLE_WRAPABLE
)
||
(
infoPtr
->
dwExStyle
&
TBSTYLE_EX_
UNDOC1
))
if
((
infoPtr
->
dwStyle
&
TBSTYLE_WRAPABLE
)
||
(
infoPtr
->
dwExStyle
&
TBSTYLE_EX_
VERTICAL
))
{
{
TOOLBAR_LayoutToolbar
(
infoPtr
);
TOOLBAR_LayoutToolbar
(
infoPtr
);
InvalidateRect
(
infoPtr
->
hwndSelf
,
NULL
,
TRUE
);
InvalidateRect
(
infoPtr
->
hwndSelf
,
NULL
,
TRUE
);
...
...
include/commctrl.h
View file @
37e0a1a5
...
@@ -1089,7 +1089,8 @@ static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r',
...
@@ -1089,7 +1089,8 @@ static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r',
#define TBSTYLE_REGISTERDROP 0x4000
#define TBSTYLE_REGISTERDROP 0x4000
#define TBSTYLE_TRANSPARENT 0x8000
#define TBSTYLE_TRANSPARENT 0x8000
#define TBSTYLE_EX_DRAWDDARROWS 0x00000001
#define TBSTYLE_EX_DRAWDDARROWS 0x00000001
#define TBSTYLE_EX_UNDOC1 0x00000004
/* similar to TBSTYLE_WRAPABLE */
#define TBSTYLE_EX_MULTICOLUMN 0x00000002
#define TBSTYLE_EX_VERTICAL 0x00000004
#define TBSTYLE_EX_MIXEDBUTTONS 0x00000008
#define TBSTYLE_EX_MIXEDBUTTONS 0x00000008
#define TBSTYLE_EX_HIDECLIPPEDBUTTONS 0x00000010
/* don't show partially obscured buttons */
#define TBSTYLE_EX_HIDECLIPPEDBUTTONS 0x00000010
/* don't show partially obscured buttons */
#define TBSTYLE_EX_DOUBLEBUFFER 0x00000080
/* Double Buffer the toolbar */
#define TBSTYLE_EX_DOUBLEBUFFER 0x00000080
/* Double Buffer the toolbar */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment