You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/09/03 17:22:06 UTC
svn commit: r810989 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: Dialog.java
MenuPopup.java Sheet.java
Author: gbrown
Date: Thu Sep 3 15:22:03 2009
New Revision: 810989
URL: http://svn.apache.org/viewvc?rev=810989&view=rev
Log:
Ensure that Dialog, MenuPopup, and Sheet correctly report the closing state of the base class after their own close events have been approved.
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java?rev=810989&r1=810988&r2=810989&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java Thu Sep 3 15:22:03 2009
@@ -176,11 +176,12 @@
if (vote == Vote.APPROVE) {
super.close();
+ closing = super.isClosing();
+
if (isClosed()) {
this.result = result;
modal = false;
- closing = false;
// Move the owner to the front
Window owner = getOwner();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java?rev=810989&r1=810988&r2=810989&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java Thu Sep 3 15:22:03 2009
@@ -150,8 +150,9 @@
if (vote == Vote.APPROVE) {
super.close();
+ closing = super.isClosing();
+
if (isClosed()) {
- closing = false;
menuPopupStateListeners.menuPopupClosed(this);
}
} else if (vote == Vote.DENY){
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java?rev=810989&r1=810988&r2=810989&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java Thu Sep 3 15:22:03 2009
@@ -133,11 +133,11 @@
if (vote == Vote.APPROVE) {
super.close();
+ closing = super.isClosing();
+
if (isClosed()) {
this.result = result;
- closing = false;
-
// Move the owner to the front
Window owner = getOwner();
if (owner.isOpen()) {