0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove tdialog::show_tooltip.

Browse source 
The function is no longer needed, windows that should be shown non modal
need to inherit from tpopup. (Partly reverts 2011-02-03T20:43:52Z!koraq@xs4all.nl.)
This commit is contained in:
Mark de Wever 2011-02-20 09:06:01 +00:00
parent 2dc8c91a61
commit c64cb8776e
2 changed files with 1 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/gui/dialogs/dialog.cpp
View file

@ -29,8 +29,6 @@ tdialog::~tdialog()
foreach(tfield_* field, fields_) {
delete field;
}
delete window_;
}
void tdialog::show(CVideo& video, const unsigned auto_close_time)
@ -73,25 +71,6 @@ void tdialog::show(CVideo& video, const unsigned auto_close_time)
post_show(*window);
}
void tdialog::show_tooltip(CVideo& video/*, const unsigned auto_close_time*/)
{
if(video.faked()) {
return;
}
window_ = build_window(video);
post_build(video, *window_);
window_->set_owner(this);
init_fields(*window_);
pre_show(video, *window_);
window_->show_tooltip(/*auto_close_time*/);
}
tfield_bool* tdialog::register_bool(
const std::string& id
, const bool optional

21
src/gui/dialogs/dialog.hpp
View file

@ -111,8 +111,7 @@ public:
tdialog() :
retval_(0),
fields_(),
restore_(true),
window_(NULL)
restore_(true)
{}
virtual ~tdialog();
@ -130,21 +129,6 @@ public:
*/
void show(CVideo& video, const unsigned auto_close_time = 0);
/**
* Shows the window as a tooltip.
*
* A tooltip can't be interacted with and is just shown.
*
* @todo Implement @p auto_close_time.
*
* @todo Look at merging @ref show and @ref show_tooltip. Maybe more types
* are needed, have a look at it later.
*
* @param video The video which contains the surface to draw
* upon.
*/
void show_tooltip(CVideo& video/*, const unsigned auto_close_time = 0*/);
/***** ***** ***** setters / getters for members ***** ****** *****/
int get_retval() const { return retval_; }
@ -219,9 +203,6 @@ private:
*/
bool restore_;
/** The window, used in show modal. */
twindow* window_;
/** The id of the window to build. */
virtual const std::string& window_id() const = 0;