Merge branch 'master' into jgrpp

# Conflicts: # src/widget.cpp
2023-12-29 16:29:45 +00:00
parent b49f8c6bfc feb94d233d
commit 201ddf4c08
14 changed files with 63 additions and 91 deletions
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -331,7 +331,7 @@ public:
 	virtual ptrdiff_t GetTextCharacterAtPosition(const Point &pt) const;

 	void InitNested(WindowNumber number = 0);
-	void CreateNestedTree(bool fill_nested = true);
+	void CreateNestedTree();
 	void FinishInitNested(WindowNumber window_number = 0);

 	void ChangeWindowClass(WindowClass cls);