Author: mordante
Date: Wed Jul 16 19:10:52 2008
New Revision: 28056
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28056&view=rev
Log:
Make finalize_setup() private since only our friend the builder is allowed to
use it.
Modified:
trunk/src/gui/widgets/listbox.cpp
trunk/src/gui/widgets/listbox.hpp
Modified: trunk/src/gui/widgets/listbox.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/listbox.cpp?rev=28056&r1=28055&r2=28056&view=diff
==============================================================================
--- trunk/src/gui/widgets/listbox.cpp (original)
+++ trunk/src/gui/widgets/listbox.cpp Wed Jul 16 19:10:52 2008
@@ -214,31 +214,6 @@
set_scrollbar_button_status();
}
-void tlistbox::finalize_setup()
-{
- scrollbar()->set_callback_positioner_move(callback_scrollbar);
-
- static std::vector<std::string> button_names;
- if(button_names.empty()) {
- button_names.push_back("_begin");
- button_names.push_back("_line_up");
- button_names.push_back("_half_page_up");
- button_names.push_back("_page_up");
-
- button_names.push_back("_end");
- button_names.push_back("_line_down");
- button_names.push_back("_half_page_down");
- button_names.push_back("_page_down");
- }
-
- foreach(const std::string& name, button_names) {
- tbutton* button =
dynamic_cast<tbutton*>(tcontainer_::find_widget(name, false));
- if(button) {
-
button->set_callback_mouse_left_click(callback_scrollbar_button);
- }
- }
-}
-
void tlistbox::set_scrollbar_button_status()
{
// Set scroll up button status
@@ -743,6 +718,30 @@
}
}
+void tlistbox::finalize_setup()
+{
+ scrollbar()->set_callback_positioner_move(callback_scrollbar);
+
+ static std::vector<std::string> button_names;
+ if(button_names.empty()) {
+ button_names.push_back("_begin");
+ button_names.push_back("_line_up");
+ button_names.push_back("_half_page_up");
+ button_names.push_back("_page_up");
+
+ button_names.push_back("_end");
+ button_names.push_back("_line_down");
+ button_names.push_back("_half_page_down");
+ button_names.push_back("_page_down");
+ }
+
+ foreach(const std::string& name, button_names) {
+ tbutton* button =
dynamic_cast<tbutton*>(tcontainer_::find_widget(name, false));
+ if(button) {
+
button->set_callback_mouse_left_click(callback_scrollbar_button);
+ }
+ }
+}
+
} // namespace gui2
-
Modified: trunk/src/gui/widgets/listbox.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/listbox.hpp?rev=28056&r1=28055&r2=28056&view=diff
==============================================================================
--- trunk/src/gui/widgets/listbox.hpp (original)
+++ trunk/src/gui/widgets/listbox.hpp Wed Jul 16 19:10:52 2008
@@ -88,9 +88,6 @@
* scrollbar and update the list.
*/
void scrollbar_click(twidget* caller);
-
- /** The builder needs to call us so we can write in the proper
callbacks. */
- void finalize_setup();
void set_list_builder(tbuilder_grid* list_builder)
{ list_builder_ = list_builder; }
@@ -339,10 +336,13 @@
* @retval -1 If the offset wasn't found.
*/
size_t row_at_offset(int offset, int& offset_in_widget) const;
+
+ /** The builder needs to call us so we can write in the proper
callbacks. */
+ void finalize_setup();
+
};
} // namespace gui2
#endif
-
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
