fixed problems in .cfg files

data/scenarios/Bay_of_Pearls.cfg

@@ -608,7 +608,7 @@ The main cage where they keep most of the mermen is in the south-east!"
 		[message]
 		id=msg3_30a
 		description=Delfador
-		message="It is north-west of here, a few leagues inland. There are two ways to go, by ship or on foot. Each has its own dangers. You must choose between them.
+		message="It is north-west of here, a few leagues inland. There are two ways to go, by ship or on foot. Each has its own dangers. You must choose between them."
 			[option]
 			id=msg3_30_optiona
 			message="Ships? Ugh! I have been sea sick for the last time. We shall walk!"
@@ -616,7 +616,7 @@ The main cage where they keep most of the mermen is in the south-east!"
 					[message]
 					id=msg3_30_farewell
 					description=Delfador
-					message="Safe journey to you, Konrad. Until we meet again!
+					message="Safe journey to you, Konrad. Until we meet again!"
 					[/message]
 				[/command]
 				[command]
@@ -640,7 +640,7 @@ The main cage where they keep most of the mermen is in the south-east!"
 					[message]
 					id=msg3_30_farewella
 					description=Delfador
-					message="Safe voyage to you then, Konrad. May the weather be fair.
+					message="Safe voyage to you then, Konrad. May the weather be fair."
 					[/message]
 				[/command]
 				[command]
@@ -751,27 +751,27 @@ The main cage where they keep most of the mermen is in the south-east!"
 				[message]
 				id=msg3_33
 				description=Konrad
-				message="Delfador, thank goodness you have survived! This has been a tough battle, but why can we not finish it? Why must we leave?
+				message="Delfador, thank goodness you have survived! This has been a tough battle, but why can we not finish it? Why must we leave?"
 				[/message]
 				[message]
 				id=msg3_34
 				description=Delfador
-				message="I bear ill tidings. Asheviere has now laid siege to Elensefar, breaking the century-old treaty between Wesnoth and the Elense city-state. If the city falls, there is no telling how many other lands she may swallow up!
+				message="I bear ill tidings. Asheviere has now laid siege to Elensefar, breaking the century-old treaty between Wesnoth and the Elense city-state. If the city falls, there is no telling how many other lands she may swallow up!"
 				[/message]
 				[message]
 				id=msg3_35
 				description=Konrad
-				message="I must do this? But you are coming with me, aren't you, Delfador?
+				message="I must do this? But you are coming with me, aren't you, Delfador?"
 				[/message]
 				[message]
 				id=msg3_36
 				description=Delfador
-				message="I am afraid not, Konrad. I have found some important documents that need seeing to. I must ride at once to make council with the Elves. I will meet you in Elensefar, after you have secured it.
+				message="I am afraid not, Konrad. I have found some important documents that need seeing to. I must ride at once to make council with the Elves. I will meet you in Elensefar, after you have secured it."
 				[/message]
 				[message]
 				id=msg3_37
 				description=Konrad
-				message="I fear I will struggle to do this on my own...but what must be must be. How do I get to Elensefar?
+				message="I fear I will struggle to do this on my own...but what must be must be. How do I get to Elensefar?"
 				[/message]
 				[/command]
 

data/scenarios/The_Lost_General.cfg

@@ -112,7 +112,7 @@ Defeat:
 		[/message]
 		[message]
 		description=Delfador
-		message=Underground roads once led to the differents parts of the complex, but now everything lies in ruins."
+		message="Underground roads once led to the differents parts of the complex, but now everything lies in ruins."
 		id=msg13_2
 		[/message]
 	[/event]

data/scenarios/The_Siege_of_Elensefar.cfg

@@ -163,7 +163,7 @@ Defeat:
 		[message]
 		id=msg5_7
 		speaker=narrator
-		message="In the night, three dark figures creep out of the forest
+		message="In the night, three dark figures creep out of the forest."
 		[/message]
 		[message]
 		id=msg5_8
@@ -196,7 +196,7 @@ Defeat:
 					[message]
 					id=msg5_13a
 					description=Gamlel
-					message="We will serve you well, for we respect the help you are providing to our city. You shall find that there is honor, even among thieves.
+					message="We will serve you well, for we respect the help you are providing to our city. You shall find that there is honor, even among thieves."
 					[/message]
 					[set_variable]
 					name=have_thieves

data/translations/hungarian.cfg

@@ -16,7 +16,7 @@ Vesz
 #Konrad elesik
 #Delfador elesik
 #Kalenz elesik
-#Körök számát túlléped[?]"
+#Körök számát túlléped(?)"
 DwarvishRunemaster="Dwarvish Runemaster"
 DwarvishRunemaster_description="The mighty dwarvish runemasters are fearsome and sturdy warriors who have harnessed the secret powers of the dwarven runes. Their beloved and cautiosly crafted hammers creep with magic energy, sending lightning bolts at their enemies when their masters hit the ground."
 DwarvishSteelclad="Dwarvish Steelclad"
@@ -37,13 +37,13 @@ Vesz
 #Delfador elesik
 #Kalenz elesik
 #Li'sar elesik
-#Körök számát túlléped[?]"
+#Körök számát túlléped(?)"
 High_King_at_Sea="High King at Sea"
 Isle_of_the_Damned="Isle of the Damned"
 Isle_of_the_Damned_objectives="Gyõzöl, ha:
 @Legyõzted valamennyi ellenséges sereg vezérét
 @Kitartasz a megszabott idõ leteltéig
-@Resist until the end of the turns[?]
+@Resist until the end of the turns(?)
 Veszítesz, ha:
 #Konrad elesik"
 Mages_And_Elves="Mages and Elves"
@@ -625,7 +625,7 @@ ability_night vision="
 ability_regenerates="regeneráció" 
 ability_skirmisher="portyázó" 
 ability_teleport="teleportáció"
-abort_game_message="Félbehagyod?[?]"
+abort_game_message="Félbehagyod?(?)"
 about_button="Rólunk"
 action_accelerated="fürgébb"
 action_cycle="Váltás az egységek között"
@@ -655,7 +655,7 @@ action_unitlist="Egys
 action_zoomdefault="Alapértelmezett nagyítás"
 action_zoomin="Nagyítás"
 action_zoomout="Kicsinyítés"
-advance_unit_heading="Elõrenyomulás[?]"
+advance_unit_heading="Elõrenyomulás(?)"
 advance_unit_message="Hová fejlõdjön ez a gyõzedelmes csapat?"
 ai_controlled="Gép"
 ai_players="Gép kontra Gép"
@@ -1163,7 +1163,7 @@ scenario="K
 scroll_speed="Görgetés érzékenysége:"
 set_hotkey="Nyomd le a kívánt billentyût"
 show_replay="A csata menetének mutatása"
-shroud="Köd[?]"
+shroud="Köd(?)"
 status_table="Adatlap"
 A_Choice_Must_Be_Made="A Choice Must Be Made"
 A_Choice_Must_Be_Made_objectives="Gyõzöl, ha:
@@ -1613,7 +1613,7 @@ weapon_name_magic="m
 weapon_name_missile="lövedék" 
 weapon_name_musket="flinta"
 weapon_name_net="hálóvetés(net)"
-weapon_name_pike="pika[?]"
+weapon_name_pike="pika(?)"
 weapon_name_pistol="aprópuska" 
 weapon_name_rapier="párbajtõr" 
 weapon_name_short sword="rövidkard" 

src/mapgen_dialog.cpp

@@ -173,13 +173,6 @@ void default_map_generator::user_config(display& disp)
 			break;
 		}
 
-		players_slider.process();
-		width_slider.process();
-		height_slider.process();
-		iterations_slider.process();
-		hillsize_slider.process();
-		villages_slider.process();
-
 		nplayers_ = players_slider.value();
 		width_ = width_slider.value();
 		height_ = height_slider.value();
@@ -187,36 +180,46 @@ void default_map_generator::user_config(display& disp)
 		hill_size_ = hillsize_slider.value();
 		nvillages_ = villages_slider.value();
 
-			gui::draw_dialog_frame(xpos,ypos,width,height,disp);
+		gui::draw_dialog_frame(xpos,ypos,width,height,disp);
 
-			title_rect = font::draw_text(&disp,disp.screen_area(),24,font::NORMAL_COLOUR,
-	                       string_table["map_generator"],xpos+(width-title_rect.w)/2,ypos+10);
+		players_slider.process();
+		width_slider.process();
+		height_slider.process();
+		iterations_slider.process();
+		hillsize_slider.process();
+		villages_slider.process();
 
-			font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,players_label,players_rect.x,players_rect.y);
-			font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,width_label,width_rect.x,width_rect.y);
-			font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,height_label,height_rect.x,height_rect.y);
-			font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,iterations_label,iterations_rect.x,iterations_rect.y);
-			font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,hillsize_label,hillsize_rect.x,hillsize_rect.y);
-			font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,villages_label,villages_rect.x,villages_rect.y);
+		events::raise_process_event();
+		events::raise_draw_event();
 
-			std::stringstream players_str;
-			players_str << nplayers_;
-			font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,players_str.str(),
-			                slider_right+horz_margin,players_rect.y);
+		title_rect = font::draw_text(&disp,disp.screen_area(),24,font::NORMAL_COLOUR,
+                       string_table["map_generator"],xpos+(width-title_rect.w)/2,ypos+10);
 
-			std::stringstream width_str;
-			width_str << width_;
-			font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,width_str.str(),
-			                slider_right+horz_margin,width_rect.y);
+		font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,players_label,players_rect.x,players_rect.y);
+		font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,width_label,width_rect.x,width_rect.y);
+		font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,height_label,height_rect.x,height_rect.y);
+		font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,iterations_label,iterations_rect.x,iterations_rect.y);
+		font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,hillsize_label,hillsize_rect.x,hillsize_rect.y);
+		font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,villages_label,villages_rect.x,villages_rect.y);
 
-			std::stringstream height_str;
-			height_str << height_;
-			font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,height_str.str(),
-			                slider_right+horz_margin,height_rect.y);
+		std::stringstream players_str;
+		players_str << nplayers_;
+		font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,players_str.str(),
+		                slider_right+horz_margin,players_rect.y);
 
-			close_button.draw();
+		std::stringstream width_str;
+		width_str << width_;
+		font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,width_str.str(),
+		                slider_right+horz_margin,width_rect.y);
 
-			update_rect(xpos,ypos,width,height);
+		std::stringstream height_str;
+		height_str << height_;
+		font::draw_text(&disp,disp.screen_area(),14,font::NORMAL_COLOUR,height_str.str(),
+		                slider_right+horz_margin,height_rect.y);
+
+		close_button.draw();
+
+		update_rect(xpos,ypos,width,height);
 
 		disp.update_display();
 		SDL_Delay(10);

src/sdl_utils.cpp

@@ -640,7 +640,8 @@ namespace {
 }
 
 surface_restorer::surface_restorer() : target_(NULL), rect_(empty_rect), surface_(NULL)
-{}
+{
+}
 
 surface_restorer::surface_restorer(CVideo* target, const SDL_Rect& rect)
 : target_(target), rect_(rect), surface_(NULL)

src/widgets/widget.hpp

@@ -24,7 +24,7 @@ protected:
 	widget(const widget &o);
 	widget(display& disp);
 	widget(display& disp, SDL_Rect& rect);
-	virtual ~widget() {}
+	virtual ~widget() { restorer_.cancel(); }
 
 	widget& operator=(const widget& o);