More fixes for the motif toolkit. Bug #22266

gfx/src/motif/nsFontMetricsMotif.cpp

@@ -53,7 +53,7 @@ nsFontMetricsMotif :: ~nsFontMetricsMotif()
 
 NS_IMPL_ISUPPORTS(nsFontMetricsMotif, kIFontMetricsIID)
 
-NS_IMETHODIMP nsFontMetricsMotif :: Init(const nsFont& aFont, nsIAtom* aLangGroup, nsIDeviceContext* aContext)
+NS_IMETHODIMP nsFontMetricsMotif :: Init(const nsFont& aFont, nsIAtom* aLangGroup, nsIDeviceContext* aCX)
 {
   NS_ASSERTION(!(nsnull == aCX), "attempt to init fontmetrics with null device context");
 

gfx/src/motif/nsFontMetricsMotif.h

@@ -29,6 +29,8 @@
 #include "nsUnitConversion.h"
 #include "nsIDeviceContext.h"
 #include "nsCRT.h"
+#include "nsIAtom.h"
+#include "nsCOMPtr.h"
 
 #include "X11/Xlib.h"
 
@@ -43,7 +45,7 @@ public:
   NS_DECL_ISUPPORTS
 
   NS_IMETHOD  Init(const nsFont& aFont, nsIAtom* aLangGroup,
-                   nsIDeviceContext* aContext);
+                   nsIDeviceContext* aCX);
   NS_IMETHOD  Destroy();
 
   NS_IMETHOD  GetXHeight(nscoord& aResult);