On 07/24/2012 12:00 PM, Peter Harris wrote:
libXtaw is used by the Xt tests.
Signed-off-by: Peter Harris <[email protected]>
Reviewed-by: Aaron Plattner <[email protected]>
---
configure.ac | 3 ++-
xts5/src/Makefile.am | 2 +-
xts5/src/libXtaw/Viewport.c | 10 ++++------
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index a1b4b75..1c515ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ AC_SUBST(LDFLAGS_FOR_BUILD)
PKG_CHECK_MODULES([XTS], [x11 xext xi xtst xau])
PKG_CHECK_MODULES([XT], [x11 xext xt xtst])
-dnl PKG_CHECK_MODULES([XAW], [x11 xext xt xtst xaw7])
+PKG_CHECK_MODULES([XAW], [x11 xext xt xtst xaw7])
dnl Checks for header files.
AC_HEADER_STDC
@@ -159,6 +159,7 @@ xts5/src/Makefile
xts5/src/lib/Makefile
xts5/src/libproto/Makefile
xts5/src/libXR5/Makefile
+xts5/src/libXtaw/Makefile
xts5/src/libXtTest/Makefile
xts5/src/xim/Makefile
xts5/src/bin/Makefile
diff --git a/xts5/src/Makefile.am b/xts5/src/Makefile.am
index f1ebeda..7bd74fd 100644
--- a/xts5/src/Makefile.am
+++ b/xts5/src/Makefile.am
@@ -1,5 +1,5 @@
#SUBDIRS = lib libproto libXR5 libXtaw libXtmu libXtTest pixval xim
-SUBDIRS = lib libproto libXR5 libXtTest xim bin
+SUBDIRS = lib libproto libXR5 libXtaw libXtTest xim bin
xtslibdir = $(libexecdir)/xts5
xtslib_LTLIBRARIES = libxts5.la libxts5proto.la
diff --git a/xts5/src/libXtaw/Viewport.c b/xts5/src/libXtaw/Viewport.c
index 22ac416..ee4cd2a 100644
--- a/xts5/src/libXtaw/Viewport.c
+++ b/xts5/src/libXtaw/Viewport.c
@@ -119,7 +119,8 @@ static XtResource resources[] = {
static void Initialize(), ConstraintInitialize(),
Realize(), Resize(), ChangeManaged();
-static Boolean SetValues(), Layout();
+static Boolean SetValues();
+static Boolean Layout(FormWidget w, Dimension width, Dimension height, Boolean
force_relayout);
static XtGeometryResult GeometryManager(), PreferredGeometry();
#define superclass (&formClassRec)
@@ -416,7 +417,7 @@ static void ChangeManaged(widget)
}
GetGeometry( widget, child->core.width, child->core.height );
(*((ViewportWidgetClass)w->core.widget_class)->form_class.layout)
- ( (FormWidget)w, w->core.width, w->core.height );
+ ( (FormWidget)w, w->core.width, w->core.height, False );
/* %%% do we need to hide this child from Form? */
}
}
@@ -785,10 +786,7 @@ static void Resize(widget)
}
-/* ARGSUSED */
-static Boolean Layout(w, width, height)
- FormWidget w;
- Dimension width, height;
+static Boolean Layout(FormWidget w, Dimension width, Dimension height, Boolean
force_relayout)
{
ComputeLayout( (Widget)w, /*query=*/True, /*destroy=*/True );
w->form.preferred_width = w->core.width;
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
