Author: mordante
Date: Sun May 24 15:49:49 2009
New Revision: 35878
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35878&view=rev
Log:
Widget visible helper function cleanup [2/2].
Modified:
trunk/src/gui/widgets/grid.cpp
trunk/src/gui/widgets/widget.cpp
trunk/src/gui/widgets/widget.hpp
Modified: trunk/src/gui/widgets/grid.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/grid.cpp?rev=35878&r1=35877&r2=35878&view=diff
==============================================================================
--- trunk/src/gui/widgets/grid.cpp (original)
+++ trunk/src/gui/widgets/grid.cpp Sun May 24 15:49:49 2009
@@ -625,7 +625,7 @@
return border_space();
}
- if(widget_->is_invisible()) {
+ if(widget_->get_visible() == twidget::INVISIBLE) {
DBG_GUI_L << "tgrid::tchild:"
<< " has widget " << true
<< " widget invisible " << true
@@ -647,7 +647,7 @@
void tgrid::tchild::set_size(tpoint origin, tpoint size)
{
assert(widget());
- if(widget()->is_invisible()) {
+ if(widget()->get_visible() == twidget::INVISIBLE) {
return;
}
Modified: trunk/src/gui/widgets/widget.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/widget.cpp?rev=35878&r1=35877&r2=35878&view=diff
==============================================================================
--- trunk/src/gui/widgets/widget.cpp (original)
+++ trunk/src/gui/widgets/widget.cpp Sun May 24 15:49:49 2009
@@ -27,7 +27,7 @@
tpoint twidget::get_best_size() const
{
- assert(!is_invisible());
+ assert(visible_ != INVISIBLE);
tpoint result = layout_size_;
if(result == tpoint(0, 0)) {
Modified: trunk/src/gui/widgets/widget.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/widget.hpp?rev=35878&r1=35877&r2=35878&view=diff
==============================================================================
--- trunk/src/gui/widgets/widget.hpp (original)
+++ trunk/src/gui/widgets/widget.hpp Sun May 24 15:49:49 2009
@@ -474,13 +474,6 @@
void set_visible(const tvisible visible);
tvisible get_visible() const { return visible_; }
- /**
- * Returns true if the widget is invisible.
- *
- * @deprecated This function name and action is too confusing.
- */
- bool is_invisible() const { return visible_ == INVISIBLE; }
-
tdrawing_action get_drawing_action() const { return drawing_action_; }
/**
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
