diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-01 19:13:11 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-01 19:13:11 +0300 |
| commit | a260aeab234704ace8ba672b1d1ce57e18425e07 (patch) | |
| tree | e215c6eeeae7e6c2ca4f4453718cef6ca9a8af6a /src/gui/windows/okdialog.cpp | |
| parent | 382067b05c4fe97bcf0da0143405375ec295f7c6 (diff) | |
| parent | 2c62286a7ecf246e8a445dd7d00f618efae2a96a (diff) | |
| download | plus-a260aeab234704ace8ba672b1d1ce57e18425e07.tar.gz plus-a260aeab234704ace8ba672b1d1ce57e18425e07.tar.bz2 plus-a260aeab234704ace8ba672b1d1ce57e18425e07.tar.xz plus-a260aeab234704ace8ba672b1d1ce57e18425e07.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/windows/okdialog.cpp')
| -rw-r--r-- | src/gui/windows/okdialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp index c16123abd..3d734b7ad 100644 --- a/src/gui/windows/okdialog.cpp +++ b/src/gui/windows/okdialog.cpp @@ -30,7 +30,7 @@ #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/font.h" #include "debug.h" @@ -40,7 +40,7 @@ OkDialog::OkDialog(const std::string &restrict title, const bool showCenter, Window *const parent, const int minWidth) : Window(title, modal, parent, "ok.xml"), - gcn::ActionListener(), + ActionListener(), mTextBox(new TextBox(this)) { mTextBox->setEditable(false); @@ -84,7 +84,7 @@ OkDialog::OkDialog(const std::string &restrict title, soundManager.playGuiSound(SOUND_ERROR); } -void OkDialog::action(const gcn::ActionEvent &event) +void OkDialog::action(const ActionEvent &event) { setActionEventId(event.getId()); distributeActionEvent(); |