< prev index next >
src/java.desktop/windows/classes/sun/awt/windows/WDialogPeer.java
Print this page
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -31,18 +31,10 @@
import sun.awt.im.*;
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);
InputMethodManager imm = InputMethodManager.getInstance();
String menuString = imm.getTriggerMenuString();
@@ -63,15 +55,10 @@
native void endModal();
@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) {
setTitle(target.getTitle());
@@ -131,23 +118,10 @@
} else {
reshapeFrame(x, y, width, height);
}
}
- /* 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);
}
}
< prev index next >