Author: mordante
Date: Thu May 21 18:50:17 2009
New Revision: 35801
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35801&view=rev
Log:
Remove the unused function twidget::layout_init2.
Modified:
trunk/src/gui/widgets/container.cpp
trunk/src/gui/widgets/container.hpp
trunk/src/gui/widgets/control.cpp
trunk/src/gui/widgets/control.hpp
trunk/src/gui/widgets/generator.hpp
trunk/src/gui/widgets/generator_private.hpp
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.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/container.cpp?rev=35801&r1=35800&r2=35801&view=diff
==============================================================================
--- trunk/src/gui/widgets/container.cpp (original)
+++ trunk/src/gui/widgets/container.cpp Thu May 21 18:50:17 2009
@@ -20,14 +20,6 @@
namespace gui2 {
-void tcontainer_::layout_init2(const bool full_initialization)
-{
- // Inherited.
- tcontrol::layout_init2(full_initialization);
-
- grid_.layout_init2(full_initialization);
-}
-
void tcontainer_::NEW_layout_init(const bool full_initialization)
{
// Inherited.
Modified: trunk/src/gui/widgets/container.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/container.hpp?rev=35801&r1=35800&r2=35801&view=diff
==============================================================================
--- trunk/src/gui/widgets/container.hpp (original)
+++ trunk/src/gui/widgets/container.hpp Thu May 21 18:50:17 2009
@@ -48,7 +48,6 @@
/***** ***** ***** ***** layout functions ***** ***** ***** *****/
/** Inherited from tcontrol. */
- void layout_init2(const bool full_initialization);
void NEW_layout_init(const bool full_initialization);
/**
Modified: trunk/src/gui/widgets/control.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/control.cpp?rev=35801&r1=35800&r2=35801&view=diff
==============================================================================
--- trunk/src/gui/widgets/control.cpp (original)
+++ trunk/src/gui/widgets/control.cpp Thu May 21 18:50:17 2009
@@ -117,16 +117,6 @@
<< " result " << result
<< ".\n";
return result;
-}
-
-void tcontrol::layout_init2(const bool full_initialization)
-{
- // Inherited.
- twidget::layout_init2(full_initialization);
-
- if(full_initialization) {
- shrunken_ = false;
- }
}
void tcontrol::NEW_layout_init(const bool full_initialization)
Modified: trunk/src/gui/widgets/control.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/control.hpp?rev=35801&r1=35800&r2=35801&view=diff
==============================================================================
--- trunk/src/gui/widgets/control.hpp (original)
+++ trunk/src/gui/widgets/control.hpp Thu May 21 18:50:17 2009
@@ -150,7 +150,6 @@
/** Inherited from twidget. */
/** @todo Also handle the tooltip state if shrunken_ &&
* use_tooltip_on_label_overflow_. */
- void layout_init2(const bool full_initialization);
void NEW_layout_init(const bool full_initialization);
/** Inherited from twidget. */
Modified: trunk/src/gui/widgets/generator.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/generator.hpp?rev=35801&r1=35800&r2=35801&view=diff
==============================================================================
--- trunk/src/gui/widgets/generator.hpp (original)
+++ trunk/src/gui/widgets/generator.hpp Thu May 21 18:50:17 2009
@@ -199,7 +199,6 @@
*/
/** Inherited from twidget. */
- virtual void layout_init2(const bool /*full_initialization*/) = 0;
virtual void NEW_layout_init(const bool full_initialization) = 0;
/** Inherited from twidget. */
Modified: trunk/src/gui/widgets/generator_private.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/generator_private.hpp?rev=35801&r1=35800&r2=35801&view=diff
==============================================================================
--- trunk/src/gui/widgets/generator_private.hpp (original)
+++ trunk/src/gui/widgets/generator_private.hpp Thu May 21 18:50:17 2009
@@ -597,16 +597,6 @@
}
/** Inherited from tgenerator_. */
- void layout_init2(const bool full_initialization)
- {
- foreach(titem* item, items_) {
- if(item->grid.get_visible() != twidget::INVISIBLE) {
- item->grid.layout_init2(full_initialization);
- }
- }
- }
-
- /** Inherited from tgenerator_. */
void NEW_layout_init(const bool full_initialization)
{
foreach(titem* item, items_) {
Modified: trunk/src/gui/widgets/grid.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/grid.cpp?rev=35801&r1=35800&r2=35801&view=diff
==============================================================================
--- trunk/src/gui/widgets/grid.cpp (original)
+++ trunk/src/gui/widgets/grid.cpp Thu May 21 18:50:17 2009
@@ -172,21 +172,6 @@
tcontrol* control = dynamic_cast<tcontrol*>(widget);
if(control) {
control->set_active(active);
- }
- }
-}
-
-void tgrid::layout_init2(const bool full_initialization)
-{
- // Inherited.
- twidget::layout_init2(full_initialization);
-
- // Clear child caches.
- foreach(tchild& child, children_) {
-
- twidget* widget = child.widget();
- if(widget && widget->get_visible() != twidget::INVISIBLE) {
- widget->layout_init2(full_initialization);
}
}
}
Modified: trunk/src/gui/widgets/grid.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/grid.hpp?rev=35801&r1=35800&r2=35801&view=diff
==============================================================================
--- trunk/src/gui/widgets/grid.hpp (original)
+++ trunk/src/gui/widgets/grid.hpp Thu May 21 18:50:17 2009
@@ -181,7 +181,6 @@
/***** ***** ***** ***** layout functions ***** ***** ***** *****/
/** Inherited from twidget. */
- void layout_init2(const bool full_initialization);
void NEW_layout_init(const bool full_initialization);
/**
Modified: trunk/src/gui/widgets/scrollbar_container.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/scrollbar_container.cpp?rev=35801&r1=35800&r2=35801&view=diff
==============================================================================
--- trunk/src/gui/widgets/scrollbar_container.cpp (original)
+++ trunk/src/gui/widgets/scrollbar_container.cpp Thu May 21 18:50:17 2009
@@ -105,36 +105,6 @@
}
}
-void tscrollbar_container::layout_init2(const bool full_initialization)
-{
- // Inherited.
- tcontainer_::layout_init2(full_initialization);
-
- if(full_initialization) {
- /*
- * When the scrollbars should be shown when needed, assume
they're not
- * needed and unhide them when needed.
- */
- if(initial_vertical_scrollbar_mode_ == auto_visible) {
- vertical_scrollbar_mode_ = always_invisible;
- } else {
- vertical_scrollbar_mode_ =
initial_vertical_scrollbar_mode_;
- }
- show_vertical_scrollbar();
-
- if(initial_vertical_scrollbar_mode_ == auto_visible) {
- horizontal_scrollbar_mode_ = always_invisible;
- } else {
- horizontal_scrollbar_mode_ =
initial_horizontal_scrollbar_mode_;
- }
- show_horizontal_scrollbar();
- }
-
- assert(content_grid_);
- content_grid_->layout_init2(full_initialization);
-
-}
-
void tscrollbar_container::NEW_layout_init(const bool full_initialization)
{
// Inherited.
Modified: trunk/src/gui/widgets/scrollbar_container.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/scrollbar_container.hpp?rev=35801&r1=35800&r2=35801&view=diff
==============================================================================
--- trunk/src/gui/widgets/scrollbar_container.hpp (original)
+++ trunk/src/gui/widgets/scrollbar_container.hpp Thu May 21 18:50:17 2009
@@ -74,7 +74,6 @@
/***** ***** ***** ***** layout functions ***** ***** ***** *****/
/** Inherited from tcontainer_. */
- void layout_init2(const bool full_initialization);
void NEW_layout_init(const bool full_initialization);
/** Inherited from twidget. */
Modified: trunk/src/gui/widgets/widget.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/widget.hpp?rev=35801&r1=35800&r2=35801&view=diff
==============================================================================
--- trunk/src/gui/widgets/widget.hpp (original)
+++ trunk/src/gui/widgets/widget.hpp Thu May 21 18:50:17 2009
@@ -146,20 +146,6 @@
/**
* Initializes the layout phase.
*
- * @deprecated Will be removed after the new layout algorithm is
- * implemented.
- *
- * @param full_initialization Reset the widget to its initial state.
This
- * flag is used to change the status in the
- * first layout run, but keep the status
when a
- * relayout phase happens.
- */
- virtual void layout_init2(const bool /*full_initialization*/)
- { layout_size_ = tpoint(0,0); }
-
- /**
- * Initializes the layout phase.
- *
* Clears the initial best size for the widgets.
*
* @see @ref layout_algorihm for more information.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
