added nsnull to the end of all the XtVaSet methods

widget/src/motif/Makefile

@@ -18,6 +18,7 @@
 
 DEPTH = ../../..
 
+include $(DEPTH)/config/config.mk
 
 LIBRARY_NAME = widgetunix
 
@@ -27,8 +28,21 @@ REQUIRES=util img xpcom raptor netlib
 
 DEFINES = -D_IMPL_NS_WIDGET 
 
-EXTRA_DSO_LDOPTS+= -lnspr21 -lplds21 -lplc21 -lreg -lraptorbase -lgfxunix -L$(DIST)/lib $(DIST)/lib/libnspr21.a $(DIST)/lib/libxpcom.a $(DIST)/lib/libreg.a $(DIST)/lib/libraptorbase.a -L/usr/X11R6/lib $(DIST)/lib/libgfxunix.a -lXm -lXt -lX11
+EXTRA_DSO_LDOPTS+=\
+	$(DIST)/bin/libxpcom.so \
+	$(DIST)/bin/libraptorgfx.so \
+	$(DIST)/bin/libraptorbase.so \
+	$(DIST)/bin/libreg.so \
+	$(LIBNSPR)\
+	$(DIST)/lib/libplc21.a
 
+# This should really be done properly in 'config'
+ifeq ($(OS_ARCH),Linux)
+EXTRA_DSO_LDOPTS+=\
+	-L/usr/X11R6/lib -lX11 -lm
+else
+EXTRA_DSO_LDOPTS+= -lX11 -lm 
+endif
 
 CPPSRCS= \
 	nsScrollbar.cpp \

widget/src/motif/nsScrollbar.cpp

@@ -161,11 +161,11 @@ void nsScrollbar::SetMaxRange(PRUint32 aEndRange)
 {
     fprintf(stderr, "Setting Max Range to %d 0x%x\n", aEndRange, mWidget);
     int max = aEndRange;
-    XtVaGetValues(mWidget, XmNmaximum, &max);
+    XtVaGetValues(mWidget, XmNmaximum, &max, nsnull);
     fprintf(stderr, "Max is %d\n", max);
 
     max = aEndRange;
-    XtVaSetValues(mWidget, XmNmaximum, max);
+    XtVaSetValues(mWidget, XmNmaximum, max, nsnull);
 }
 
 
@@ -177,7 +177,7 @@ void nsScrollbar::SetMaxRange(PRUint32 aEndRange)
 PRUint32 nsScrollbar::GetMaxRange()
 {
     int maxRange = 0;
-    XtVaGetValues(mWidget, XmNmaximum, &maxRange);
+    XtVaGetValues(mWidget, XmNmaximum, &maxRange, nsnull);
 
     return (PRUint32)maxRange;
 }
@@ -196,7 +196,7 @@ void nsScrollbar::SetPosition(PRUint32 aPos)
     fprintf(stderr, "pos is %d\n", pos);
 
     pos = aPos;
-    XtVaSetValues(mWidget, XmNvalue, pos);
+    XtVaSetValues(mWidget, XmNvalue, pos, nsnull);
 }
 
 
@@ -208,7 +208,7 @@ void nsScrollbar::SetPosition(PRUint32 aPos)
 PRUint32 nsScrollbar::GetPosition()
 {
     int pagePos = 0;
-    XtVaGetValues(mWidget, XmNvalue, &pagePos);
+    XtVaGetValues(mWidget, XmNvalue, &pagePos, nsnull);
 
     return (PRUint32)pagePos;
 }
@@ -221,7 +221,7 @@ PRUint32 nsScrollbar::GetPosition()
 //-------------------------------------------------------------------------
 void nsScrollbar::SetThumbSize(PRUint32 aSize)
 {
-    XtVaSetValues(mWidget, XmNpageIncrement, (int)aSize);
+    XtVaSetValues(mWidget, XmNpageIncrement, (int)aSize, nsnull);
 }
 
 
@@ -274,7 +274,8 @@ void nsScrollbar::SetParameters(PRUint32 aMaxRange, PRUint32 aThumbSize,
                            XmNmaximum,   aMaxRange,
                            XmNminimum,   0,
                            XmNpageIncrement, aThumbSize,
-                           XmNvalue,     aPosition);
+                           XmNvalue,     aPosition, 
+                           nsnull);
 
     mLineIncrement = aLineIncrement;
 }