0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the proper class for the enum.

Browse source 
The enum also is inherited by tbutton, but is defined in tcontrol so use
that version to avoid confusion.
This commit is contained in:
Mark de Wever 2009-05-22 19:02:38 +00:00
parent fdea3842f5
commit bf20b5c1dc
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/dialogs/message.cpp
View file

@ -172,8 +172,8 @@ void show_message(CVideo& video, const std::string& title,
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 @@ int show_message(CVideo& video, const std::string& title,
}
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,

10
src/gui/dialogs/message.hpp
View file

@ -16,10 +16,12 @@
#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 @@ void show_message(CVideo& video, const std::string& title,
*/
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 @@ int show_message(CVideo& video, const std::string& title,
* @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