From 7baf7d2696642fbb99afc0029878f5d077577726 Mon Sep 17 00:00:00 2001
From: "neil@parkwaycc.co.uk" <neil@parkwaycc.co.uk>
Date: Tue, 8 Apr 2008 01:41:52 -0700
Subject: [PATCH] Bug 425564 colorpicker's "disabled" property has no effect
 r=Enn a=beltzner

---
 toolkit/content/tests/widgets/test_colorpicker_popup.xul | 4 +++-
 toolkit/content/widgets/colorpicker.xml                  | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/toolkit/content/tests/widgets/test_colorpicker_popup.xul b/toolkit/content/tests/widgets/test_colorpicker_popup.xul
index 8365f42670fc..477de14a2080 100644
--- a/toolkit/content/tests/widgets/test_colorpicker_popup.xul
+++ b/toolkit/content/tests/widgets/test_colorpicker_popup.xul
@@ -14,7 +14,7 @@
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>      
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>      
 
-<colorpicker id="colorpicker-popup" type="button" color="#FF0000"/>
+<colorpicker id="colorpicker-popup" type="button" color="#FF0000" tabindex="1"/>
 
 <script class="testbody" type="application/javascript">
 <![CDATA[
@@ -28,6 +28,8 @@ function runTests()
 {
   gCp = document.getElementById("colorpicker-popup");
   is(gCp.color, "#FF0000", "popup color is initialized");
+  is(gCp.tabIndex, 1, "button tabindex is initialized");
+  is(gCp.disabled, false, "button is not disabled");
 
   goNext();
 }
diff --git a/toolkit/content/widgets/colorpicker.xml b/toolkit/content/widgets/colorpicker.xml
index c415f992284d..f5e2703f9117 100644
--- a/toolkit/content/widgets/colorpicker.xml
+++ b/toolkit/content/widgets/colorpicker.xml
@@ -409,7 +409,8 @@
     </handlers>
   </binding>
 
-  <binding id="colorpicker-button" extends="xul:menu">
+  <binding id="colorpicker-button" display="xul:menu"
+           extends="chrome://global/content/bindings/general.xml#basecontrol">
     <resources>
       <stylesheet src="chrome://global/skin/colorpicker.css"/>
     </resources>
@@ -427,7 +428,7 @@
       </xul:panel>
     </content>
     
-    <implementation implements="nsIAccessibleProvider, nsIDOMXULControlElement">
+    <implementation implements="nsIAccessibleProvider">
       <property name="accessibleType" readonly="true">
         <getter>
           <![CDATA[