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

[dreammaster]

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

Summary:
b141255175 BAGEL: Remove duplicate AfxGetApp declaration


Commit: b141255175c8c123312defa9f4071f38e0796cdc
    https://github.com/scummvm/scummvm/commit/b141255175c8c123312defa9f4071f38e0796cdc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-12T23:22:40-07:00

Commit Message:
BAGEL: Remove duplicate AfxGetApp declaration

Changed paths:
    engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
    engines/bagel/mfc/afxwin.h


diff --git a/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp b/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
index cc841f40256..8ac0c549dbd 100644
--- a/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
+++ b/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
@@ -564,8 +564,18 @@ void CMainZoomWindow::OnTimer(uintptr nEventID) {
 	delete pDemoMsg2;
 	pDemoMsg2 = nullptr;
 
-	// TODO: Add display of Quit and Slide Show buttons
-
+	// Add Quit and Slide Show buttons
+	CRect ssRect((GAME_WIDTH / 2) - 120, 450, (GAME_WIDTH / 2) - 20, 470);
+	pSlideshowButton = new CColorButton();
+	pSlideshowButton->Create("Slide Show", BS_OWNERDRAW | WS_CHILD | WS_VISIBLE, ssRect, this, IDC_LEAVE);
+	pSlideshowButton->SetPalette(pGamePalette);
+
+	CRect quitRect((GAME_WIDTH / 2) + 20, 450, (GAME_WIDTH / 2) + 120, 470);
+	pReturnButton = new CColorButton();
+	pReturnButton->Create("Quit", BS_OWNERDRAW | WS_CHILD | WS_VISIBLE, quitRect, this, IDC_LEAVE);
+	pReturnButton->SetPalette(pGamePalette);
+
+	// Set the screen to redraw
 	Invalidate();
 }
 
diff --git a/engines/bagel/mfc/afxwin.h b/engines/bagel/mfc/afxwin.h
index c1e5508f6b8..9776cf86f15 100644
--- a/engines/bagel/mfc/afxwin.h
+++ b/engines/bagel/mfc/afxwin.h
@@ -2071,9 +2071,6 @@ public:
 		const char *  lpClassName, LPWNDCLASS lpWndClass);
 };
 
-extern CWinApp *AfxGetApp();
-HINSTANCE AfxGetInstanceHandle();
-
 } // namespace MFC
 } // namespace Bagel