From e994c01cab6fc45e54396641c5fd9fa509cfe0d6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 18 Oct 2013 13:29:03 +0300 Subject: move virtual member calls from gui constuctor into postInit. --- src/gui/gui.cpp | 6 +++++- src/gui/gui.h | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src/gui') diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 18cc061b2..d32e81fe8 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -82,7 +82,7 @@ class GuiConfigListener final : public ConfigListener Gui *mGui; }; -Gui::Gui(Graphics *const graphics) : +Gui::Gui() : gcn::Gui(), mConfigListener(new GuiConfigListener(this)), mGuiFont(), @@ -103,6 +103,10 @@ Gui::Gui(Graphics *const graphics) : mForegroundColor2(Theme::getThemeColor(Theme::TEXT_OUTLINE)), mCustomCursor(false), mDoubleClick(true) +{ +} + +void Gui::postInit(Graphics *const graphics) { logger->log1("Initializing GUI..."); // Set graphics diff --git a/src/gui/gui.h b/src/gui/gui.h index e82587623..85ec33415 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -56,7 +56,7 @@ class Gui final : public gcn::Gui /** * Constructor. */ - explicit Gui(Graphics *const screen); + Gui(); A_DELETE_COPY(Gui) @@ -65,6 +65,8 @@ class Gui final : public gcn::Gui */ ~Gui(); + void postInit(Graphics *const graphics); + /** * Performs logic of the GUI. Overridden to track mouse pointer * activity. -- cgit v1.2.3-70-g09d2