From 7365f367e74a1353a6254d8e3adedf52f1b5bdb2 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 21 Mar 2010 18:50:22 -0600 Subject: Make TextDialog send an appropriate event for cancel Reviewed-by: Chuck Miller --- src/gui/textdialog.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/gui/textdialog.cpp') diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp index b33b664b..120780fe 100644 --- a/src/gui/textdialog.cpp +++ b/src/gui/textdialog.cpp @@ -78,21 +78,14 @@ TextDialog::~TextDialog() void TextDialog::action(const gcn::ActionEvent &event) { - setActionEventId(event.getId()); - distributeActionEvent(); + if (event.getId() == "CANCEL") + setActionEventId("~" + getActionEventId()); - if (event.getId() == "CANCEL" || event.getSource() == mOkButton) - { - scheduleDelete(); - } + distributeActionEvent(); + scheduleDelete(); } const std::string &TextDialog::getText() const { return mTextField->getText(); } - -void TextDialog::setOKButtonActionId(const std::string &name) -{ - mOkButton->setActionEventId(name); -} -- cgit v1.2.3-70-g09d2