[Scummvm-git-logs] scummvm master -> a7bf859e995c83b120f8eea32c743d8a11c3e44e

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a7bf859e99 MACVENTURE: Fix compilation after MacWindow API change


Commit: a7bf859e995c83b120f8eea32c743d8a11c3e44e
    https://github.com/scummvm/scummvm/commit/a7bf859e995c83b120f8eea32c743d8a11c3e44e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-05-31T13:39:07+02:00

Commit Message:
MACVENTURE: Fix compilation after MacWindow API change

Changed paths:
    engines/macventure/gui.cpp


diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp
index abccc530efb..bf3716a618e 100644
--- a/engines/macventure/gui.cpp
+++ b/engines/macventure/gui.cpp
@@ -225,7 +225,7 @@ void Gui::initWindows() {
 	bounds = getWindowData(kCommandsWindow).bounds;
 	bbs = borderBounds(findWindowData(kCommandsWindow).type);
 	loadBorders(_controlsWindow, findWindowData(kCommandsWindow).type);
-	_controlsWindow->resize(bounds.width(), bounds.height(), true);
+	_controlsWindow->resizeInner(bounds.width(), bounds.height());
 	_controlsWindow->move(bounds.left - bbs.leftOffset, bounds.top - bbs.topOffset);
 
 	_controlsWindow->setActive(false);
@@ -237,7 +237,7 @@ void Gui::initWindows() {
 	bbs = borderBounds(findWindowData(kMainGameWindow).type);
 
 	loadBorders(_mainGameWindow, findWindowData(kMainGameWindow).type);
-	_mainGameWindow->resize(bounds.width(), bounds.height(), true);
+	_mainGameWindow->resizeInner(bounds.width(), bounds.height());
 	_mainGameWindow->move(bounds.left - bbs.leftOffset, bounds.top - bbs.topOffset);
 
 	_mainGameWindow->setActive(false);
@@ -249,7 +249,7 @@ void Gui::initWindows() {
 	bounds = getWindowData(kOutConsoleWindow).bounds;
 	bbs = borderBounds(findWindowData(kOutConsoleWindow).type);
 	loadBorders(_outConsoleWindow, findWindowData(kOutConsoleWindow).type);
-	_outConsoleWindow->resize(bounds.width() - bbs.rightScrollbarWidth, bounds.height() - bbs.bottomScrollbarHeight, true);
+	_outConsoleWindow->resizeInner(bounds.width() - bbs.rightScrollbarWidth, bounds.height() - bbs.bottomScrollbarHeight);
 	_outConsoleWindow->move(bounds.left - bbs.leftOffset, bounds.top - bbs.topOffset);
 	_outConsoleWindow->setActive(false);
 	_outConsoleWindow->setCallback(outConsoleWindowCallback, this);
@@ -260,7 +260,7 @@ void Gui::initWindows() {
 	bounds = getWindowData(kSelfWindow).bounds;
 	bbs = borderBounds(findWindowData(kSelfWindow).type);
 	loadBorders(_selfWindow, findWindowData(kSelfWindow).type);
-	_selfWindow->resize(bounds.width(), bounds.height(), true);
+	_selfWindow->resizeInner(bounds.width(), bounds.height());
 	_selfWindow->move(bounds.left - bbs.leftOffset, bounds.top - bbs.topOffset);
 
 	_selfWindow->setActive(false);
@@ -272,7 +272,7 @@ void Gui::initWindows() {
 	bounds = getWindowData(kExitsWindow).bounds;
 	bbs = borderBounds(findWindowData(kExitsWindow).type);
 	loadBorders(_exitsWindow, findWindowData(kExitsWindow).type);
-	_exitsWindow->resize(bounds.width(), bounds.height(), true);
+	_exitsWindow->resizeInner(bounds.width(), bounds.height());
 	_exitsWindow->move(bounds.left - bbs.leftOffset, bounds.top - bbs.topOffset);
 
 	_exitsWindow->setActive(false);
@@ -381,7 +381,7 @@ WindowReference Gui::createInventoryWindow(ObjID objRef) {
 	//newWindow->setDimensions(newData.bounds);
 	//newWindow->setActive(false);
 	loadBorders(newWindow, newData.type);
-	newWindow->resize(newData.bounds.width(), newData.bounds.height() - bbs.bottomScrollbarHeight, true);
+	newWindow->resizeInner(newData.bounds.width(), newData.bounds.height() - bbs.bottomScrollbarHeight);
 	newWindow->move(newData.bounds.left - bbs.leftOffset, newData.bounds.top - bbs.topOffset);
 	newWindow->setCallback(inventoryWindowCallback, this);
 	//newWindow->setCloseable(true);