Author: mordante
Date: Thu May 17 18:21:56 2012
New Revision: 54186
URL: http://svn.gna.org/viewcvs/wesnoth?rev=54186&view=rev
Log:
Add an ifdef to tcontrol::init().
It is only used in GUI2_EXPERIMENTAL_LISTBOX context and will probably
be replaced with another way to initialise objects. So comment it out
for now.
Modified:
trunk/src/gui/widgets/control.cpp
trunk/src/gui/widgets/control.hpp
Modified: trunk/src/gui/widgets/control.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/control.cpp?rev=54186&r1=54185&r2=54186&view=diff
==============================================================================
--- trunk/src/gui/widgets/control.cpp (original)
+++ trunk/src/gui/widgets/control.cpp Thu May 17 18:21:56 2012
@@ -260,7 +260,9 @@
load_config();
assert(config());
+#ifdef GUI2_EXPERIMENTAL_LISTBOX
init();
+#endif
}
void tcontrol::set_label(const t_string& label)
Modified: trunk/src/gui/widgets/control.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/control.hpp?rev=54186&r1=54185&r2=54186&view=diff
==============================================================================
--- trunk/src/gui/widgets/control.hpp (original)
+++ trunk/src/gui/widgets/control.hpp Thu May 17 18:21:56 2012
@@ -362,6 +362,7 @@
private:
+#ifdef GUI2_EXPERIMENTAL_LISTBOX
/**
* Initializes the control.
*
@@ -370,6 +371,7 @@
* only once, this happens when set_definition is called.
*/
virtual void init() {}
+#endif
/**
* Gets the best size for a text.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
