From 923e735698a357f90b955e5778d9a73d667c0463 Mon Sep 17 00:00:00 2001
From: "reed@reedloden.com" <reed@reedloden.com>
Date: Sat, 26 Jan 2008 21:11:15 -0800
Subject: [PATCH] Bug 408578 - "gtk: combobox pushed state" (Don't forget
 editable menulists) [p=frnchfrgg-mozbugs@altern.org (RIVAUD Julien
 [_FrnchFrgg_]) r=Ventron sr=roc a1.9=schrep]

---
 toolkit/content/widgets/menulist.xml | 3 ++-
 widget/src/gtk2/nsNativeThemeGTK.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/toolkit/content/widgets/menulist.xml b/toolkit/content/widgets/menulist.xml
index 53ca88a36b6a..31a2d6b1c769 100644
--- a/toolkit/content/widgets/menulist.xml
+++ b/toolkit/content/widgets/menulist.xml
@@ -409,7 +409,8 @@
         <html:input class="menulist-editable-input" flex="1" anonid="input" allowevents="true"
                     xbl:inherits="value=label,value,disabled,tabindex,readonly"/>
       </xul:hbox>
-      <xul:dropmarker class="menulist-dropmarker" type="menu"/>
+      <xul:dropmarker class="menulist-dropmarker" type="menu"
+          xbl:inherits="open"/>
       <children includes="menupopup"/>
     </content>
 
diff --git a/widget/src/gtk2/nsNativeThemeGTK.cpp b/widget/src/gtk2/nsNativeThemeGTK.cpp
index 4e75f6923b8f..cec41e1a5901 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.cpp
+++ b/widget/src/gtk2/nsNativeThemeGTK.cpp
@@ -330,7 +330,8 @@ nsNativeThemeGTK::GetGtkWidgetAndState(PRUint8 aWidgetType, nsIFrame* aFrame,
             aWidgetType == NS_THEME_TOOLBAR_BUTTON ||
             aWidgetType == NS_THEME_TOOLBAR_DUAL_BUTTON ||
             aWidgetType == NS_THEME_TOOLBAR_BUTTON_DROPDOWN ||
-            aWidgetType == NS_THEME_DROPDOWN) {
+            aWidgetType == NS_THEME_DROPDOWN ||
+            aWidgetType == NS_THEME_DROPDOWN_BUTTON) {
           if (aWidgetType == NS_THEME_TOOLBAR_BUTTON_DROPDOWN)
             aFrame = aFrame->GetParent();