Remove all references to Xt and use only Xlib.

On Linux, add Library Path to Xlib in Makefile

gfx/src/motif/Makefile

@@ -33,7 +33,16 @@ EXTRA_DSO_LDOPTS+=\
 	$(DIST)/bin/libraptorbase.so \
 	$(DIST)/bin/libreg.so \
 	$(LIBNSPR)\
-	$(DIST)/lib/libplc21.a -lXt -lX11 -lm
+	$(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=nsDeviceContextUnix.cpp nsFontMetricsUnix.cpp nsGfxFactoryUnix.cpp \
 	nsRenderingContextUnix.cpp nsRegionUnix.cpp nsImageUnix.cpp

gfx/src/motif/nsDeviceContextUnix.cpp

@@ -99,7 +99,7 @@ nsIRenderingContext * nsDeviceContextUnix :: CreateRenderingContext(nsIView *aVi
 
   mSurface = new nsDrawingSurfaceUnix();
 
-  mSurface->display =  XtDisplay((Widget)win->GetNativeData(NS_NATIVE_WIDGET));
+  mSurface->display =  (Display *)win->GetNativeData(NS_NATIVE_DISPLAY);
   mSurface->drawable = (Drawable)win->GetNativeData(NS_NATIVE_WINDOW);
   mSurface->gc       = (GC)win->GetNativeData(NS_NATIVE_GRAPHIC);
 

gfx/src/motif/nsDeviceContextUnix.h

@@ -26,7 +26,7 @@
 #include "nsIView.h"
 #include "nsIRenderingContext.h"
 
-#include "Xm/Xm.h"
+#include "X11/Xlib.h"
 
 /* nsDrawingSurface is actually the following struct */
 typedef struct nsDrawingSurfaceUnix {

gfx/src/motif/nsFontMetricsUnix.h

@@ -26,7 +26,7 @@
 #include "nsIDeviceContext.h"
 #include "nsCRT.h"
 
-#include "Xm/Xm.h"
+#include "X11/Xlib.h"
 
 class nsFontMetricsUnix : public nsIFontMetrics
 {

gfx/src/motif/nsRenderingContextUnix.cpp

@@ -60,7 +60,7 @@ nsresult nsRenderingContextUnix :: Init(nsIDeviceContext* aContext,
 
   mRenderingSurface = new nsDrawingSurfaceUnix();
 
-  mRenderingSurface->display =  XtDisplay((Widget)aWindow->GetNativeData(NS_NATIVE_WIDGET));
+  mRenderingSurface->display =  (Display *)aWindow->GetNativeData(NS_NATIVE_DISPLAY);
   mRenderingSurface->drawable = (Drawable)aWindow->GetNativeData(NS_NATIVE_WINDOW);
   mRenderingSurface->gc       = (GC)aWindow->GetNativeData(NS_NATIVE_GRAPHIC);
 

gfx/src/motif/nsRenderingContextUnix.h

@@ -36,7 +36,7 @@
 #include "nsVoidArray.h"
 #include "nsIRegion.h"
 
-#include "Xm/Xm.h"
+#include "X11/Xlib.h"
 
 #include "nsDeviceContextUnix.h"