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/src/Porthole.c | |
| 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/src/Porthole.c')
| -rw-r--r-- | libXaw/src/Porthole.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libXaw/src/Porthole.c b/libXaw/src/Porthole.c index e94d21360..4842e70d7 100644 --- a/libXaw/src/Porthole.c +++ b/libXaw/src/Porthole.c @@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium - * + * * This widget is a trivial clipping widget. It is typically used with a * panner or scrollbar to navigate. */ @@ -112,7 +112,7 @@ PortholeClassRec portholeClassRec = { NULL, /* extension */ }, /* composite */ - { + { XawPortholeGeometryManager, /* geometry_manager */ XawPortholeChangeManaged, /* change_managed */ XtInheritInsertChild, /* insert_child */ @@ -367,7 +367,7 @@ XawPortholeChangeManaged(Widget gw) == XtGeometryAlmost) (void)XtMakeGeometryRequest(gw, &retgeom, NULL); } - + XtResizeWidget(child, Max(XtWidth(child), XtWidth(pw)), Max(XtHeight(child), XtHeight(pw)), 0); |