--- jdk/src/solaris/classes/sun/awt/X11/XContentWindow.java	2012-08-29 01:15:20.000000000 +0200
+++ jdk-mod/src/solaris/classes/sun/awt/X11/XContentWindow.java	2013-02-21 00:20:45.174245553 +0100
@@ -184,4 +184,33 @@
     public String toString() {
         return getClass().getName() + "[" + getBounds() + "]";
     }
+
+    public void dispatchEvent(XEvent ev) {
+        int type = ev.get_type();
+        
+        switch (type)
+        {
+          case XConstants.FocusIn:
+          case XConstants.FocusOut:
+              System.out.println("DISPATCHING FOCUS ON CONTENT WINDOW");
+              handleFocusEvent(ev);
+              break;
+        }
+        super.dispatchEvent(ev);
+    }
+
+    public void handleFocusEvent(XEvent xev) {
+        int type = xev.get_type();
+        
+        switch (type)
+        {
+          case XConstants.FocusIn:
+          case XConstants.FocusOut:
+              System.out.println("HANDLING FOCUS EVENT ON CONTENT WINDOW");
+              break;
+        }
+        
+        parentFrame.handleFocusEvent(xev);
+    }
+
 }