diff --git a/gfx/src/gtk/nsRegionGTK.cpp b/gfx/src/gtk/nsRegionGTK.cpp
index ad98e8210f8d..5c36cdca528a 100644
--- a/gfx/src/gtk/nsRegionGTK.cpp
+++ b/gfx/src/gtk/nsRegionGTK.cpp
@@ -26,7 +26,7 @@ nsRegionGTK :: nsRegionGTK()
   NS_INIT_REFCNT();
   
   mRegion = nsnull;
-  mRegionType = eRegionType_empty;
+  mRegionType = eRegionComplexity_empty;
 }
 
 nsRegionGTK :: ~nsRegionGTK()
@@ -44,7 +44,7 @@ NS_IMPL_RELEASE(nsRegionGTK)
 nsresult nsRegionGTK :: Init(void)
 {
   mRegion = ::gdk_region_new();  //correct?
-  mRegionType = eRegionType_empty;
+  mRegionType = eRegionComplexity_empty;
   
   return NS_OK;
 }
@@ -157,7 +157,7 @@ void nsRegionGTK :: Subtract(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHe
 
 PRBool nsRegionGTK :: IsEmpty(void)
 {
-  if (mRegionType == eRegionType_empty)
+  if (mRegionType == eRegionComplexity_empty)
     return PR_TRUE;
 
   return PR_FALSE;
@@ -227,9 +227,9 @@ NS_IMETHODIMP nsRegionGTK :: GetRegionComplexity(nsRegionComplexity &aComplexity
 void nsRegionGTK :: SetRegionType()
 {
   if (::gdk_region_empty(mRegion) == TRUE)
-    mRegionType = eRegionType_empty;
+    mRegionType = eRegionComplexity_empty;
   else
-    mRegionType = eRegionType_rect ;
+    mRegionType = eRegionComplexity_rect ;
 }
 
 void nsRegionGTK :: SetRegionEmpty()
diff --git a/gfx/src/mac/nsRegionMac.cpp b/gfx/src/mac/nsRegionMac.cpp
index 98bfb56e06e8..cbd2eb36e822 100644
--- a/gfx/src/mac/nsRegionMac.cpp
+++ b/gfx/src/mac/nsRegionMac.cpp
@@ -27,7 +27,7 @@ nsRegionMac :: nsRegionMac()
   NS_INIT_REFCNT();
 
 	mRegion = nsnull;
-  mRegionType = eRegionType_empty;
+  mRegionType = eRegionComplexity_empty;
 }
 
 //---------------------------------------------------------------------
@@ -48,7 +48,7 @@ NS_IMPL_RELEASE(nsRegionMac)
 nsresult nsRegionMac :: Init(void)
 {
 	mRegion = ::NewRgn();
-  mRegionType = eRegionType_empty;
+  mRegionType = eRegionComplexity_empty;
 
   return NS_OK;
 }
@@ -168,7 +168,7 @@ RgnHandle	thergn;
 
 PRBool nsRegionMac :: IsEmpty(void)
 {
-  if (mRegionType == eRegionType_empty)
+  if (mRegionType == eRegionComplexity_empty)
     return PR_TRUE;
 	else
   	return PR_FALSE;
@@ -247,9 +247,9 @@ NS_IMETHODIMP nsRegionMac :: GetRegionComplexity(nsRegionComplexity &aComplexity
 void nsRegionMac :: SetRegionType()
 {
   if (::EmptyRgn(mRegion) == PR_TRUE)
-    mRegionType = eRegionType_empty;
+    mRegionType = eRegionComplexity_empty;
   else
-    mRegionType = eRegionType_rect ;
+    mRegionType = eRegionComplexity_rect ;
 }
 
 
diff --git a/gfx/src/motif/nsRegionMotif.cpp b/gfx/src/motif/nsRegionMotif.cpp
index 7702f7e14ed6..b81598ef4a3d 100644
--- a/gfx/src/motif/nsRegionMotif.cpp
+++ b/gfx/src/motif/nsRegionMotif.cpp
@@ -25,7 +25,7 @@ nsRegionMotif :: nsRegionMotif()
   NS_INIT_REFCNT();
 
   mRegion = nsnull;
-  mRegionType = eRegionType_empty;
+  mRegionType = eRegionComplexity_empty;
 }
 
 nsRegionMotif :: ~nsRegionMotif()
@@ -42,7 +42,7 @@ NS_IMPL_RELEASE(nsRegionMotif)
 nsresult nsRegionMotif :: Init(void)
 {
   mRegion = ::XCreateRegion();
-  mRegionType = eRegionType_empty;
+  mRegionType = eRegionComplexity_empty;
 
   return NS_OK;
 }
@@ -143,7 +143,7 @@ void nsRegionMotif :: Subtract(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 a
 
 PRBool nsRegionMotif :: IsEmpty(void)
 {
-  if (mRegionType == eRegionType_empty)
+  if (mRegionType == eRegionComplexity_empty)
     return PR_TRUE;
 
   return PR_FALSE;
@@ -207,9 +207,9 @@ NS_IMETHODIMP nsRegionMotif :: GetRegionComplexity(nsRegionComplexity &aComplexi
 void nsRegionMotif :: SetRegionType()
 {
   if (::XEmptyRegion(mRegion) == True)
-    mRegionType = eRegionType_empty;
+    mRegionType = eRegionComplexity_empty;
   else
-    mRegionType = eRegionType_rect ;
+    mRegionType = eRegionComplexity_rect ;
 }
 
 void nsRegionMotif :: SetRegionEmpty()