Follow up to Issue #1578 - Preprocess the popup binding

toolkit/content/jar.mn

@@ -96,7 +96,7 @@ toolkit.jar:
    content/global/bindings/menulist.xml        (widgets/menulist.xml)
    content/global/bindings/notification.xml    (widgets/notification.xml)
    content/global/bindings/numberbox.xml       (widgets/numberbox.xml)
-   content/global/bindings/popup.xml           (widgets/popup.xml)
+*  content/global/bindings/popup.xml           (widgets/popup.xml)
 *  content/global/bindings/preferences.xml     (widgets/preferences.xml)
    content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)
    content/global/bindings/radio.xml           (widgets/radio.xml)

toolkit/content/widgets/popup.xml

@@ -25,14 +25,21 @@
         </getter>
       </property>
 
+#ifdef MOZ_WIDGET_GTK
       <property name="state" readonly="true">
-        <getter><![CDATA[
+        <getter>
+        <![CDATA[
           if (this.hasAttribute('_moz-nativemenupopupstate'))
             return this.getAttribute('_moz-nativemenupopupstate');
           else
             return this.popupBoxObject.popupState;
-        ]]></getter>
+        ]]>
+        </getter>
       </property>
+#else
+      <property name="state" readonly="true"
+                onget="return this.popupBoxObject.popupState"/>
+#endif
 
       <property name="triggerNode" readonly="true"
                 onget="return this.popupBoxObject.triggerNode"/>