1f43da01c0
comctl32/toolbar: No need to use GetSysColor directly.
2009-05-19 15:41:37 +02:00
97ecd468c4
comctl32/toolbar: Use already cached control window style.
2009-05-19 15:41:30 +02:00
b97600699a
comctl32/toolbar: Remove superfluous forward declarations.
2009-05-19 15:41:24 +02:00
9a0f600574
comctl32/toolbar: Retrieve control data once at WinProc.
2009-05-19 15:41:09 +02:00
585c3abb6b
comctl32/toolbar: When a null lParam is passed to TB_GETBUTTONTEXTA, we should not return -1 but the string size.
2009-05-07 15:15:07 +02:00
fcc9b57c7a
comctl32/toolbar: Skip iString field for separators.
2009-05-07 15:14:42 +02:00
6a01f71949
comctl32/toolbar: Fix trace info for TOOLBAR_InternalInsertButtonsT.
2009-04-22 17:00:51 +02:00
3e235cc363
comctl32: TOOLBAR_SetImageList should recalculate toolbar only if it is necessary.
2009-04-22 12:56:19 +02:00
74baffb254
comctl32: Fix typo in TOOLBAR_SetButtonSize code.
2009-04-21 14:25:15 +02:00
c037b333c8
comctl32: Fix regression caused by 2d751ee56a.
...
Fixing regression produced by "comctl32: Correct handling of toolbar
separators size". As it came out, some applications DO rely on iBitmap
value, but it can be received not with TB_GETBUTTONINFO, but with
TB_GETBITMAP.
2009-04-20 14:13:54 +02:00
2d751ee56a
comctl32: Correct handling of toolbar separators size.
2009-03-31 12:40:59 +02:00
88b64d486d
comctl32: CCS_VERT flips toolbar separators orientation.
2009-03-31 12:40:51 +02:00
9d9880bd34
comctl32: Simplify eight TOOLBAR_ function invocations.
2009-02-16 16:01:37 +01:00
da6d7920de
comctl32: Remove superfluous pointer casts.
2009-02-13 13:00:25 +01:00
aa7a0b85b0
comctl32: toolbar: Only changing TBSTYLE_EX_MIXEDBUTTONS should cause a recalc.
2009-02-02 15:48:26 +01:00
574c0dcc32
comctl32: toolbar: Unlike in listview, TB_SETEXTENDEDSTYLE takes the actual style, not a mask.
2009-02-02 15:48:26 +01:00
5de172af78
comctl32: toolbar: TB_SETBUTTONINFO should do a relayout instead of a recalc.
2009-02-02 15:48:26 +01:00
ada088e62d
comctl32: toolbar: Use different function for dumping of TBUTTON_INFO and TBBUTTON.
2009-02-02 15:48:26 +01:00
ca9f7d3140
comctl32: toolbar: Move common TB_ADDBUTTONS and TB_INSERTBUTTONS code into a helper function, makes TB_INSERTBUTTON with a text perform a recalc (with testcase).
2009-02-02 15:48:26 +01:00
d31828b500
comctl32: toolbar: Make sure all TBUTTON_INFO fields are initialized when a button is added in the middle.
2009-01-28 12:09:51 +01:00
4475045fe1
comctl32: Fix missing void in empty parameter list.
2009-01-26 15:07:30 +01:00
7fcc9629f8
comctl32: Don't generate a fixme message for the TBSTYLE_EX_DOUBLEBUFFER extended style.
2009-01-26 14:30:41 +01:00
bcfc2027fb
comctl32: Simplify ten functions by removing unused parameters.
2009-01-23 12:57:02 +01:00
e985ca06cf
comctl32: Simplify twelve functions by removing unused parameters.
2009-01-19 14:50:39 +01:00
76b805dad4
comctl32: Add names for now documented toolbar messages.
2009-01-02 14:27:43 +01:00
6bdcdc4232
comctl32: Simplify fifteen functions by removing unused parameters.
2009-01-02 12:39:31 +01:00
66019452f4
comctl32: Remove dead stores (llvm/clang).
2008-11-21 11:28:51 +01:00
7f25cd993c
comctl32: toolbar: Use a cx field for buttons in TOOLBAR_WrapToolbar.
2008-11-06 11:56:03 +01:00
65e9a6e02e
comctl32: toolbar: Improve text layout in TBSTYLE_LIST toolbars.
2008-11-06 11:55:56 +01:00
1232b08449
comctl32: toolbar: Calculate a correct size for empty buttons with the BTNS_AUTOSIZE style.
2008-11-06 11:55:51 +01:00
62e17fa8c4
comctl32: Do not cast zero.
2008-11-04 11:26:22 +01:00
d1791f8108
comctl32: Remove superfluous casts as HANDLE to other handle types.
2008-10-28 12:34:05 +01:00
b723e6f6b6
comctl32: Remove the superfluous casting of the LPVOID returned by Alloc().
2008-10-24 14:24:59 +02:00
a289bab122
comctl32: toolbar: TB_SETBITMAPSIZE should not change a coordinate when passed -1 (with testcase).
2008-07-23 11:20:58 +02:00
60a1e20ba8
comctl32: Don't print ERRs for reflected messages.
2008-07-22 13:25:08 +02:00
3c5308b804
comctl32: Indentation fix.
2008-05-23 11:58:18 +02:00
e1a0715b4a
comctl32: Fix an off-by-one error in toolbar TOOLBAR_SetHotItem.
2008-04-24 22:12:32 +02:00
c531e2abdb
Spelling fixes.
2008-04-23 12:31:07 +02:00
161d3322d6
comctl32: Remove unused variables.
2008-04-16 14:08:04 +02:00
369d414d59
comctl32: Remove unused variables.
2008-04-14 12:42:36 +02:00
7f5c97693e
comctl32: Fix TB_GETSTRING return values.
2008-03-12 12:00:14 +01:00
375f60b07a
comctl32: Add tests for TB_GETSTRING, fix NULL pointer access.
2008-03-12 12:00:08 +01:00
8d555e825b
comctl32: Assign to structs instead of using memcpy.
2008-02-12 23:00:03 +01:00
3980401231
comctl32: Use wine_dbgstr_rect() in traces.
2008-02-07 11:59:53 +01:00
c2a7914d1c
comctl32: Spelling fixes.
2008-01-24 11:43:02 +01:00
863ffb719b
comctl32: Remove unneeded casts.
2008-01-02 12:38:41 +01:00
1bf787d521
comctl32: Remove unneeded casts.
2007-12-03 13:10:21 +01:00
35ff6d6750
comctl32: Fix broken detection of non-empty string.
2007-10-29 14:32:16 +01:00
77c376e0f8
comctl32: Pass command id of button in wParam.
2007-10-29 14:32:10 +01:00
29ddd49130
comctl32: Remove redundant NULL check before free (found by Smatch).
2007-10-22 12:36:08 +02:00
881c204c02
comctl32: toolbar: Implemented SetRows.
2007-08-28 12:26:13 +02:00
31be5005c6
comctl32: toolbar: Test and fix invalid indexes passed in TB_ISBUTTON*.
2007-07-20 11:34:34 +02:00
5507a073c5
comctl32: toolbar: We should send TBN_GETDISPINFOW even for ANSI controls (with testcase).
2007-07-11 11:59:33 +02:00
e66523e19b
comctl32: toolbar: The iImage in TBN_GETDISPINFO should be initialized to -1.
2007-07-11 11:53:33 +02:00
18366472c7
comctl32: Fix a compilation warning in 64-bit mode.
2007-06-01 12:42:06 +02:00
3c9e7a7f33
wine: Switch to using 'long' for INT_PTR type for 64-bit compatibility.
2007-05-25 20:37:56 +02:00
7b8241b1ee
comctl32: toolbar: TB_SETIMAGELIST should try to preserve button width.
2007-05-16 11:55:38 +02:00
3d7a65355e
comctl32: toolbar: Don't execute TB_GETBUTTONINFO if cbSize is invalid.
2007-04-24 10:19:04 +02:00
10b1d00113
comctl32: toolbar: Merge TOOLBAR_GetButtonInfoA and TB_GetButtonInfoW.
2007-04-24 10:18:33 +02:00
7657913873
comctl32: Allow destruction of toolbar in BN_CLICKED handler.
2007-04-06 12:31:08 +02:00
51ee497174
comctl32: Constify some variables.
2007-04-03 11:21:51 +02:00
7bf7cdd1a9
comctl32: toolbar: TB_HIDEBUTTON and TB_MOVEBUTTON shouldn't force a recalc.
2007-03-28 12:05:15 +02:00
307f39c0d5
comctl32: toolbar: We shouldn't try to resize standard bitmaps.
2007-03-21 11:59:31 +01:00
e3b7c3045a
comctl32: toolbar: Test standard buttons size.
2007-03-21 11:59:21 +01:00
d4a67c4382
comctl32: toolbar: The default button size is 16x16.
2007-03-21 11:59:11 +01:00
74ab88ca97
comctl32: Replace inline static with static inline.
2007-03-17 20:03:19 +01:00
22ecd7aa67
comctl32: Remove redundant NULL checks before Free() (found by Smatch).
2007-03-08 11:58:04 +01:00
dadc4248cf
comctl32: toolbar: Copy bitmaps with CopyImage so that it works also for DIBs (based on a patch by Oleg Krylov).
2007-02-07 11:03:09 +01:00
292cb4d2ac
comctl32: toolbar: Fix the TB_SETBITMAPSIZE for width or height zero (with testcase).
2007-01-16 16:54:25 +01:00
e6b1bd5f30
comctl32: toolbar: Recalc the toolbar after a TB_SETIMAGELIST.
2007-01-16 11:17:39 +01:00
f23ab81738
comctl32: Downgrade an ERR to a WARN.
2006-11-09 11:44:42 +01:00
0559afda80
comctl32: toolbar: Use the width of the current button instead of nButtonWidth to position the icon.
2006-11-02 12:31:18 +01:00
420f7cb076
comctl32: toolbar: The SetButtonSize should not allow too small buttons.
2006-11-02 12:31:06 +01:00
3bfcacc54c
comctl32: toolbar: The top margin should be computed and saved in CalcToolbar.
2006-11-02 12:30:53 +01:00
a8a0a65515
comctl32: toolbar: Add a LayoutToolbar that works like CalcToolbar but doesn't overwrite the button sizes.
2006-11-02 12:30:34 +01:00
f7f1479a08
comctl32: toolbar: Fix buttons heights.
2006-11-02 12:30:17 +01:00
9ec280c258
comctl32: toolbar: The string should be included in the height of a button-less toolbar only if there is a string in the pool.
2006-11-02 12:29:50 +01:00
d57a61f831
comctl32: toolbar: Add support for WM_SETFONT.
2006-11-02 12:29:32 +01:00
32caf30f9c
comctl32: Create tooltip windows with WS_POPUP style.
2006-10-25 20:21:34 +02:00
7cca856315
comctl32: Properly handle negative coordinates for mouse events.
2006-10-25 17:41:48 +02:00
39c4bbe56a
comctl32: toolbar: Fix the tests and handling of TB_SETHOTITEM on a disabled button.
2006-10-19 14:00:55 +02:00
2d6b9cafc6
comctl32: toolbar: Create tooltip on TB_GETTOOLTIPS message if not yet created.
2006-10-19 13:47:08 +02:00
76b162067f
comctl32: toolbar: Test and improve TB_SETHOTITEM.
2006-10-14 20:43:03 +02:00
010f31f413
comctl32: toolbar: Use nHotItem not nOldHit for the hot item in MouseLeave.
2006-10-14 20:42:36 +02:00
d929cec671
comctl32: toolbar: Don't try to redraw buttons outside of the clipping rect.
2006-10-14 20:42:21 +02:00
992310e4be
comctl32: toolbar: Change the dwData from DWORD to DWORD_PTR.
2006-10-14 20:41:48 +02:00
1c16d83379
comctl32: Win64 printf format warning fixes.
2006-10-14 20:17:06 +02:00
e998f9a498
comctl32: toolbar: Store dwBaseCustDraw and dwItemCDFlag in local variables.
2006-10-12 12:56:23 +02:00
79433e1bda
comctl32: toolbar: Merge TOOLBAR_InsertButtonA and TOOLBAR_InsertButtonW.
2006-10-12 12:56:07 +02:00
c95aa8228a
comctl32: toolbar: Passing a string pointer in TB_INSERTBUTTON shouldn't change the strings table (with test case).
2006-10-12 12:55:56 +02:00
4cf682b8c4
comctl32: toolbar: Remove dwItemCustDraw from TOOLBAR_INFO and store it as a local variable.
2006-10-12 12:55:40 +02:00
e0e2d7482c
comctl32: toolbar: Don't send NM_CUSTOMDRAW for separators.
2006-10-12 12:55:28 +02:00
241956101e
comctl32: toolbar: Fix the TB_ADDSTRING from resources for a NUL delimiter.
2006-10-09 20:53:15 +02:00
869c3bb74b
comctl32: toolbar: Merge AddButtonsA and AddButtonsW into AddButtonsT.
2006-10-09 20:52:48 +02:00
81050ccaff
comctl32: toolbar: Create the tooltip control during WM_MOUSEMOVE so that the NM_TOOLTIPSCREATE is not sent too early.
2006-10-09 20:52:28 +02:00
7b899eabe9
comctl32: toolbar: Move add/remove/setrect tooltip code to separate functions.
2006-10-09 20:52:18 +02:00
c7d034219e
comctl32: toolbar: Small fix in TOOLBAR_StyleChanged.
2006-09-29 14:42:20 +02:00
764c5b3b35
comctl32: toolbar: Set correcly hwndTrack in TrackMouseEvent call.
2006-09-29 14:42:08 +02:00
5db5744c5b
comctl32: toolbar: Test and fix TB_ADDSTRING from resource.
2006-09-27 20:21:00 +02:00
8cbca5dcfd
comctl32: toolbar: If wParam in TB_ADDBUTTON is large, enlarge the
...
bitmap before ImageList_AddMasked rather then call
ImageList_SetImagesCount after.
2006-09-26 11:38:35 +02:00
c77890d4f3
comctl32: toolbar: Resize the imagelist icons after a TB_SETBITMAPSIZE.
2006-09-26 11:37:47 +02:00
2fa45673f8
comctl32: toolbar: Fix the return code of TB_ADDBITMAP.
2006-09-21 17:42:44 +02:00
12d3235edc
comctl32: toolbar: Simplify the TOOLBAR_AddButton.
2006-09-21 17:42:34 +02:00
9e390091db
comctl32: toolbar: Fix IDB_STD_VIEW_* icons count (with testcase).
2006-09-21 17:41:36 +02:00
d457b37d82
comctl32: toolbar: Use correctly wParam in TB_ADDBITMAP.
2006-09-21 17:41:20 +02:00
5facde470e
comctl32: toolbar: Don't leak the intoPtr->bitmaps during resizing and destruction.
2006-09-20 11:21:57 +02:00
cc90540c9b
comctl32: Cast-qual warnings fix.
2006-09-07 10:16:34 +02:00
21b94d4cf4
comctl32: Correctly map toolbar bitmap mask color in case of non-default color scheme.
2006-08-18 21:17:34 +02:00
3e68a1f1ff
comctl32: toolbar: Use HOT imagelist for buttons in CHECKED state.
2006-08-17 11:19:47 +02:00
360a3f9142
Update the address of the Free Software Foundation.
2006-05-23 14:11:13 +02:00
d2f59fe455
comctl32: Fix an unsigned comparison to zero.
2006-04-20 15:37:48 +02:00
e9310da57b
Handle WM_PRINTCLIENT.
...
Don't use SelectClipRgn in WM_PRINTCLIENT.
2005-11-08 12:52:35 +00:00
364c3aa449
Separators with group style set don't separate toolbar radio groups
...
anymore (which broke tool selection in Front Panel Designer).
2005-10-21 15:45:11 +00:00
2c6ab0dba5
- Add support for navigating a toolbar with the arrow keys.
...
- Fix WrapToolbar in the case of no parent window.
- Use the newly added NMTBINITCUSTOMIZE for sending the
TBN_INITCUSTOMIZE so that it is safe on 64-bit platforms.
2005-09-14 19:16:03 +00:00
bd7ec9aca5
The last argument to MultiByteToWideChar is wide character count and
...
not the buffer size in bytes. Fixed all places where it was wrong.
2005-09-12 22:07:53 +00:00
9e57091ffa
Fix warnings in 64bit.
2005-08-30 10:07:17 +00:00
dc21c5e45a
Set default size for toolbar bitmap if not specified.
2005-08-29 09:39:04 +00:00
464f562a3a
Add theming for toolbar control.
2005-08-12 11:17:14 +00:00
3e03bc1d73
- Call SetBkMode with the correct value from the NMTBCUSTOMDRAW
...
structure.
- Don't fill the NMTBCUSTOMDRAW structure in again for
CDDS_POSTPAINT.
- Remove redundant bBtnTransprnt value.
2005-07-22 19:57:44 +00:00
87dacfffc2
- Height is now calculated based on the number of rows, not on the
...
bounding rect.
- Only call CalcToolbar in AutoSize if it has TBSTYLE_WRAPABLE or
TBSTYLE_EX_UNDOC1 set.
- Remove a bad test in SetButtonWidth that fixes a regression from the
above change in IE.
- Remove unnecessary nHeight data.
- Remove duplicated code in Size by calling AutoSize.
- Remove unnecessary bAutoSize value because SetWindowPos doesn't
generate WM_SIZE when there is nothing to do on both Windows and
Wine.
2005-07-22 19:55:54 +00:00
05f2506c06
TBSTATE_INDETERMINATE only takes effect if the button is enabled,
...
otherwise it should just appear like any other disabled button.
2005-07-22 19:54:17 +00:00
481d189508
Native autosizes on inserting/adding buttons, so we should too.
2005-07-22 19:52:05 +00:00
8b086842c3
The IsValidImageList test is not needed because if it isn't a valid
...
image list we will have set the bitmap width and height to 1 and it
does the wrong thing when no buttons are present.
2005-07-22 19:48:07 +00:00
2e0a42ec2c
The calculated button height should include the text height when no
...
buttons are present.
2005-07-22 18:28:46 +00:00
cd6fd67dcb
When adding an image copy the full previous buffer.
...
Implement replacing an icon with one from a resource.
2005-07-15 09:57:21 +00:00
389f9d55d9
- Document how the native lays out the internal components of
...
buttons.
- Fix control to follow these rules.
- Don't redraw disabled buttons.
- Padding is never less that GetSystemMetrics(SM_{CX,CY}EDGE).
- Change default iListGap value to 4 to match native.
2005-06-25 17:55:40 +00:00
f5c9da6860
Assorted spelling fixes.
2005-05-06 15:44:31 +00:00
a3b4e20503
Fix TB_GETBUTTONSIZE to return the correct width/height for no
...
buttons.
2005-04-15 14:09:05 +00:00
8df71a6cfa
Use {Alloc,ReAlloc,Free}() instead of Heap{Alloc,ReAlloc,Free}().
2005-03-25 20:49:00 +00:00
ecc850c460
Fix a memory leak in toolbar. Avoid casts.
2005-03-25 10:27:00 +00:00
e912c6a931
Complete unicodification of the toolbar common control.
...
Move a header comment for consistency with the other controls.
Very small alignment fixes.
2005-03-23 10:24:06 +00:00
e8e42e4614
When a toolbar doesn't have the TBSTYLE_FLAT style redrawing the
...
buttons when moving the mouse is not necessary.
2005-01-28 17:19:29 +00:00
da8b3dd7f2
Assorted spelling fixes.
2005-01-26 21:09:04 +00:00
aee4f25ed6
Properly allow removing toolbar bitmaps by changing it into 0.
2005-01-24 18:59:13 +00:00
cf1d00bb08
Removed excessive statement (break after return or goto, not useful
...
break, not needed vars...)
2005-01-09 16:42:53 +00:00
5ad7d858e0
Do not check for non NULL pointer before HeapFree'ing it. It's
...
redundant.
2004-12-23 17:06:43 +00:00
d7dd3e37c8
Store the new style before redrawing and repositioning the control.
2004-11-30 17:28:10 +00:00
b98b7dd65d
- Set cache bitmap dimensions correctly when a 0x0 image list is used.
...
- Optimize WM_STYLECHANGED handler to only redraw when a CCS_* style
is changed, like native.
2004-11-10 01:30:47 +00:00
a9b1aa28b3
- bNtfUnicode is a dup' of bUnicode so remove it and fix the few
...
places where it was used.
- Remove a load of useless NULL infoPtr checks.
- Hardcode the default padding like native instead of using a wacky formula.
- Replace some tabs with spaces and remove NMHDR casts.
2004-11-08 22:17:02 +00:00
75314f474f
Implement TBN_RESTORE notification.
2004-11-06 03:45:38 +00:00
99a6afcd6c
Do not retrieve infoPtr twice in ToolbarWindowProc entry.
2004-11-01 21:07:43 +00:00
e0f1444d4e
- Don't fill in any more information than native does for notifications.
...
- Store hit code in a signed integer so that we can see whether it is
less than zero.
2004-10-25 21:45:14 +00:00
c0a142ccee
Don't add extra OFFSET_X/Y to the calculation of rcBitmap.top/left,
...
just use GetSystemMetrics.
2004-10-21 20:58:43 +00:00
18f0bf732d
- Draw with ILD_TRANSPARENT instead of ILD_NORMAL to draw bitmaps from
...
the native shell image list properly (reported by Thorsten Kani).
- Rewrite TOOLBAR_NotifyFormat to avoid side-effects.
2004-10-21 19:52:16 +00:00
a16223e302
- TBN_DELETINGBUTTON sends the command ID, not the index.
...
- Fill in tbButton structure for TBN_DELETINGBUTTON notification.
- Document TBN_QUERY* sending indices.
2004-10-18 19:39:22 +00:00
b6153a1165
Add note about unimplemented TB_SAVERESTORE message.
2004-09-23 22:51:14 +00:00
56b9d3c739
- Fix some TRACEs
...
- More A->W conversions missed by previous patch.
- Fix off-by-one error in validating drag-n-drop from available
buttons list box to actual buttons list box.
- Unicode flag should be based on the notification window.
2004-09-20 19:10:05 +00:00
defcfc85db
Use Unicode window messages.
2004-09-16 19:06:12 +00:00
d087c578b6
- Make customization list boxes into drag list boxes.
...
- Order available buttons in the same way as the native version.
2004-09-14 01:06:30 +00:00
8f870346cb
- Obey TBCDRF_NOOFFSET for the button text.
...
- Make anchor highlighting behave more like native version.
- Don't recalculate toolbar in TOOLBAR_Unkwn460.
- Obey WM_SETREDRAW for the WM_ERASEBKGND message as well as
WM_PAINT.
2004-09-06 21:26:25 +00:00
Nikolay Sivov