upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-07 10:51:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #7810

Browse Source 
*The widget doesn't fall out of scope till after the game is played, so
  before the game starts call set_focus(false)
This commit is contained in:
uid68698 2004-02-20 10:14:19 +00:00
parent 671d1ce61b
commit 49a3ea926b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -1333,7 +1333,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
PACKAGE=wesnoth PACKAGE=wesnoth
MAJOR_VERSION="0" MAJOR_VERSION="0"
MINOR_VERSION="6" MINOR_VERSION="6"
MICRO_VERSION="99.3" MICRO_VERSION="99.4-CVS"
if test "x$MICRO_VERSION" = "x"; then if test "x$MICRO_VERSION" = "x"; then
VERSION=$MAJOR_VERSION.$MINOR_VERSION VERSION=$MAJOR_VERSION.$MINOR_VERSION

2
src/multiplayer.cpp
View File

@ -30,6 +30,7 @@
#include "widgets/combo.hpp" #include "widgets/combo.hpp"
#include "widgets/menu.hpp" #include "widgets/menu.hpp"
#include "widgets/slider.hpp" #include "widgets/slider.hpp"
#include "widgets/widget.hpp"
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
@ -196,6 +197,7 @@ int play_multiplayer(display& disp, game_data& units_data, config cfg,
if(launch_game.process(mousex,mousey,left_button)) { if(launch_game.process(mousex,mousey,left_button)) {
if(name_entry.text().empty() == false) { if(name_entry.text().empty() == false) {
//Connector //Connector
name_entry.set_focus(false);
mp_connect connector(disp, name_entry.text(), cfg, units_data, state); mp_connect connector(disp, name_entry.text(), cfg, units_data, state);
const int res = connector.load_map(maps_menu.selection(), cur_turns, cur_villagegold, fog_game.checked(), shroud_game.checked()); const int res = connector.load_map(maps_menu.selection(), cur_turns, cur_villagegold, fog_game.checked(), shroud_game.checked());

2
src/widgets/textbox.hpp
View File

@ -34,8 +34,6 @@ public:
void set_text(std::string text); void set_text(std::string text);
void clear(); void clear();
void set_focus(bool new_focus);
protected: protected:
using widget::bg_restore; using widget::bg_restore;
using widget::update; using widget::update;