fdo#58995 Fix focus gained/lost event dropping for Window and Frame

See 9fd9b14cffbf2604022c099b6202bb0a1da6f06e for more details.

Change-Id: Iea92076be8cbcc110deff3c617ee13bbd66aab79

3 files changed, 58 insertions, 0 deletions

diff --git a/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java b/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
index 404569fb23ca..a23967ca9dd9 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
@@ -99,4 +99,16 @@ public class ComboBox extends Container {
             return 1;
         }
     }
+
+    /**
+     * Returns whether this Component can be focused.
+     *
+     * @return <code>true</code> if this Component is focusable;
+     *         <code>false</code> otherwise.
+     * @see #setFocusable
+     * @since 1.4
+     */
+    public boolean isFocusable() {
+        return true;
+    }
 }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
index 7ea0877c05ec..fe927cbc1670 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
@@ -632,5 +632,28 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
             unoAccessibleComponent.grabFocus();
         }
     }
+
+    /**
+     * Determines whether this component is displayable. A component is
+     * displayable when it is connected to a native screen resource.
+     * <p>
+     * A component is made displayable either when it is added to
+     * a displayable containment hierarchy or when its containment
+     * hierarchy is made displayable.
+     * A containment hierarchy is made displayable when its ancestor
+     * window is either packed or made visible.
+     * <p>
+     * A component is made undisplayable either when it is removed from
+     * a displayable containment hierarchy or when its containment hierarchy
+     * is made undisplayable.  A containment hierarchy is made
+     * undisplayable when its ancestor window is disposed.
+     *
+     * @return <code>true</code> if the component is displayable
+     */
+    @Override
+    public boolean isDisplayable() {
+        return true;
+    }
+
 }
 
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Window.java b/accessibility/bridge/org/openoffice/java/accessibility/Window.java
index da4249a07e11..137818ec10d5 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Window.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Window.java
@@ -537,5 +537,28 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
             unoAccessibleComponent.grabFocus();
         }
     }
+
+    /**
+     * Determines whether this component is displayable. A component is
+     * displayable when it is connected to a native screen resource.
+     * <p>
+     * A component is made displayable either when it is added to
+     * a displayable containment hierarchy or when its containment
+     * hierarchy is made displayable.
+     * A containment hierarchy is made displayable when its ancestor
+     * window is either packed or made visible.
+     * <p>
+     * A component is made undisplayable either when it is removed from
+     * a displayable containment hierarchy or when its containment hierarchy
+     * is made undisplayable.  A containment hierarchy is made
+     * undisplayable when its ancestor window is disposed.
+     *
+     * @return <code>true</code> if the component is displayable
+     */
+    @Override
+    public boolean isDisplayable() {
+        return true;
+    }
+
 }