Author: brunowolff
Date: Wed Mar 19 16:28:14 2008
New Revision: 24818
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24818&view=rev
Log:
Silence gcc 4.3 warning about && and || by ading parens.
Modified:
trunk/src/construct_dialog.cpp
Modified: trunk/src/construct_dialog.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/construct_dialog.cpp?rev=24818&r1=24817&r2=24818&view=diff
==============================================================================
--- trunk/src/construct_dialog.cpp (original)
+++ trunk/src/construct_dialog.cpp Wed Mar 19 16:28:14 2008
@@ -706,7 +706,7 @@
const bool use_text_input = (text_widget_!=NULL);
const bool has_input = (use_menu||use_text_input);//input of any sort
has to be made
- if((!info.key_down && info.key[SDLK_RETURN] || info.key[SDLK_KP_ENTER]
|| info.double_clicked) &&
+ if(((!info.key_down && info.key[SDLK_RETURN]) ||
info.key[SDLK_KP_ENTER] || info.double_clicked) &&
(type_ == YES_NO || type_ == OK_CANCEL || type_ == OK_ONLY || type_
== CLOSE_ONLY)) {
return (use_menu ? menu_->selection() : 0);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
