Author: sapient
Date: Sat Jun 2 10:27:01 2007
New Revision: 18010
URL: http://svn.gna.org/viewcvs/wesnoth?rev=18010&view=rev
Log:
fix a (very minor) glitch in r18009
Modified:
branches/1.2/src/multiplayer.cpp
branches/1.2/src/show_dialog.cpp
branches/1.2/src/show_dialog.hpp
Modified: branches/1.2/src/multiplayer.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.2/src/multiplayer.cpp?rev=18010&r1=18009&r2=18010&view=diff
==============================================================================
--- branches/1.2/src/multiplayer.cpp (original)
+++ branches/1.2/src/multiplayer.cpp Sat Jun 2 10:27:01 2007
@@ -108,7 +108,7 @@
} else {
result_ = "invalid";
}
- return gui::dialog_button_action::CLOSE_DIALOG;
+ return gui::dialog_button_action::SAVE_TEXT;
}
display& disp_;
Modified: branches/1.2/src/show_dialog.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.2/src/show_dialog.cpp?rev=18010&r1=18009&r2=18010&view=diff
==============================================================================
--- branches/1.2/src/show_dialog.cpp (original)
+++ branches/1.2/src/show_dialog.cpp Sat Jun 2 10:27:01 2007
@@ -820,6 +820,9 @@
}
} else if(res ==
dialog_button_action::CLOSE_DIALOG) {
return -1;
+ } else if(res ==
dialog_button_action::SAVE_TEXT) {
+ *text_widget_text = text_widget.text();
+ return -1;
}
//reset button-tracking flags so that if the
action displays a dialog, a button-press
Modified: branches/1.2/src/show_dialog.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.2/src/show_dialog.hpp?rev=18010&r1=18009&r2=18010&view=diff
==============================================================================
--- branches/1.2/src/show_dialog.hpp (original)
+++ branches/1.2/src/show_dialog.hpp Sat Jun 2 10:27:01 2007
@@ -83,7 +83,7 @@
public:
virtual ~dialog_button_action() {}
- enum RESULT { DELETE_ITEM, NO_EFFECT, CLOSE_DIALOG };
+ enum RESULT { DELETE_ITEM, NO_EFFECT, CLOSE_DIALOG, SAVE_TEXT };
virtual RESULT button_pressed(int menu_selection) = 0;
};
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
