Author: mordante
Date: Fri May 22 15:36:47 2009
New Revision: 35817
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35817&view=rev
Log:
Remove some obsolete helpers.
These functions were needed with the old layout algorithm.
Modified:
trunk/src/gui/widgets/scrollbar_container.cpp
trunk/src/gui/widgets/scrollbar_container.hpp
Modified: trunk/src/gui/widgets/scrollbar_container.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/scrollbar_container.cpp?rev=35817&r1=35816&r2=35817&view=diff
==============================================================================
--- trunk/src/gui/widgets/scrollbar_container.cpp (original)
+++ trunk/src/gui/widgets/scrollbar_container.cpp Fri May 22 15:36:47 2009
@@ -484,8 +484,6 @@
vertical_scrollbar_->
set_callback_positioner_move(callback_vertical_scrollbar);
- show_vertical_scrollbar();
-
/***** Setup horizontal scrollbar *****/
horizontal_scrollbar_grid_ =
find_widget<tgrid>("_horizontal_scrollbar_grid", false, true);
@@ -495,8 +493,6 @@
horizontal_scrollbar_->
set_callback_positioner_move(callback_horizontal_scrollbar);
-
- show_horizontal_scrollbar();
/***** Setup the scrollbar buttons *****/
typedef std::pair<std::string, tscrollbar_::tscroll> hack;
@@ -544,7 +540,6 @@
{
if(vertical_scrollbar_mode_ != scrollbar_mode) {
vertical_scrollbar_mode_ = scrollbar_mode;
- show_vertical_scrollbar();
}
}
@@ -553,7 +548,6 @@
{
if(horizontal_scrollbar_mode_ != scrollbar_mode) {
horizontal_scrollbar_mode_ = scrollbar_mode;
- show_horizontal_scrollbar();
}
}
@@ -574,46 +568,6 @@
assert(content_grid_);
std::vector<twidget*> child_call_stack(call_stack);
content_grid_->populate_dirty_list(caller, child_call_stack);
-}
-
-void tscrollbar_container::show_vertical_scrollbar()
-{
- if(!vertical_scrollbar_grid_) {
- return;
- }
-
- switch(vertical_scrollbar_mode_) {
- case always_visible :
- vertical_scrollbar_grid_->set_visible(twidget::VISIBLE);
- break;
-
- case auto_visible :
- vertical_scrollbar_grid_->set_visible(twidget::HIDDEN);
- break;
-
- default :
-
vertical_scrollbar_grid_->set_visible(twidget::INVISIBLE);
- }
-}
-
-void tscrollbar_container::show_horizontal_scrollbar()
-{
- if(!horizontal_scrollbar_grid_) {
- return;
- }
-
- switch(horizontal_scrollbar_mode_) {
- case always_visible :
-
horizontal_scrollbar_grid_->set_visible(twidget::VISIBLE);
- break;
-
- case auto_visible :
-
horizontal_scrollbar_grid_->set_visible(twidget::HIDDEN);
- break;
-
- default :
-
horizontal_scrollbar_grid_->set_visible(twidget::INVISIBLE);
- }
}
void tscrollbar_container::show_content_rect(const SDL_Rect& rect)
Modified: trunk/src/gui/widgets/scrollbar_container.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/scrollbar_container.hpp?rev=35817&r1=35816&r2=35817&view=diff
==============================================================================
--- trunk/src/gui/widgets/scrollbar_container.hpp (original)
+++ trunk/src/gui/widgets/scrollbar_container.hpp Fri May 22 15:36:47 2009
@@ -136,10 +136,12 @@
/***** ***** ***** setters / getters for members ***** ****** *****/
+ /** @note shouldn't be called after being shown in a dialog. */
void set_vertical_scrollbar_mode(const tscrollbar_mode scrollbar_mode);
tscrollbar_mode get_vertical_scrollbar_mode() const
{ return vertical_scrollbar_mode_; }
+ /** @note shouldn't be called after being shown in a dialog. */
void set_horizontal_scrollbar_mode(const tscrollbar_mode
scrollbar_mode);
tscrollbar_mode get_horizontal_scrollbar_mode() const
{ return horizontal_scrollbar_mode_; }
@@ -376,12 +378,6 @@
/** Inherited from tcontainer_. */
void child_populate_dirty_list(twindow& caller,
const std::vector<twidget*>& call_stack);
-
- /** Sets the visible state of the vertical scrollbar. */
- void show_vertical_scrollbar();
-
- /** Sets the visible state of the horizontal scrollbar. */
- void show_horizontal_scrollbar();
/** Helper function which needs to be called after the scollbar moved.
*/
void scrollbar_moved();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
