From a381accd121a37710ebdf1925973e0e7d628c72f Mon Sep 17 00:00:00 2001
From: Ian Neal <iann_cvs@blueyonder.co.uk>
Date: Tue, 8 Sep 2009 21:24:29 +0100
Subject: [PATCH] Bug 514854 - Default theme issues with some menulists
 r/sr=neil a-sm2.0=kairo

---
 editor/ui/dialogs/content/EdImageOverlay.xul  | 20 ++++++++++++++-----
 suite/common/pref/pref-search.xul             |  3 ++-
 .../classic/communicator/communicator.css     |  6 ++++++
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/editor/ui/dialogs/content/EdImageOverlay.xul b/editor/ui/dialogs/content/EdImageOverlay.xul
index 7459b1e0aa..a03af0b480 100644
--- a/editor/ui/dialogs/content/EdImageOverlay.xul
+++ b/editor/ui/dialogs/content/EdImageOverlay.xul
@@ -259,12 +259,22 @@
         <caption id="alignLabel" label="&alignment.label;"/>
         <menulist id="alignTypeSelect" class="align-menu">
           <menupopup>
-            <menuitem class="align-menu" value="top"    label="&topPopup.value;"/>
-            <menuitem class="align-menu" value="middle" label="&centerPopup.value;"/>
-            <menuitem class="align-menu" value="bottom" label="&bottomPopup.value;"/>
+            <menuitem class="align-menu menuitem-iconic"
+                      value="top"
+                      label="&topPopup.value;"/>
+            <menuitem class="align-menu menuitem-iconic"
+                      value="middle"
+                      label="&centerPopup.value;"/>
+            <menuitem class="align-menu menuitem-iconic"
+                      value="bottom"
+                      label="&bottomPopup.value;"/>
             <!-- HTML attribute value is opposite of the button label on purpose -->
-            <menuitem class="align-menu" value="right"  label="&wrapLeftPopup.value;"/>
-            <menuitem class="align-menu" value="left"   label="&wrapRightPopup.value;"/>
+            <menuitem class="align-menu menuitem-iconic"
+                      value="right"
+                      label="&wrapLeftPopup.value;"/>
+            <menuitem class="align-menu menuitem-iconic"
+                      value="left"
+                      label="&wrapRightPopup.value;"/>
           </menupopup>
         </menulist>
       </groupbox>
diff --git a/suite/common/pref/pref-search.xul b/suite/common/pref/pref-search.xul
index 5634a47e4c..dea9887f2a 100755
--- a/suite/common/pref/pref-search.xul
+++ b/suite/common/pref/pref-search.xul
@@ -77,7 +77,8 @@
                   preference="browser.search.defaultengine">
           <template>
             <menupopup>
-              <menuitem value="..."
+              <menuitem class="menuitem-iconic"
+                        value="..."
                         uri="..."
                         image="rdf:http://home.netscape.com/NC-rdf#Icon"
                         label="rdf:http://home.netscape.com/NC-rdf#Name"/>
diff --git a/suite/themes/classic/communicator/communicator.css b/suite/themes/classic/communicator/communicator.css
index 5b703cf5ee..fd8669d3b1 100644
--- a/suite/themes/classic/communicator/communicator.css
+++ b/suite/themes/classic/communicator/communicator.css
@@ -101,6 +101,12 @@
   margin: 0px !important;
 }
 
+/* ::::: iconic menuitems ::::: */
+
+menuitem.menuitem-iconic > .menu-iconic-left {
+  display: -moz-box;
+}
+
 /* ::::: download manager ::::: */
 
 #downloadView > treechildren::-moz-tree-image(Name) {