Author: mordante
Date: Thu May 21 21:13:00 2009
New Revision: 35811
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35811&view=rev
Log:
Remove the unused function twidget::has_horizontal_scrollbar.
Modified:
trunk/src/gui/widgets/container.hpp
trunk/src/gui/widgets/debug.cpp
trunk/src/gui/widgets/grid.cpp
trunk/src/gui/widgets/grid.hpp
trunk/src/gui/widgets/scrollbar_container.cpp
trunk/src/gui/widgets/scrollbar_container.hpp
trunk/src/gui/widgets/widget.hpp
Modified: trunk/src/gui/widgets/container.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/container.hpp?rev=35811&r1=35810&r2=35811&view=diff
==============================================================================
--- trunk/src/gui/widgets/container.hpp (original)
+++ trunk/src/gui/widgets/container.hpp Thu May 21 21:13:00 2009
@@ -91,16 +91,6 @@
/** Inherited from twidget. */
void layout_wrap(const unsigned maximum_width);
- /**
- * Inherited from twidget.
- *
- * Since we can't define a good default behaviour we force the
inheriting
- * classes to define this function. So inheriting classes act as one
widget
- * others as a collection of multiple objects.
- */
- bool has_horizontal_scrollbar() const
- { return grid_.has_horizontal_scrollbar(); }
-
/** Inherited from twidget. */
void set_size(const tpoint& origin, const tpoint& size);
Modified: trunk/src/gui/widgets/debug.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/debug.cpp?rev=35811&r1=35810&r2=35811&view=diff
==============================================================================
--- trunk/src/gui/widgets/debug.cpp (original)
+++ trunk/src/gui/widgets/debug.cpp Thu May 21 21:13:00 2009
@@ -345,10 +345,6 @@
<< "can wrap=" << widget->can_wrap() << '\n'
<< "</td></tr>\n"
<< "<tr><td>\n"
- << "has horizontal scrollbar="
- << widget->has_horizontal_scrollbar() << '\n'
- << "</td></tr>\n"
- << "<tr><td>\n"
<< "size=" << widget->get_size() << '\n'
<< "</td></tr>\n"
<< "<tr><td>\n"
Modified: trunk/src/gui/widgets/grid.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/grid.cpp?rev=35811&r1=35810&r2=35811&view=diff
==============================================================================
--- trunk/src/gui/widgets/grid.cpp (original)
+++ trunk/src/gui/widgets/grid.cpp Thu May 21 21:13:00 2009
@@ -496,20 +496,6 @@
}
DBG_GUI_L << "tgrid: found solution.\n";
-}
-
-bool tgrid::has_horizontal_scrollbar() const
-{
- foreach(const tchild& child, children_) {
- // FIXME we should check per column and the entire column
- // should have the flag!!!!
- if(child.widget() &&
child.widget()->has_horizontal_scrollbar()) {
- return true;
- }
- }
-
- // Inherit
- return twidget::has_horizontal_scrollbar();
}
void tgrid::set_size(const tpoint& origin, const tpoint& size)
Modified: trunk/src/gui/widgets/grid.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/grid.hpp?rev=35811&r1=35810&r2=35811&view=diff
==============================================================================
--- trunk/src/gui/widgets/grid.hpp (original)
+++ trunk/src/gui/widgets/grid.hpp Thu May 21 21:13:00 2009
@@ -225,9 +225,6 @@
/** Inherited from twidget. */
void layout_wrap(const unsigned maximum_width);
- /** Inherited from twidget. */
- bool has_horizontal_scrollbar() const;
-
public:
/** Inherited from twidget. */
void set_size(const tpoint& origin, const tpoint& size);
Modified: trunk/src/gui/widgets/scrollbar_container.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/scrollbar_container.cpp?rev=35811&r1=35810&r2=35811&view=diff
==============================================================================
--- trunk/src/gui/widgets/scrollbar_container.cpp (original)
+++ trunk/src/gui/widgets/scrollbar_container.cpp Thu May 21 21:13:00 2009
@@ -242,11 +242,6 @@
content_grid_->layout_wrap(maximum_width - offset);
}
-bool tscrollbar_container::has_horizontal_scrollbar() const
-{
- return is_visible() && horizontal_scrollbar_mode_ != always_invisible;
-}
-
tpoint tscrollbar_container::calculate_best_size() const
{
log_scope2(log_gui_layout,
Modified: trunk/src/gui/widgets/scrollbar_container.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/scrollbar_container.hpp?rev=35811&r1=35810&r2=35811&view=diff
==============================================================================
--- trunk/src/gui/widgets/scrollbar_container.hpp (original)
+++ trunk/src/gui/widgets/scrollbar_container.hpp Thu May 21 21:13:00 2009
@@ -94,9 +94,6 @@
/** Inherited from twidget (not tcontainer_). */
void layout_wrap(const unsigned maximum_width);
- /** Inherited from twidget (not tcontainer_). */
- bool has_horizontal_scrollbar() const;
-
private:
/** Inherited from tcontainer_. */
tpoint calculate_best_size() const;
Modified: trunk/src/gui/widgets/widget.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/widget.hpp?rev=35811&r1=35810&r2=35811&view=diff
==============================================================================
--- trunk/src/gui/widgets/widget.hpp (original)
+++ trunk/src/gui/widgets/widget.hpp Thu May 21 21:13:00 2009
@@ -262,22 +262,12 @@
{ assert(can_wrap()); }
/**
- * Does the widget have a horizontal scrollbar.
- *
- * See has_vertical_scrollbar for more info.
- * @returns Whether or not the widget has a horizontal
- * scrollbar.
- */
- virtual bool has_horizontal_scrollbar() const { return false; }
-
- /**
* Sets the size of the widget.
*
* @param origin The position of top left of the widget.
* @param size The size of the widget.
*/
virtual void set_size(const tpoint& origin, const tpoint& size);
-
/***** ***** ***** ***** query ***** ***** ***** *****/
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
