Author: esr
Date: Sun Jul 1 01:50:24 2007
New Revision: 18586
URL: http://svn.gna.org/viewcvs/wesnoth?rev=18586&view=rev
Log:
Transform more show_dialog() calls into basic_dialog instantiations.
Modified:
trunk/src/dialogs.cpp
trunk/src/hotkeys.cpp
Modified: trunk/src/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/dialogs.cpp?rev=18586&r1=18585&r2=18586&view=diff
==============================================================================
--- trunk/src/dialogs.cpp (original)
+++ trunk/src/dialogs.cpp Sun Jul 1 01:50:24 2007
@@ -113,9 +113,16 @@
std::vector<gui::preview_pane*> preview_panes;
preview_panes.push_back(&unit_preview);
- res = gui::show_dialog(gui,NULL,_("Advance Unit"),
- _("What should our victorious unit
become?"),
- gui::OK_ONLY, &lang_options,
&preview_panes);
+ gui::basic_dialog advances = gui::basic_dialog(gui,
+ _("Advance Unit"),
+ _("What should our victorious unit
become?"),
+ gui::OK_ONLY);
+ advances.set_menu(lang_options);
+ std::vector<gui::preview_pane*>::const_iterator itor;
+ for(itor = preview_panes.begin(); itor != preview_panes.end();
++itor)
+
+ advances.add_pane(*itor);
+ res = advances.show();
}
recorder.choose_option(res);
Modified: trunk/src/hotkeys.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/hotkeys.cpp?rev=18586&r1=18585&r2=18586&view=diff
==============================================================================
--- trunk/src/hotkeys.cpp (original)
+++ trunk/src/hotkeys.cpp Sun Jul 1 01:50:24 2007
@@ -16,7 +16,7 @@
#define GETTEXT_DOMAIN "wesnoth-lib"
#include "config.hpp"
-#include "construct_dialog.hpp"
+#include "basic_dialog.hpp"
#include "display.hpp"
#include "events.hpp"
#include "hotkeys.hpp"
@@ -478,7 +478,7 @@
{
if(event.keysym.sym == SDLK_ESCAPE && disp.in_game()) {
std::cerr << "escape pressed..showing quit\n";
- const int res = gui::show_dialog(disp,NULL,_("Quit"),_("Do you
really want to quit?"),gui::YES_NO);
+ const int res = gui::basic_dialog(disp,_("Quit"),_("Do you
really want to quit?"),gui::YES_NO).show();
if(res == 0) {
throw end_level_exception(QUIT);
} else {
@@ -779,7 +779,7 @@
case HOTKEY_QUIT_GAME: {
if(disp.in_game()) {
std::cerr << "is in game -- showing quit
message\n";
- const int res =
gui::show_dialog(disp,NULL,_("Quit"),_("Do you really want to
quit?"),gui::YES_NO);
+ const int res =
gui::basic_dialog(disp,_("Quit"),_("Do you really want to
quit?"),gui::YES_NO).show();
if(res == 0) {
throw end_level_exception(QUIT);
}
@@ -805,8 +805,10 @@
std::vector<std::string> menu = get_menu_images(items);
- const int res = gui::show_dialog(gui,NULL,"","",
-
gui::MESSAGE,&menu,NULL,"",NULL,-1,NULL,xloc,yloc,&gui::dialog::hotkeys_style);
+ gui::basic_dialog mmenu = gui::basic_dialog(gui,"","",
+ gui::MESSAGE,
&gui::basic_dialog::hotkeys_style);
+ mmenu.set_menu(menu);
+ const int res = mmenu.show(xloc, yloc);
if (size_t(res) >= items.size())
return;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
