--- old/src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java 2016-04-23 00:01:38.940139000 +0530 +++ new/src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java 2016-04-23 00:01:38.647993000 +0530 @@ -33,14 +33,6 @@ final class WDialogPeer extends WWindowPeer implements DialogPeer { // Toolkit & peer internals - // Platform default background for dialogs. Gets set on target if - // target has none explicitly specified. - static final Color defaultBackground = SystemColor.control; - - // If target doesn't have its background color set, we set its - // background to platform default. - boolean needDefaultBackground; - WDialogPeer(Dialog target) { super(target); @@ -65,12 +57,7 @@ @Override void initialize() { Dialog target = (Dialog)this.target; - // Need to set target's background to default _before_ a call - // to super.initialize. - if (needDefaultBackground) { - target.setBackground(defaultBackground); - } - + super.initialize(); if (target.getTitle() != null) { @@ -133,19 +120,6 @@ } } - /* Native create() peeks at target's background and if it's null - * calls this method to arrage for default background to be set on - * target. Can't make the check in Java, since getBackground will - * return owner's background if target has none set. - */ - private void setDefaultColor() { - // Can't call target.setBackground directly, since we are - // called on toolkit thread. Can't schedule a Runnable on the - // EventHandlerThread because of the race condition. So just - // set a flag and call target.setBackground in initialize. - needDefaultBackground = true; - } - native void pSetIMMOption(String option); void notifyIMMOptionChange(){ InputMethodManager.getInstance().notifyChangeRequest((Component)target);