diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-14 16:12:35 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-14 16:12:35 +0300 |
| commit | 812193ffc15ce42487b92c6c2294475bfcf0b5d9 (patch) | |
| tree | f5491e9b6c349e6b21e5ab3f2a5bd7f269ebc50d | |
| parent | 33dc4573f4defbfb40b62d2d5ee1ed8f423c9db7 (diff) | |
| download | manaplus-812193ffc15ce42487b92c6c2294475bfcf0b5d9.tar.gz manaplus-812193ffc15ce42487b92c6c2294475bfcf0b5d9.tar.bz2 manaplus-812193ffc15ce42487b92c6c2294475bfcf0b5d9.tar.xz manaplus-812193ffc15ce42487b92c6c2294475bfcf0b5d9.zip | |
Add macro for create widget, call postInit and return widget.
| -rw-r--r-- | src/gui/widgets/createwidget.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/widget.cpp | 6 | ||||
| -rw-r--r-- | src/gui/widgets/widget.h | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/gui/widgets/createwidget.h b/src/gui/widgets/createwidget.h index 3a2102676..61f85e4c0 100644 --- a/src/gui/widgets/createwidget.h +++ b/src/gui/widgets/createwidget.h @@ -26,6 +26,6 @@ var->postInit() #define CREATEWIDGET2(type, ...) \ - static_cast<type>(Widget::callPostInit(new type(__VA_ARGS__))) + static_cast<type*>(Widget::callPostInit(new type(__VA_ARGS__))) #endif // GUI_WIDGETS_CREATEWIDGET_H diff --git a/src/gui/widgets/widget.cpp b/src/gui/widgets/widget.cpp index 3be80c772..7fdab305e 100644 --- a/src/gui/widgets/widget.cpp +++ b/src/gui/widgets/widget.cpp @@ -513,3 +513,9 @@ void Widget::windowResized() { mRedraw = true; } + +Widget *Widget::callPostInit(Widget *const widget) +{ + widget->postInit(); + return widget; +} diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h index 5868e20aa..416782dc2 100644 --- a/src/gui/widgets/widget.h +++ b/src/gui/widgets/widget.h @@ -1027,6 +1027,8 @@ class Widget notfinal : public Widget2 void windowResized(); + static Widget *callPostInit(Widget *const widget); + virtual void postInit() { } |