summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-04-29 10:43:50 +0200
committerRémi Verschelde <remi@verschelde.fr>2016-04-29 10:43:50 +0200
commita0dce1e66fbd3d20ee851abc76a85e96b3db0d13 (patch)
tree608ffac218e0cb3fae0fcf74fb9dea38248f9d93 /scene
parentc97cc362e381137bd8198b7a6a7084b842ac1c59 (diff)
parent5c61e17c103f4f9fc391b2152fdf3dad0f44bd00 (diff)
Merge pull request #4482 from Geequlim/master
Add more documentations and fix AcceptDialog::add_cancel
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/dialogs.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index d00dacd256..51242d89bd 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -285,7 +285,7 @@ Button* AcceptDialog::add_cancel(const String &p_cancel) {
String c = p_cancel;
if (p_cancel=="")
c="Cancel";
- Button *b = swap_ok_cancel ? add_button("Cancel",true) : add_button("Cancel");
+ Button *b = swap_ok_cancel ? add_button(c,true) : add_button(c);
b->connect("pressed",this,"_closed");
return b;
}