Revert "Auxiliary commit to revert individual files from e426924930c761b5f10e4fd8e777b55f8db329e2"

This reverts commit c1d6b2836fca30f99d49012c5ae989cdc5ad0e4f.

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

client/windows/InfoWindows.h

@@ -55,7 +55,7 @@ public:
 	std::vector<std::shared_ptr<CButton>> 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<WindowBase> createInfoWin(Point position, const CGObjectInstance * specific);