From ca28f4cdd83899c11bba036a1a554a912839f145 Mon Sep 17 00:00:00 2001 From: irengrig Date: Tue, 22 Dec 2009 14:53:02 +0300 Subject: [PATCH] Progress window: correctly set cancle button text, r=sleaner --- .../src/com/intellij/openapi/progress/util/ProgressWindow.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java index 0900e9fb8a..89a85a68ab 100644 --- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java +++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java @@ -102,7 +102,6 @@ public class ProgressWindow extends BlockingProgressIndicator implements Disposa else { myDialog = new MyDialog(shouldShowBackground, myProject, myCancelText); } - myDialog.changeCancelButtonText(myCancelText); Disposer.register(this, myDialog); @@ -494,6 +493,9 @@ public class ProgressWindow extends BlockingProgressIndicator implements Disposa private void createCenterPanel() { // Cancel button (if any) + if (myCancelText != null) { + myCancelButton.setText(myCancelText); + } myCancelButton.setVisible(myShouldShowCancel); myBackgroundButton.setVisible(myShouldShowBackground); -- 2.11.4.GIT