upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-03 06:01:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverted 15004 on request of Sapient

Browse Source
This commit is contained in:
David Philippi 2007-01-02 22:23:45 +00:00
parent aa2b81254f
commit a3372922f5
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/construct_dialog.cpp
View File

@ -224,7 +224,7 @@ void dialog::set_menu(const std::vector<std::string> &menu_items)
dialog::max_menu_width, NULL, &menu::default_style, false));
}
menu& dialog::get_menu()
menu& dialog::get_menu() const
{
if(menu_ == NULL)
{
@ -363,7 +363,7 @@ void dialog::refresh()
disp_.delay(10);
}
dialog::dimension_measurements dialog::layout(int xloc, int yloc)
dialog::dimension_measurements dialog::layout(int xloc, int yloc) const
{
CVideo& screen = disp_.video();
surface const scr = screen.getSurface();

6
src/construct_dialog.hpp
View File

@ -188,7 +188,7 @@ public:
//Specific preparations
//layout - determines dialog measurements based on all components
virtual dimension_measurements layout(int xloc=-1, int yloc=-1);
virtual dimension_measurements layout(int xloc=-1, int yloc=-1) const;
//Launching the dialog
//show - the return value of this method should be the same as result()
@ -197,7 +197,7 @@ public:
//Results
int result() const { return result_; }
menu &get_menu();
menu &get_menu() const;
bool done() const { return (result_ != CONTINUE_DIALOG); }
const std::string textbox_text() const { return text_widget_->text();}
const bool option_checked(unsigned int option_index=0);
@ -244,7 +244,7 @@ private:
const std::string title_, style_;
label* message_;
const DIALOG_TYPE type_;
gui::menu *menu_;
mutable gui::menu *menu_;
std::vector<preview_pane*> preview_panes_;
std::vector< std::pair<dialog_button*,BUTTON_LOCATION> > button_pool_;
std::vector<dialog_button*> standard_buttons_;

2
src/dialogs.hpp
View File

@ -35,7 +35,7 @@ class file_dialog : public gui::dialog {
public:
file_dialog(display &disp, const std::string& file_path, const std::string& title);
virtual gui::dialog::dimension_measurements layout(int xloc=-1, int yloc=-1);
virtual gui::dialog::dimension_measurements layout(int xloc=-1, int yloc=-1) const;
/// Return the chosen file.
std::string get_choice() const { return chosen_file_; }

2
src/filechooser.cpp
View File

@ -55,7 +55,7 @@ file_dialog::file_dialog(display &disp, const std::string& file_path, const std:
gui::button::TYPE_PRESS, gui::CREATE_ITEM), dialog::BUTTON_CHECKBOX_LEFT);
}
gui::dialog::dimension_measurements file_dialog::layout(int xloc, int yloc)
gui::dialog::dimension_measurements file_dialog::layout(int xloc, int yloc) const
{
gui::dialog::dimension_measurements dim = dialog::layout(xloc, yloc);