Author: fendrin
Date: Sat Mar 5 13:02:03 2011
New Revision: 48749
URL: http://svn.gna.org/viewcvs/wesnoth?rev=48749&view=rev
Log:
Adjusted the tests to the new dialogs. Still some work to be done.
Modified:
trunk/src/tests/gui/test_gui2.cpp
Modified: trunk/src/tests/gui/test_gui2.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tests/gui/test_gui2.cpp?rev=48749&r1=48748&r2=48749&view=diff
==============================================================================
--- trunk/src/tests/gui/test_gui2.cpp (original)
+++ trunk/src/tests/gui/test_gui2.cpp Sat Mar 5 13:02:03 2011
@@ -52,7 +52,10 @@
#include "gui/dialogs/transient_message.hpp"
#include "gui/dialogs/unit_attack.hpp"
#include "gui/dialogs/unit_create.hpp"
-#include "gui/dialogs/wml_message.hpp"
+#include "gui/dialogs/image_message/image_message.hpp"
+//TODO enable when safe
+//#include "gui/dialogs/image_message/input_message.hpp"
+//#include "gui/dialogs/image_message/option_message.hpp"
#include "gui/widgets/settings.hpp"
#include "language.hpp"
#include "map_create.hpp"
@@ -229,8 +232,14 @@
test<gui2::ttransient_message>();
// test<gui2::tunit_attack>(); /** @todo ENABLE */
test<gui2::tunit_create>();
- test<gui2::twml_message_left>();
- test<gui2::twml_message_right>();
+ test<gui2::timage_message_left>();
+ test<gui2::timage_message_right>();
+//TODO enable when safe
+// test<gui2::tinput_message_left>();
+// test<gui2::tinput_message_right>();
+// test<gui2::toption_message_left>();
+// test<gui2::toption_message_right>();
+
std::vector<std::string>& list =
gui2::unit_test_registered_window_list();
@@ -499,20 +508,20 @@
};
template<>
-struct twrapper<gui2::twml_message_left>
-{
- static gui2::twml_message_left* create()
- {
- return new gui2::twml_message_left("Title", "Message", "",
false);
- }
-};
-
-template<>
-struct twrapper<gui2::twml_message_right>
-{
- static gui2::twml_message_right* create()
- {
- return new gui2::twml_message_right("Title", "Message", "",
false);
+struct twrapper<gui2::timage_message_left>
+{
+ static gui2::timage_message_left* create()
+ {
+ return new gui2::timage_message_left("Title", "Message", "",
false);
+ }
+};
+
+template<>
+struct twrapper<gui2::timage_message_right>
+{
+ static gui2::timage_message_right* create()
+ {
+ return new gui2::timage_message_right("Title", "Message", "",
false);
}
};
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
