diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-01-14 16:45:13 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-01-14 16:45:13 +0000 |
commit | d1395845cdc678db2a71326f2e6f20253ed14cac (patch) | |
tree | 9a75fe0591fc7bd74f828aa048aa027f59a4ae66 /src/gui/npclistdialog.cpp | |
parent | 6c3a2550813c14290307f2ad91e1d76eea3e6a02 (diff) | |
download | mana-client-d1395845cdc678db2a71326f2e6f20253ed14cac.tar.gz mana-client-d1395845cdc678db2a71326f2e6f20253ed14cac.tar.bz2 mana-client-d1395845cdc678db2a71326f2e6f20253ed14cac.tar.xz mana-client-d1395845cdc678db2a71326f2e6f20253ed14cac.zip |
Merged 0.0 changes from revision 2988 to 3035 to trunk.
Diffstat (limited to 'src/gui/npclistdialog.cpp')
-rw-r--r-- | src/gui/npclistdialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp index d1c3ddcb..1bcdc8ff 100644 --- a/src/gui/npclistdialog.cpp +++ b/src/gui/npclistdialog.cpp @@ -50,7 +50,7 @@ NpcListDialog::NpcListDialog(): cancelButton->getX() - 5 - okButton->getWidth(), cancelButton->getY()); - mItemList->setEventId("item"); + mItemList->setActionEventId("item"); mItemList->addActionListener(this); @@ -91,11 +91,11 @@ NpcListDialog::reset() } void -NpcListDialog::action(const std::string &eventId, gcn::Widget *widget) +NpcListDialog::action(const gcn::ActionEvent &event) { int choice = 0; - if (eventId == "ok") + if (event.getId() == "ok") { // Send the selected index back to the server int selectedIndex = mItemList->getSelected(); @@ -104,7 +104,7 @@ NpcListDialog::action(const std::string &eventId, gcn::Widget *widget) choice = selectedIndex + 1; } } - else if (eventId == "cancel") + else if (event.getId() == "cancel") { choice = 0xff; // 0xff means cancel } |