Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several updates

from the 0.1.0 branch.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 801b0ffe..e6a6a381 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -48,7 +48,7 @@ class CharDeleteConfirm : public ConfirmDialog
 {
     public:
         CharDeleteConfirm(CharSelectDialog *master);
-        void action(const std::string &eventId);
+        void action(const std::string& eventId, gcn::Widget* widget);
     private:
         CharSelectDialog *master;
 };
@@ -60,13 +60,13 @@ CharDeleteConfirm::CharDeleteConfirm(CharSelectDialog *m):
 {
 }
 
-void CharDeleteConfirm::action(const std::string &eventId)
+void CharDeleteConfirm::action(const std::string& eventId, gcn::Widget* widget)
 {
     //ConfirmDialog::action(eventId);
     if (eventId == "yes") {
         master->attemptCharDelete();
     }
-    ConfirmDialog::action(eventId);
+    ConfirmDialog::action(eventId, widget);
 }
 
 CharSelectDialog::CharSelectDialog(Network *network,
@@ -126,7 +126,7 @@ CharSelectDialog::CharSelectDialog(Network *network,
     updatePlayerInfo();
 }
 
-void CharSelectDialog::action(const std::string& eventId)
+void CharSelectDialog::action(const std::string& eventId, gcn::Widget* widget)
 {
     if (eventId == "ok" && n_character > 0)
     {
@@ -284,7 +284,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
     setLocationRelativeTo(getParent());
 }
 
-void CharCreateDialog::action(const std::string& eventId)
+void CharCreateDialog::action(const std::string& eventId, gcn::Widget* widget)
 {
     if (eventId == "create") {
         if (getName().length() >= 4) {