From 0c76ae89f8151c248df4f2d4b3f31b18401a3240 Mon Sep 17 00:00:00 2001 From: nordsoft Date: Mon, 14 Aug 2023 16:33:41 +0400 Subject: [PATCH] Revert "Auxiliary commit to revert individual files from e426924930c761b5f10e4fd8e777b55f8db329e2" This reverts commit c1d6b2836fca30f99d49012c5ae989cdc5ad0e4f. --- client/gui/CIntObject.h | 2 +- client/windows/InfoWindows.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/gui/CIntObject.h b/client/gui/CIntObject.h index 2807aa413..5d8a3f53a 100644 --- a/client/gui/CIntObject.h +++ b/client/gui/CIntObject.h @@ -142,7 +142,7 @@ class WindowBase : public CIntObject public: WindowBase(int used_ = 0, Point pos_ = Point()); protected: - virtual void close(); + void close(); }; class IGarrisonHolder diff --git a/client/windows/InfoWindows.h b/client/windows/InfoWindows.h index 501c47459..e7911884a 100644 --- a/client/windows/InfoWindows.h +++ b/client/windows/InfoWindows.h @@ -55,7 +55,7 @@ public: std::vector> buttons; TCompsInfo components; - void close() override; + virtual void close(); void show(Canvas & to) override; void showAll(Canvas & to) override; @@ -78,7 +78,7 @@ public: class CRClickPopup : public WindowBase { public: - void close() override; + virtual void close(); bool isPopupWindow() const override; static std::shared_ptr createInfoWin(Point position, const CGObjectInstance * specific);