diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-30 01:34:16 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 20:00:07 +0100 |
| commit | 1b1050da1c7b84cc72b7efbb2229294975be9e10 (patch) | |
| tree | 68d15ccb015d58aeb5797ffd06efca3e55997c24 /src/gui/npcstringdialog.cpp | |
| parent | 0d4142a891cd228da24ee3aa3bbd7dc622da5b75 (diff) | |
| parent | 955a7613d1fe116fe5e1da07a222b6849b3c885c (diff) | |
| download | mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.gz mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.bz2 mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.xz mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.zip | |
Merged with Aethyra master as of 2009-01-27
Conflicts:
Almost everywhere.
Diffstat (limited to 'src/gui/npcstringdialog.cpp')
| -rw-r--r-- | src/gui/npcstringdialog.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp index 1c92d620..ccb3c411 100644 --- a/src/gui/npcstringdialog.cpp +++ b/src/gui/npcstringdialog.cpp @@ -42,8 +42,8 @@ NpcStringDialog::NpcStringDialog(): cancelButton = new Button(_("Cancel"), "cancel", this); place(0, 0, mValueField, 3); - place(1, 1, okButton); - place(2, 1, cancelButton); + place(1, 1, cancelButton); + place(2, 1, okButton); reflowLayout(175, 0); setLocationRelativeTo(getParent()); @@ -69,6 +69,7 @@ void NpcStringDialog::action(const gcn::ActionEvent &event) setVisible(false); current_npc->stringInput(mValueField->getText()); current_npc = 0; + mValueField->setText(""); } bool NpcStringDialog::isInputFocused() |