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
574c0dcc
Commit
574c0dcc
authored
Feb 01, 2009
by
Mikołaj Zalewski
Committed by
Alexandre Julliard
Feb 02, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comctl32: toolbar: Unlike in listview, TB_SETEXTENDEDSTYLE takes the actual style, not a mask.
parent
5de172af
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
5 deletions
+16
-5
toolbar.c
dlls/comctl32/tests/toolbar.c
+12
-0
toolbar.c
dlls/comctl32/toolbar.c
+4
-5
No files found.
dlls/comctl32/tests/toolbar.c
View file @
574c0dcc
...
...
@@ -1030,6 +1030,7 @@ static void test_recalc(void)
HWND
hToolbar
;
TBBUTTONINFO
bi
;
CHAR
test
[]
=
"Test"
;
int
i
;
/* Like TB_ADDBUTTONS tested in test_sized, inserting a button without text
* results in a relayout, while adding one with text forces a recalc */
...
...
@@ -1049,6 +1050,17 @@ static void test_recalc(void)
SendMessage
(
hToolbar
,
TB_SETBUTTONINFO
,
1
,
(
LPARAM
)
&
bi
);
ok
(
!
did_recalc
(
hToolbar
),
"Unexpected recalc - setting a button text
\n
"
);
for
(
i
=
0
;
i
<
32
;
i
++
)
{
if
(
i
==
1
||
i
==
3
)
/* an undoc style and TBSTYLE_EX_MIXEDBUTTONS */
continue
;
prepare_recalc_test
(
&
hToolbar
);
expect
(
0
,
(
int
)
SendMessage
(
hToolbar
,
TB_GETEXTENDEDSTYLE
,
0
,
0
));
SendMessage
(
hToolbar
,
TB_SETEXTENDEDSTYLE
,
0
,
(
1
<<
i
));
SendMessage
(
hToolbar
,
TB_SETEXTENDEDSTYLE
,
0
,
0
);
expect
(
0
,
(
int
)
SendMessage
(
hToolbar
,
TB_GETEXTENDEDSTYLE
,
0
,
0
));
}
DestroyWindow
(
hToolbar
);
}
...
...
dlls/comctl32/toolbar.c
View file @
574c0dcc
...
...
@@ -4648,11 +4648,10 @@ static LRESULT
TOOLBAR_SetExtendedStyle
(
HWND
hwnd
,
WPARAM
wParam
,
LPARAM
lParam
)
{
TOOLBAR_INFO
*
infoPtr
=
TOOLBAR_GetInfoPtr
(
hwnd
);
DWORD
dw
Temp
;
DWORD
dw
OldStyle
;
dwTemp
=
infoPtr
->
dwExStyle
;
infoPtr
->
dwExStyle
&=
~
wParam
;
infoPtr
->
dwExStyle
|=
(
DWORD
)
lParam
;
dwOldStyle
=
infoPtr
->
dwExStyle
;
infoPtr
->
dwExStyle
=
(
DWORD
)
lParam
;
TRACE
(
"new style 0x%08x
\n
"
,
infoPtr
->
dwExStyle
);
...
...
@@ -4666,7 +4665,7 @@ TOOLBAR_SetExtendedStyle (HWND hwnd, WPARAM wParam, LPARAM lParam)
InvalidateRect
(
hwnd
,
NULL
,
TRUE
);
return
(
LRESULT
)
dw
Temp
;
return
(
LRESULT
)
dw
OldStyle
;
}
...
...
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