diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
| commit | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (patch) | |
| tree | c1edb8d8b368fdd43cd8639e6044b0f4e8dde70a /src/gui/okdialog.h | |
| parent | ece00592ecd93f7a96db0ca82589d00846e2f938 (diff) | |
| parent | d471e99fd38ac589a8a9e8e8677b9f577f0cc5c6 (diff) | |
| download | manaplus-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.gz manaplus-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.bz2 manaplus-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.xz manaplus-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.zip | |
Merge branch 'master' into strippedstripped1.1.11.12
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/focushandler.cpp
src/guichan/graphics.cpp
src/guichan/gui.cpp
src/guichan/image.cpp
src/guichan/include/guichan/widgets/checkbox.hpp
src/guichan/include/guichan/widgets/dropdown.hpp
src/guichan/sdl/sdlgraphics.cpp
src/guichan/sdl/sdlimage.cpp
src/guichan/widget.cpp
src/guichan/widgets/dropdown.cpp
src/guichan/widgets/icon.cpp
src/guichan/widgets/imagebutton.cpp
src/guichan/widgets/listbox.cpp
src/guichan/widgets/scrollarea.cpp
src/guichan/widgets/tab.cpp
src/guichan/widgets/tabbedarea.cpp
src/guichan/widgets/textbox.cpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'src/gui/okdialog.h')
| -rw-r--r-- | src/gui/okdialog.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/okdialog.h b/src/gui/okdialog.h index 2ee8653ec..2f32d0d65 100644 --- a/src/gui/okdialog.h +++ b/src/gui/okdialog.h @@ -23,6 +23,8 @@ #ifndef OK_DIALOG_H #define OK_DIALOG_H +#include "localconsts.h" + #include "gui/widgets/window.h" #include <guichan/actionlistener.hpp> @@ -44,7 +46,7 @@ class OkDialog : public Window, public gcn::ActionListener */ OkDialog(const std::string &title, const std::string &msg, bool modal = true, bool showCenter = true, - Window *parent = NULL); + Window *parent = nullptr); /** * Called when receiving actions from the widgets. |