diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
| commit | 1501699f035761714a1d4540d65a1afb7c567abe (patch) | |
| tree | 4dd4d15583d9d542a699833331f34ceb10bbd6c3 /libXaw/include/X11/Xaw/SimpleMenP.h | |
| parent | 38c18d1733e4eb5cc560a34bfe2470e01a06205d (diff) | |
| parent | a33de30073bfa0ee1abba186dba9fa52cf0aa23a (diff) | |
| download | vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.gz vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.bz2 vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/raster/ftraster.c
openssl/Makefile
Diffstat (limited to 'libXaw/include/X11/Xaw/SimpleMenP.h')
| -rw-r--r-- | libXaw/include/X11/Xaw/SimpleMenP.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libXaw/include/X11/Xaw/SimpleMenP.h b/libXaw/include/X11/Xaw/SimpleMenP.h index 34ee86a55..e01c151ea 100644 --- a/libXaw/include/X11/Xaw/SimpleMenP.h +++ b/libXaw/include/X11/Xaw/SimpleMenP.h @@ -73,7 +73,7 @@ typedef struct _SimpleMenuPart { /* private */ Boolean recursive_set_values; /* contain a possible infinite loop */ - Boolean menu_width; /* If true then force width to remain + Boolean menu_width; /* If true then force width to remain core.width */ Boolean menu_height; /* Just like menu_width, but for height */ SmeObject entry_set; /* The entry that is currently set or @@ -90,7 +90,7 @@ typedef struct _SimpleMenuPart { typedef struct _SimpleMenuRec { CorePart core; - CompositePart composite; + CompositePart composite; ShellPart shell; OverrideShellPart override; SimpleMenuPart simple_menu; |