mirror of
https://github.com/reactos/wine.git
synced 2024-11-25 20:59:54 +00:00
cdd0923710
Tue Jan 4 13:01:33 1994 David Metcalfe <david@prism.demon.co.uk>
* [window/caret.c]
Modified code to use system timer.
Jan 9, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [windows/win.c]
Windows create if required new XLIB MenuBar & CaptionBar.
* [windows/defwnd.c]
WM_CALCSIZE Move & Resize caption, menubar & scrollbars.
(I'm not sure it's the good place for it, but it work...)
* [loader/resource.c]
optimize in FindResourceByNumber, make lseek() if next type ...
* [controls/scroll.c]
scrollbar buttons are now using system resources bitmaps.
* [controls/caption.c] - new file ...
captionbar showing title, close button with SysMenu,
and other buttons using system resources bitmaps.
* [controls/menu.c]
New functions: SetMenuItemBitmaps() with 'glues',
Make new version of LoadMenu() & ParseMenu(),
( put #define USE_POPUPMENU ).
Implementation of MenuBar functions.
* [sysres.dll]
New bitmaps for system such OBM_CLOSE, OBM_MINIMIZE, OBM_UPARROWI.
New SYSMENU menu, it don't work yet ! :-((
Tue Jan 11 05:27:45 1994 julliard@di.epfl.ch (Alexandre Julliard
* [memory/atom.c]
Fixed a bug that could cause atoms to be case-sensitive.
* [misc/rect.c]
Bug fix in SubtractRect().
* [objects/clipping.c]
Bug fix when setting the clip mask to an empty region.
* [windows/dce.c]
Bug fix in ReleaseDC().
* [windows/dialog.c]
Call AdjustWindowRectEx() before creating the dialog window.
Added support for DS_MODALFRAME style.
* [windows/event.c]
Cleaned up event handling and removed old Xt stuff.
Moved double-click handling to windows/message.c
* [windows/focus.c]
Bug fix: only set the X focus when the window is viewable.
* [windows/graphics.c]
Rewritten DrawReliefRect() to use brush instead of pen, and
to use the system colors.
* [windows/message.c]
Implemented WM_NCHITTEST message sending, and non-client
mouse messages.
Cleaned up double-click handling, and removed the Xt code.
* [windows/nonclient.c] (New file)
Implemented AdjustWindowRect().
Implemented WM_NCCALCSIZE, WM_NCHITTEST and WM_NCPAINT handling.
* [windows/painting.c]
Added sending of the WM_NCPAINT message in BeginPaint().
* [windows/sysmetrics.c] [include/sysmetrics.h] (New files)
Implemented system metrics.
* [windows/win.c]
Bug fix in setting the parent and owner in CreateWindow().
Removed the Xt code.
* [windows/winpos.c]
Added sending of the WM_NCPAINT message in SetWindowPos().
Removed the Xt code.
86 lines
2.0 KiB
C
86 lines
2.0 KiB
C
/* $Id$
|
|
*
|
|
* Menu definitions
|
|
*/
|
|
|
|
#ifndef MENU_H
|
|
#define MENU_H
|
|
|
|
#include <X11/Intrinsic.h>
|
|
#include <X11/StringDefs.h>
|
|
#include <X11/Core.h>
|
|
#include <X11/Xaw/Form.h>
|
|
#include <X11/Xaw/Command.h>
|
|
#include <X11/Xaw/Box.h>
|
|
|
|
|
|
typedef struct tagMENUITEM
|
|
{
|
|
struct tagMENUITEM *next;
|
|
struct tagMENUITEM *prev;
|
|
struct tagMENUITEM *child;
|
|
struct tagMENUITEM *parent;
|
|
WORD item_flags;
|
|
WORD item_id;
|
|
WORD sel_key;
|
|
char *shortcut;
|
|
char *item_text;
|
|
Widget w;
|
|
Widget menu_w;
|
|
char menu_name[10];
|
|
RECT rect;
|
|
HBITMAP hCheckBit;
|
|
HBITMAP hUnCheckBit;
|
|
} MENUITEM, *LPMENUITEM;
|
|
|
|
typedef struct tagMENUBAR
|
|
{
|
|
struct tagMENUBAR *next;
|
|
HANDLE menuDescription; /* Memory containing menu desc. */
|
|
HWND ownerWnd; /* Owner window */
|
|
int nItems; /* Number of items on menu */
|
|
Widget parentWidget; /* Parent of menu widget */
|
|
Widget menuBarWidget; /* Widget to contain menu options */
|
|
MENUITEM *firstItem;
|
|
} MENUBAR, *LPMENUBAR;
|
|
|
|
typedef struct tagPOPUPMENU
|
|
{
|
|
HWND hWnd; /* PopupMenu window handle */
|
|
HWND hWndParent; /* Parent opupMenu window handle */
|
|
HWND ownerWnd; /* Owner window */
|
|
WORD nItems; /* Number of items on menu */
|
|
MENUITEM *firstItem;
|
|
WORD FocusedItem;
|
|
WORD MouseFlags;
|
|
WORD BarFlags;
|
|
WORD Width;
|
|
WORD Height;
|
|
} POPUPMENU, *LPPOPUPMENU;
|
|
|
|
typedef struct
|
|
{
|
|
WORD version; /* Should be zero */
|
|
WORD reserved; /* Must be zero */
|
|
} MENU_HEADER;
|
|
|
|
typedef struct
|
|
{
|
|
WORD item_flags; /* See windows.h */
|
|
char item_text[1]; /* Text for menu item */
|
|
} MENU_POPUPITEM;
|
|
|
|
typedef struct
|
|
{
|
|
WORD item_flags; /* See windows.h */
|
|
WORD item_id; /* Control Id for menu item */
|
|
char item_text[1]; /* Text for menu item */
|
|
} MENU_NORMALITEM;
|
|
|
|
extern LPMENUBAR MENU_CreateMenuBar(Widget parent, HANDLE instance,
|
|
HWND wnd, char *menu_name, int width);
|
|
extern LPMENUBAR MENU_UseMenu(Widget parent, HANDLE instance,
|
|
HWND wnd, HMENU hmenu, int width);
|
|
|
|
#endif /* MENU_H */
|