Commit Graph

352 Commits

Author SHA1 Message Date
Andrew Talbot 161d3322d6 comctl32: Remove unused variables. 2008-04-16 14:08:04 +02:00
Andrew Talbot 369d414d59 comctl32: Remove unused variables. 2008-04-14 12:42:36 +02:00
Lei Zhang 7f5c97693e comctl32: Fix TB_GETSTRING return values. 2008-03-12 12:00:14 +01:00
Lei Zhang 375f60b07a comctl32: Add tests for TB_GETSTRING, fix NULL pointer access. 2008-03-12 12:00:08 +01:00
Andrew Talbot 8d555e825b comctl32: Assign to structs instead of using memcpy. 2008-02-12 23:00:03 +01:00
Lei Zhang 3980401231 comctl32: Use wine_dbgstr_rect() in traces. 2008-02-07 11:59:53 +01:00
Austin English c2a7914d1c comctl32: Spelling fixes. 2008-01-24 11:43:02 +01:00
Andrew Talbot 863ffb719b comctl32: Remove unneeded casts. 2008-01-02 12:38:41 +01:00
Andrew Talbot 1bf787d521 comctl32: Remove unneeded casts. 2007-12-03 13:10:21 +01:00
Alexander Dorofeyev 35ff6d6750 comctl32: Fix broken detection of non-empty string. 2007-10-29 14:32:16 +01:00
Alexander Dorofeyev 77c376e0f8 comctl32: Pass command id of button in wParam. 2007-10-29 14:32:10 +01:00
Lionel Debroux 29ddd49130 comctl32: Remove redundant NULL check before free (found by Smatch). 2007-10-22 12:36:08 +02:00
Jason Edmeades 881c204c02 comctl32: toolbar: Implemented SetRows. 2007-08-28 12:26:13 +02:00
Mikołaj Zalewski 31be5005c6 comctl32: toolbar: Test and fix invalid indexes passed in TB_ISBUTTON*. 2007-07-20 11:34:34 +02:00
Mikołaj Zalewski 5507a073c5 comctl32: toolbar: We should send TBN_GETDISPINFOW even for ANSI controls (with testcase). 2007-07-11 11:59:33 +02:00
Mikołaj Zalewski e66523e19b comctl32: toolbar: The iImage in TBN_GETDISPINFO should be initialized to -1. 2007-07-11 11:53:33 +02:00
Dmitry Timoshkov 18366472c7 comctl32: Fix a compilation warning in 64-bit mode. 2007-06-01 12:42:06 +02:00
Dmitry Timoshkov 3c9e7a7f33 wine: Switch to using 'long' for INT_PTR type for 64-bit compatibility. 2007-05-25 20:37:56 +02:00
Mikołaj Zalewski 7b8241b1ee comctl32: toolbar: TB_SETIMAGELIST should try to preserve button width. 2007-05-16 11:55:38 +02:00
Mikołaj Zalewski 3d7a65355e comctl32: toolbar: Don't execute TB_GETBUTTONINFO if cbSize is invalid. 2007-04-24 10:19:04 +02:00
Mikołaj Zalewski 10b1d00113 comctl32: toolbar: Merge TOOLBAR_GetButtonInfoA and TB_GetButtonInfoW. 2007-04-24 10:18:33 +02:00
Felix Nawothnig 7657913873 comctl32: Allow destruction of toolbar in BN_CLICKED handler. 2007-04-06 12:31:08 +02:00
Andrew Talbot 51ee497174 comctl32: Constify some variables. 2007-04-03 11:21:51 +02:00
Mikołaj Zalewski 7bf7cdd1a9 comctl32: toolbar: TB_HIDEBUTTON and TB_MOVEBUTTON shouldn't force a recalc. 2007-03-28 12:05:15 +02:00
Mikołaj Zalewski 307f39c0d5 comctl32: toolbar: We shouldn't try to resize standard bitmaps. 2007-03-21 11:59:31 +01:00
Mikołaj Zalewski e3b7c3045a comctl32: toolbar: Test standard buttons size. 2007-03-21 11:59:21 +01:00
Mikołaj Zalewski d4a67c4382 comctl32: toolbar: The default button size is 16x16. 2007-03-21 11:59:11 +01:00
Andrew Talbot 74ab88ca97 comctl32: Replace inline static with static inline. 2007-03-17 20:03:19 +01:00
Michael Stefaniuc 22ecd7aa67 comctl32: Remove redundant NULL checks before Free() (found by Smatch). 2007-03-08 11:58:04 +01:00
Mikołaj Zalewski 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
Mikołaj Zalewski 292cb4d2ac comctl32: toolbar: Fix the TB_SETBITMAPSIZE for width or height zero (with testcase). 2007-01-16 16:54:25 +01:00
Mikołaj Zalewski e6b1bd5f30 comctl32: toolbar: Recalc the toolbar after a TB_SETIMAGELIST. 2007-01-16 11:17:39 +01:00
Mike McCormack f23ab81738 comctl32: Downgrade an ERR to a WARN. 2006-11-09 11:44:42 +01:00
Mikołaj Zalewski 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
Mikołaj Zalewski 420f7cb076 comctl32: toolbar: The SetButtonSize should not allow too small buttons. 2006-11-02 12:31:06 +01:00
Mikołaj Zalewski 3bfcacc54c comctl32: toolbar: The top margin should be computed and saved in CalcToolbar. 2006-11-02 12:30:53 +01:00
Mikołaj Zalewski 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
Mikołaj Zalewski f7f1479a08 comctl32: toolbar: Fix buttons heights. 2006-11-02 12:30:17 +01:00
Mikołaj Zalewski 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
Mikołaj Zalewski d57a61f831 comctl32: toolbar: Add support for WM_SETFONT. 2006-11-02 12:29:32 +01:00
Oleg Krylov 32caf30f9c comctl32: Create tooltip windows with WS_POPUP style. 2006-10-25 20:21:34 +02:00
Alexandre Julliard 7cca856315 comctl32: Properly handle negative coordinates for mouse events. 2006-10-25 17:41:48 +02:00
Mikołaj Zalewski 39c4bbe56a comctl32: toolbar: Fix the tests and handling of TB_SETHOTITEM on a disabled button. 2006-10-19 14:00:55 +02:00
Oleg Krylov 2d6b9cafc6 comctl32: toolbar: Create tooltip on TB_GETTOOLTIPS message if not yet created. 2006-10-19 13:47:08 +02:00
Mikołaj Zalewski 76b162067f comctl32: toolbar: Test and improve TB_SETHOTITEM. 2006-10-14 20:43:03 +02:00
Mikołaj Zalewski 010f31f413 comctl32: toolbar: Use nHotItem not nOldHit for the hot item in MouseLeave. 2006-10-14 20:42:36 +02:00
Mikołaj Zalewski d929cec671 comctl32: toolbar: Don't try to redraw buttons outside of the clipping rect. 2006-10-14 20:42:21 +02:00
Mikołaj Zalewski 992310e4be comctl32: toolbar: Change the dwData from DWORD to DWORD_PTR. 2006-10-14 20:41:48 +02:00
Michael Ploujnikov 1c16d83379 comctl32: Win64 printf format warning fixes. 2006-10-14 20:17:06 +02:00
Mikołaj Zalewski e998f9a498 comctl32: toolbar: Store dwBaseCustDraw and dwItemCDFlag in local variables. 2006-10-12 12:56:23 +02:00
Mikołaj Zalewski 79433e1bda comctl32: toolbar: Merge TOOLBAR_InsertButtonA and TOOLBAR_InsertButtonW. 2006-10-12 12:56:07 +02:00
Mikołaj Zalewski 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
Mikołaj Zalewski 4cf682b8c4 comctl32: toolbar: Remove dwItemCustDraw from TOOLBAR_INFO and store it as a local variable. 2006-10-12 12:55:40 +02:00
Mikołaj Zalewski e0e2d7482c comctl32: toolbar: Don't send NM_CUSTOMDRAW for separators. 2006-10-12 12:55:28 +02:00
Mikołaj Zalewski 241956101e comctl32: toolbar: Fix the TB_ADDSTRING from resources for a NUL delimiter. 2006-10-09 20:53:15 +02:00
Mikołaj Zalewski 869c3bb74b comctl32: toolbar: Merge AddButtonsA and AddButtonsW into AddButtonsT. 2006-10-09 20:52:48 +02:00
Mikołaj Zalewski 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
Mikołaj Zalewski 7b899eabe9 comctl32: toolbar: Move add/remove/setrect tooltip code to separate functions. 2006-10-09 20:52:18 +02:00
Mikołaj Zalewski c7d034219e comctl32: toolbar: Small fix in TOOLBAR_StyleChanged. 2006-09-29 14:42:20 +02:00
Mikołaj Zalewski 764c5b3b35 comctl32: toolbar: Set correcly hwndTrack in TrackMouseEvent call. 2006-09-29 14:42:08 +02:00
Mikołaj Zalewski 5db5744c5b comctl32: toolbar: Test and fix TB_ADDSTRING from resource. 2006-09-27 20:21:00 +02:00
Mikołaj Zalewski 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
Mikołaj Zalewski c77890d4f3 comctl32: toolbar: Resize the imagelist icons after a TB_SETBITMAPSIZE. 2006-09-26 11:37:47 +02:00
Mikołaj Zalewski 2fa45673f8 comctl32: toolbar: Fix the return code of TB_ADDBITMAP. 2006-09-21 17:42:44 +02:00
Mikołaj Zalewski 12d3235edc comctl32: toolbar: Simplify the TOOLBAR_AddButton. 2006-09-21 17:42:34 +02:00
Mikołaj Zalewski 9e390091db comctl32: toolbar: Fix IDB_STD_VIEW_* icons count (with testcase). 2006-09-21 17:41:36 +02:00
Mikołaj Zalewski d457b37d82 comctl32: toolbar: Use correctly wParam in TB_ADDBITMAP. 2006-09-21 17:41:20 +02:00
Mikołaj Zalewski 5facde470e comctl32: toolbar: Don't leak the intoPtr->bitmaps during resizing and destruction. 2006-09-20 11:21:57 +02:00
Andrew Talbot cc90540c9b comctl32: Cast-qual warnings fix. 2006-09-07 10:16:34 +02:00
Oleg Krylov 21b94d4cf4 comctl32: Correctly map toolbar bitmap mask color in case of non-default color scheme. 2006-08-18 21:17:34 +02:00
Oleg Krylov 3e68a1f1ff comctl32: toolbar: Use HOT imagelist for buttons in CHECKED state. 2006-08-17 11:19:47 +02:00
Jonathan Ernst 360a3f9142 Update the address of the Free Software Foundation. 2006-05-23 14:11:13 +02:00
qingdoa daoo d2f59fe455 comctl32: Fix an unsigned comparison to zero. 2006-04-20 15:37:48 +02:00
Michael Kaufmann e9310da57b Handle WM_PRINTCLIENT.
Don't use SelectClipRgn in WM_PRINTCLIENT.
2005-11-08 12:52:35 +00:00
Krzysztof Foltman 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
Robert Shearman 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
Marcus Meissner 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
Frank Richter 9e57091ffa Fix warnings in 64bit. 2005-08-30 10:07:17 +00:00
Yuri Kozlov dc21c5e45a Set default size for toolbar bitmap if not specified. 2005-08-29 09:39:04 +00:00
Frank Richter 464f562a3a Add theming for toolbar control. 2005-08-12 11:17:14 +00:00
Robert Shearman 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
Robert Shearman 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
Robert Shearman 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
Robert Shearman 481d189508 Native autosizes on inserting/adding buttons, so we should too. 2005-07-22 19:52:05 +00:00
Robert Shearman 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
Robert Shearman 2e0a42ec2c The calculated button height should include the text height when no
buttons are present.
2005-07-22 18:28:46 +00:00
Aric Stewart 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
Robert Shearman 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
Francois Gouget f5c9da6860 Assorted spelling fixes. 2005-05-06 15:44:31 +00:00
Robert Shearman a3b4e20503 Fix TB_GETBUTTONSIZE to return the correct width/height for no
buttons.
2005-04-15 14:09:05 +00:00
Dimitrie O. Paun 8df71a6cfa Use {Alloc,ReAlloc,Free}() instead of Heap{Alloc,ReAlloc,Free}(). 2005-03-25 20:49:00 +00:00
Dimitrie O. Paun ecc850c460 Fix a memory leak in toolbar. Avoid casts. 2005-03-25 10:27:00 +00:00
Dimitrie O. Paun 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
Thomas Weidenmueller 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
Francois Gouget da8b3dd7f2 Assorted spelling fixes. 2005-01-26 21:09:04 +00:00
Tinus aee4f25ed6 Properly allow removing toolbar bitmaps by changing it into 0. 2005-01-24 18:59:13 +00:00
Eric Pouech cf1d00bb08 Removed excessive statement (break after return or goto, not useful
break, not needed vars...)
2005-01-09 16:42:53 +00:00
Michael Stefaniuc 5ad7d858e0 Do not check for non NULL pointer before HeapFree'ing it. It's
redundant.
2004-12-23 17:06:43 +00:00
Robert Shearman d7dd3e37c8 Store the new style before redrawing and repositioning the control. 2004-11-30 17:28:10 +00:00
Robert Shearman 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