From 812193ffc15ce42487b92c6c2294475bfcf0b5d9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 14 Jun 2015 16:12:35 +0300 Subject: Add macro for create widget, call postInit and return widget. --- src/gui/widgets/createwidget.h | 2 +- src/gui/widgets/widget.cpp | 6 ++++++ src/gui/widgets/widget.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) 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(Widget::callPostInit(new type(__VA_ARGS__))) + static_cast(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() { } -- cgit v1.2.3-70-g09d2