Author: mordante
Date: Sat Jun 7 17:17:05 2008
New Revision: 27030
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27030&view=rev
Log:
Move the init code to the main init code and remove it from the dialogs.
Modified:
trunk/src/game.cpp
trunk/src/gui/dialogs/addon_connect.cpp
trunk/src/gui/dialogs/language_selection.cpp
trunk/src/gui/dialogs/mp_method_selection.cpp
Modified: trunk/src/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game.cpp?rev=27030&r1=27029&r2=27030&view=diff
==============================================================================
--- trunk/src/game.cpp (original)
+++ trunk/src/game.cpp Sat Jun 7 17:17:05 2008
@@ -2412,6 +2412,10 @@
const cursor::manager cursor_manager;
cursor::set(cursor::WAIT);
+ if(gui2::new_widgets) {
+ gui2::init();
+ }
+
loadscreen::global_loadscreen = new loadscreen(game.disp().video());
loadscreen::global_loadscreen->clear_screen();
Modified: trunk/src/gui/dialogs/addon_connect.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/addon_connect.cpp?rev=27030&r1=27029&r2=27030&view=diff
==============================================================================
--- trunk/src/gui/dialogs/addon_connect.cpp (original)
+++ trunk/src/gui/dialogs/addon_connect.cpp Sat Jun 7 17:17:05 2008
@@ -32,9 +32,6 @@
void taddon_connect::show(CVideo& video)
{
-
- gui2::init();
-
twindow window = build(video, get_id(ADDON_CONNECT));
ttext_box* host_widget =
dynamic_cast<ttext_box*>(window.find_widget("host_name", false));
if(host_widget) {
Modified: trunk/src/gui/dialogs/language_selection.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/language_selection.cpp?rev=27030&r1=27029&r2=27030&view=diff
==============================================================================
--- trunk/src/gui/dialogs/language_selection.cpp (original)
+++ trunk/src/gui/dialogs/language_selection.cpp Sat Jun 7 17:17:05 2008
@@ -35,8 +35,6 @@
void tlanguage_selection::show(CVideo& video)
{
- gui2::init();
-
twindow window = build(video, get_id(LANGUAGE_SELECTION));
tlistbox* list =
dynamic_cast<tlistbox*>(window.find_widget("language_list", false));
Modified: trunk/src/gui/dialogs/mp_method_selection.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/mp_method_selection.cpp?rev=27030&r1=27029&r2=27030&view=diff
==============================================================================
--- trunk/src/gui/dialogs/mp_method_selection.cpp (original)
+++ trunk/src/gui/dialogs/mp_method_selection.cpp Sat Jun 7 17:17:05 2008
@@ -36,9 +36,6 @@
void tmp_method_selection::show(CVideo& video)
{
-
- gui2::init();
-
twindow window = build(video, get_id(MP_METHOD_SELECTION));
user_name_ = preferences::login();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
