ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename CxbxMessageBox to PopupPlatformHandler

This commit is contained in:
RadWolfie 2020-06-20 03:58:55 -05:00
parent 2c73d8b736
commit 4da39275b4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/Logging.cpp
View File

@ -248,12 +248,10 @@ void log_init_popup_msg()
g_disablePopupMessages = vSettings.bFullScreen;
}
PopupReturn CxbxMessageBox(const char* msg, const PopupReturn ret_default, const UINT uType, const HWND hWnd)
// TODO: Move PopupPlatformHandler into common GUI's window source code or use imgui in the future.
// PopupPlatformHandler is intended to be use as internal wrapper function.
static PopupReturn PopupPlatformHandler(const char* msg, const PopupReturn ret_default, const UINT uType, const HWND hWnd)
{
// If user is using exclusive fullscreen, we need to refrain all popups.
if (g_disablePopupMessages) {
return ret_default;
}
int ret = MessageBox(hWnd, msg, /*lpCaption=*/TEXT("Cxbx-Reloaded"), uType);
switch (ret) {
@ -333,7 +331,12 @@ PopupReturn PopupCustomEx(const void* hwnd, const CXBXR_MODULE cxbxr_module, con
EmuLogOutputEx(cxbxr_module, level, "Popup : %s", Buffer);
return CxbxMessageBox(Buffer, ret_default, uType, (const HWND)hwnd);
// If user is using exclusive fullscreen, we need to refrain all popups.
if (g_disablePopupMessages) {
return ret_default;
}
return PopupPlatformHandler(Buffer, ret_default, uType, (const HWND)hwnd);
}
const bool needs_escape(const wint_t _char)