Commit Graph

274 Commits

Author SHA1 Message Date
Gerard Patel 326b280efc Draw MenuBar in proper place (some cases). 2001-07-17 00:43:22 +00:00
Mike McCormack 34329cf58e GetMenuItemID: return -1 for invalid menu items, not zero. 2001-07-10 19:06:12 +00:00
Marcus Meissner 05aeaf1568 Add some argument validation to SetMenuItemInfoA, so QT5 does not
corrupt its menus.
2001-07-08 20:31:41 +00:00
Patrik Stridvall 01d5e5b071 Documentation fixes. 2001-07-02 19:59:40 +00:00
Dmitry Timoshkov 56a19923e8 Replace some 16-bit calls by their 32-bit equivalents. 2001-07-02 01:21:26 +00:00
Patrik Stridvall 17fd4e3816 Documentation name fixes. 2001-06-28 18:04:41 +00:00
Patrik Stridvall 3ca9823941 Documentation ordinal fixes. 2001-06-20 23:03:14 +00:00
Ulrich Czekalla 18ce388db9 Fix menu behaviour when escape is pressed. 2001-05-18 23:20:20 +00:00
Gerard Patel 8f79fdc3fe Test if the menu is destroyed before displaying a menu item. 2001-05-14 19:20:13 +00:00
Alexandre Julliard e60ccd11d3 Create a new window for the top popup menu on every new menu tracking,
so that the window belongs to the right thread.
2001-05-11 20:05:42 +00:00
Francois Gouget e76218dd61 Add '\n' at the end of traces. 2001-05-09 17:31:31 +00:00
Patrik Stridvall 15a3b74356 Documentation name fixes. 2001-04-27 18:03:51 +00:00
Alexandre Julliard 3f03975f48 Added first/last message filters to MSG_InternalGetMessage to avoid
busy waits.
2001-04-12 21:09:03 +00:00
Alexandre Julliard 2ec34e48a3 Added TASK_GetPtr/TASK_GetCurrent functions to get the TDB for a task
handle.
2001-04-04 00:21:05 +00:00
Gerard Patel 2482ef3339 Fix system menu crash by ensuring that item->text is not null when
MF_TEXT set.
2001-03-19 19:16:21 +00:00
Gerard Patel cf2ff27f5f Recalculate menu sizes if WM_INITMENU has recreated/changed something. 2001-03-14 17:24:59 +00:00
Eric Pouech a862f68db5 Added a few missing stubs to KERNEL32 and USER32. 2001-02-26 22:33:29 +00:00
Alexandre Julliard da2892c0fb Do not allocate any USER data on the system heap. 2001-02-23 01:13:42 +00:00
François Gouget b99367e20e debugstr_xxx already does the quoting. 2001-02-14 21:42:10 +00:00
Dmitry Timoshkov 9316fa3db3 Convert menu item to seperator only when string is NULL. 2001-02-14 00:23:45 +00:00
Marcus Meissner 4a69939aa8 Don't crash on close from window manager. 2001-02-13 01:49:06 +00:00
Patrik Stridvall 0c61028734 Documentation ordinal fixes. 2001-01-25 22:22:21 +00:00
Alexandre Julliard c1d35ccd9b Use DrawFrameControl() instead of OEM bitmaps to paint caption buttons
and menu check marks.
2001-01-24 19:47:57 +00:00
Alexandre Julliard a41b2cfdd0 Moved tweak support to USER dll. Removed tweak.h and cache.h. 2001-01-15 20:12:55 +00:00
François Gouget 75b278e9dd Modify the look of bitmap menu items to match Win95 and Win98
Fix the sunken edge/bitmap overlap in the Win98 look
Introduce an IS_MAGIC_ITEM macro to test if the item is 'magic'
2001-01-06 01:45:51 +00:00
Francois Gouget 5818240965 Fixed the alignment of the MF_RIGHTJUSTIFY menu items. 2001-01-04 20:56:43 +00:00
Andreas Mohr a6d83ebae1 - clarify many error messages
- add data corruption warning to README file
2000-12-27 04:02:46 +00:00
Alexandre Julliard 982a223f36 Replaced PTR_SEG_TO_LIN macro by exported MapSL function.
Fixed a few ptr/segptr mismatches.
Moved CONV_RECT/POINT macros to wingdi16.h.
2000-12-13 20:20:09 +00:00
Alexandre Julliard 91222da881 Moved most builtin controls structures into their respective C file.
Created new controls.h file private to user32.dll and moved remaining
builtin controls definitions there.
2000-12-10 23:01:33 +00:00
Alexandre Julliard 24a62ab9b0 Got rid of the Wine internal lstrcpy* functions and of winestring.h. 2000-11-28 22:40:56 +00:00
Louis Philippe Gagnon 9cdd22c53d When processing mouse messages in MENU_TrackMenu, use the coordinates
in lParam instead of those in MSG::pt.
2000-11-27 22:39:35 +00:00
Alexandre Julliard ac7efef3b5 Changed GetProcAddress16 and 16-bit resource functions to take normal
pointers instead of SEGPTRs.
Removed WIN16_GetTempDrive.
2000-11-27 21:54:01 +00:00
Francois Gouget 75f9e647aa Take into account the sunken border for Win98 look.
Leave a 1 pixel gap to the left of menu bitmap items for symetry (and
because Win9x does it).
Leave a 1 pixel gap above menu bar items for symetry (and because
Win9x does it).
2000-11-06 05:25:29 +00:00
James Abbatiello 606f6203d4 Don't reset MF_POPUP flag in SetMenu(). 2000-11-05 03:18:11 +00:00
Dmitry Timoshkov d5e15d3be1 Do not invert "magic" bitmap menu items. 2000-11-02 20:08:34 +00:00
Dmitry Timoshkov d0ff2ec08b Make bitmap menu items look like in windows when selected,
i.e. inverted and hilited (in Win98 look).
2000-11-01 02:11:41 +00:00
Dmitry Timoshkov ef55932f4b Ask application to reinitialize its menu before processing an
accelerator key.
2000-10-26 21:47:20 +00:00
Aric Stewart c946b1cccd Converted menu string handling to Unicode. 2000-10-24 21:28:19 +00:00
Francois Gouget 93fd46af54 Fixed the text color of higlighted menu bar item for the Win98 look.
Clicking on a separator should not close the menu.
Do not right align 'bitmap' items and the help menu for the Win9x look
and feels.
2000-10-23 00:37:49 +00:00
Alexandre Julliard 83f52d11c1 Moved all Win16 definitions out of the standard Windows headers. 2000-09-26 22:20:14 +00:00
Alexandre Julliard 072dfb57e3 Removed inclusion of wine/winestring.h from winbase.h and added it to
the C files that need it.
2000-09-25 23:30:56 +00:00
Andreas Mohr 6f07e8abbc Fixed window lock problem in SetMenu(). 2000-09-19 02:38:11 +00:00
Dmitry Timoshkov fbb2c9bdf8 GetMenu might be used to get child window id. 2000-09-09 19:38:34 +00:00
Alexandre Julliard cb10fdab99 Replaced lstrlen/lstrcmp by libc equivalents everywhere we don't need
to trap exceptions.
2000-08-06 02:41:16 +00:00
Alexandre Julliard b0efe28f6c Removed a few dependencies on GDI internals from USER dll. 2000-08-04 04:18:04 +00:00
Francois Jacques 20af4c3c87 GetSystemMenu called with bRevert argument set to TRUE now returns
NULL as specified in Platform SDK.
2000-06-18 17:17:54 +00:00
Andreas Mohr 2e011a5243 Lots of spelling fixes that accumulated in my tree again, made several
error msgs more verbose, doc updates.
2000-06-01 23:28:25 +00:00
Rob Farnum b200793de4 Post a WM_CANCELMODE message to wake up the internal menu handling
code. This fixes the problem of a menu being orphaned when the parent
window disappears, or if the parent loses focus.
2000-05-23 23:34:17 +00:00
Gerard Patel c6369b0bd7 When new menu Id is not found or index > nitems, insert the new menu
at end of current menu.
2000-05-14 22:52:52 +00:00
Susan Farley f1d467a337 Distinguish RADIOCHECK style menu items from standard checkmark menu
items.
2000-05-12 21:59:31 +00:00
Guy Albertelli f12b70addb Revalidate menu handle in mt.hTopMenu after DispatchMessage. 2000-05-11 00:06:11 +00:00
Aric Stewart 70cc169d1c - Wine was passing the wrong hwnd as the owner when processing owner
drawn menubars.
- When doing MENU_CalcItemSize for the menu bar we were not properly
  padding the returned rect.
2000-05-10 21:54:07 +00:00
Ken Thomases 130f0d88c1 Fixed to display popup-menu arrow on owner-drawn popup menus.
Fixed positioning of submenus relative to parent menus.
2000-05-10 21:38:37 +00:00
Patrik Stridvall 2d6457c11a Added/fixed some documentation reported by winapi_check. 2000-03-28 20:22:59 +00:00
Francois Gouget 6d77d3a1df Use min/max instead of MIN/MAX. 2000-03-25 21:44:35 +00:00
Huw D M Davies 2d6eabacc3 Set the correct value for the cch element of MENUITEMINFO in
GetMenuItemInfo.
2000-03-24 19:48:53 +00:00
Patrik Stridvall 6cc47d4924 Removed a lot of unnecessary includes and fixed the compile errors. 2000-03-08 18:26:56 +00:00
Ulrich Czekalla 33026a2a6e Send WM_HELP message when F1 is pressed. 2000-02-26 19:13:44 +00:00
Jeremy White d3e22d9d55 Removed #include of wingdi.h and windef.h from winuser.h (and resolved
the resulting compilation failures).
2000-02-10 19:03:02 +00:00
Alexandre Julliard b2f6f0e7d2 Removed resource.h. 2000-02-03 01:54:36 +00:00
Gerard Patel 3e629748cf Validate the menu handles. 2000-01-17 22:22:16 +00:00
Pascal Lessard ae6de763e9 Stop menu tracking when clicking on the menu bar where there is no
menu item.
2000-01-09 02:38:02 +00:00
Marcus Meissner cb3c7bfa70 GetMenuString should return itemlength on 0 nMax or NULL str
InsertItem pos=-1, flags = 0 should append item
(thanks to Sander van Leeuwen)
2000-01-08 22:25:57 +00:00
Rein Klazes 80c924f1f4 In win32 a WM_MENUSELECT message should contain the position when the
item refers to a submenu, not the submenu's handle as in win16.
1999-12-12 19:40:46 +00:00
Ulrich Weigand 2faf2cf964 Perform 16/32A/32W message mapping for posted messages. 1999-12-10 03:47:13 +00:00
Karl Lessard 4a0a7df6a3 When a popupmenu is currently active on the screen, it shouldn't
remove mouse click messages that don't belong to it from the queue.
1999-11-07 05:17:10 +00:00
Pierre Mageau 891d4d22a7 Fixed loop with WM_SYSCHAR. 1999-10-23 20:05:04 +00:00
Juergen Schmied 371c420549 Made TrackPopupMenu with TPM_RETURNCMD returning the id instead of
true.
1999-10-13 12:27:44 +00:00
Karl Lessard 13409b32cd Make ExecFocusedItem return -1 on failure. 1999-09-28 16:24:58 +00:00
Gerard Patel 6df0694f7c Force recalculation of menu when calling InsertMenuItem. 1999-09-28 13:05:54 +00:00
Abey George b59d4bc503 Don't send WM_ENTERMENULOOP, WM_INITMENU & WM_INITMENUPOPUP messages
when TPM_NONOTIFY flag is set in TrackPopupMenu.
1999-09-22 15:10:42 +00:00
Pascal Lessard 445c910e89 Message removed when menu tracking finish on a WM_LBUTTONDOWN. 1999-09-20 18:27:14 +00:00
Dennis Björklund 4352c7a9d0 Send correct WM_MENUSELECT when menu closes. 1999-09-19 18:28:35 +00:00
Richard Cohen 56753621d3 Protect SetMenu from rogue menu handle.
GetMenu16 can just call GetMenu.
1999-09-19 14:08:13 +00:00
Pascal Lessard 07c447f971 Added a case for menu handling in win31. 1999-09-19 12:03:25 +00:00
Eric Pouech 0c62bf064d Added MenuItemFromPoint stub. 1999-09-13 15:11:35 +00:00
Pascal Lessard 2eb0a302a0 Menu hides when clicked for a second time. 1999-09-03 16:38:52 +00:00
Stephane Lussier a833f63783 Avoid changing the activation state in EnableMenuItem. 1999-08-21 14:46:06 +00:00
Eric Pouech 562309adac Fixed crash when accessing sysmenu. 1999-08-21 12:59:44 +00:00
Francis Beaudet 7ed1af3df3 Ensure that the WM_ENTERIDLE message is not sent if the wake-up event
for the MSG_InternalGetMessage() call is a WM_TIMER.
1999-08-15 16:58:03 +00:00
Alexandre Julliard 15de615276 Got rid of dsprintf and related macros. 1999-08-04 12:22:42 +00:00
Pascal Lessard d814bb657a Implemented the system button behavior and associated it to the system
menu in win95. Also permit the SC_CLOSE item to be disabled.
1999-07-31 13:02:02 +00:00
Patrik Stridvall 1ed4ecffa8 ANSI C fixes.
Removed warnings.
Made the include files self-sufficient.
Some Solaris fixes.
1999-06-26 14:58:24 +00:00
Noomen Hamza 46c4d39853 Remove the WM_LBUTTONUP message from the queue after selecting a mouse
menu item.
1999-06-26 10:14:27 +00:00
Patrik Stridvall 4bf335497d Removed direct references to CLASS internals. 1999-06-12 14:52:15 +00:00
Eric Pouech dfed208e90 When looking into sys menu, check if items are present before
dereferencing.
1999-06-05 11:43:50 +00:00
Pascal Lessard d9ab1f3f1c Support TPM_RETURNCMD in TrackPopupMenu. 1999-05-29 10:56:43 +00:00
Marcus Meissner ddca315388 Replaced all occurences of SYSMETRICS_xx and sysMetrics[SM_xx] by
GetSystemMetrics(SM_xx), removed no longer needed includes of
sysmetrics.h.
1999-05-22 11:33:23 +00:00
Alexandre Julliard 9fe7a2545a Converted to the new debug interface, using script written by Patrik
Stridvall.
1999-05-14 08:17:14 +00:00
Juergen Schmied 4925186bb2 - prevent crash when GetMenuDefaultItem is called on empty menu
- set default item on system menu
1999-05-13 18:42:03 +00:00
Patrik Stridvall 1bb9403938 ANSI C fixes. 1999-05-08 15:47:44 +00:00
Juergen Schmied 466a65205b - default item handling
- small drawing fixes
1999-05-02 11:21:08 +00:00
Juergen Schmied cd0ed1e6b9 - align magic buttons right
- shortcuts alignment working again
1999-04-26 14:54:38 +00:00
Bertho Stultiens d1895a776c Built-in dlls now have resources attached via the PE-header like
normal dlls. This enables the use of the resource API.
1999-04-25 18:31:35 +00:00
Patrik Stridvall 0f8bc5b5c7 Fixed ANSI compabillity. 1999-04-22 16:27:50 +00:00
Juergen Schmied c77fd5b322 - protect TRACE against NULL-ptr
- rewrote GetMenuItemID/GetSubMenu to use MENU_FindItem (hmenu=0xffff fix).
1999-04-21 14:27:37 +00:00
Patrik Stridvall b4b9fae671 New debug scheme with explicit debug channels declaration. 1999-04-19 14:56:29 +00:00
Juergen Schmied 7851394159 - use fonts/fontsizes given by SystemParametersInfo
- drawing/alignment fixes, win98 style for menubar
- ownerdrawn menus are working now for the first time
- complete constants magic items
- use right owner for popupmenus
- new: Get/SetMenuInfo
- implemented: Get/SetMenuContextHelpId
- more flags for Get/SetMenuItemInfo
1999-04-18 14:40:32 +00:00
Juergen Schmied 7abca950e3 The MEASUREITEMSTRUCT and DRAWITEMSTRUCT were filled wrong. 1999-04-11 17:02:30 +00:00
Paul Millar 39da222b19 Fixed menu type setting in SetMenuItemInfo32_common(). 1999-04-11 12:08:42 +00:00