Author: mordante
Date: Fri May 22 21:02:38 2009
New Revision: 35827
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35827&view=rev
Log:
Use the proper class for the enum.
The enum also is inherited by tbutton, but is defined in tcontrol so use
that version to avoid confusion.
Modified:
trunk/src/gui/dialogs/message.cpp
trunk/src/gui/dialogs/message.hpp
Modified: trunk/src/gui/dialogs/message.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/message.cpp?rev=35827&r1=35826&r2=35827&view=diff
==============================================================================
--- trunk/src/gui/dialogs/message.cpp (original)
+++ trunk/src/gui/dialogs/message.cpp Fri May 22 21:02:38 2009
@@ -172,8 +172,8 @@
int show_message(CVideo& video, const std::string& title,
const std::string& message, const tmessage::tbutton_style button_style,
- const tbutton::tmarkup_mode /*message_markup_mode*/,
- const tbutton::tmarkup_mode /*message_title_mode*/)
+ const tcontrol::tmarkup_mode /*message_markup_mode*/,
+ const tcontrol::tmarkup_mode /*message_title_mode*/)
{
/** @todo implement the markup mode. */
tmessage dlg(title, message, button_style == tmessage::auto_close);
@@ -208,7 +208,7 @@
}
void show_error_message(CVideo& video, const std::string& message,
- const tbutton::tmarkup_mode message_markup_mode)
+ const tcontrol::tmarkup_mode message_markup_mode)
{
LOG_STREAM(err, lg::general) << message << '\n';
show_message(video, _("Error"), message,
Modified: trunk/src/gui/dialogs/message.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/message.hpp?rev=35827&r1=35826&r2=35827&view=diff
==============================================================================
--- trunk/src/gui/dialogs/message.hpp (original)
+++ trunk/src/gui/dialogs/message.hpp Fri May 22 21:02:38 2009
@@ -16,9 +16,11 @@
#define GUI_DIALOGS_MESSAGE_HPP_INCLUDED
#include "gui/dialogs/dialog.hpp"
-#include "gui/widgets/button.hpp"
+#include "gui/widgets/control.hpp"
namespace gui2 {
+
+class tbutton;
/**
* Main class to show messages to the user.
@@ -162,8 +164,8 @@
*/
int show_message(CVideo& video, const std::string& title,
const std::string& message, const tmessage::tbutton_style button_style,
- const tbutton::tmarkup_mode message_markup_mode = tbutton::NO_MARKUP,
- const tbutton::tmarkup_mode title_markup_mode = tbutton::NO_MARKUP);
+ const tcontrol::tmarkup_mode message_markup_mode = tcontrol::NO_MARKUP,
+ const tcontrol::tmarkup_mode title_markup_mode = tcontrol::NO_MARKUP);
/**
* Shows an error message to the user.
@@ -174,7 +176,7 @@
* @param message_markup_mode The markup mode used for the title.
*/
void show_error_message(CVideo& video, const std::string& message,
- const tbutton::tmarkup_mode message_markup_mode =
tbutton::NO_MARKUP);
+ const tcontrol::tmarkup_mode message_markup_mode =
tcontrol::NO_MARKUP);
} // namespace gui2
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
