From 6ac9ed1b54e43a7efc00fa664cd6afc0c3c2d1ff Mon Sep 17 00:00:00 2001 From: jief Date: Mon, 20 Nov 2023 20:00:47 +0100 Subject: [PATCH] Change Shortcut to wchar_t to silence warnings. --- rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp | 4 ++-- rEFIt_UEFI/gui/REFIT_MENU_SCREEN.h | 2 +- rEFIt_UEFI/gui/menu_items/menu_items.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp b/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp index c35460c55..62aeaad93 100644 --- a/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp +++ b/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp @@ -431,7 +431,7 @@ void REFIT_MENU_SCREEN::FreeMenu() InfoLines.setEmpty(); } -INTN REFIT_MENU_SCREEN::FindMenuShortcutEntry(IN char32_t Shortcut) +INTN REFIT_MENU_SCREEN::FindMenuShortcutEntry(IN wchar_t Shortcut) { if (Shortcut >= 'a' && Shortcut <= 'z') Shortcut -= ('a' - 'A'); @@ -694,7 +694,7 @@ UINTN REFIT_MENU_SCREEN::RunGenericMenu(IN OUT INTN *DefaultEntryIndex, OUT REFI EFI_STATUS Status; EFI_INPUT_KEY key; // UINTN Index; - INTN ShortcutEntry; + CHAR16 ShortcutEntry; XBool HaveTimeout = false; INTN TimeoutCountdown = 0; UINTN MenuExit; diff --git a/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.h b/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.h index 1c0a20921..c752e0ac4 100644 --- a/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.h +++ b/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.h @@ -423,7 +423,7 @@ public: void AddMenuCheck(CONST CHAR8 *Text, UINTN Bit, INTN ItemNum); void AddMenuItemInput(INTN Inx, CONST CHAR8 *Title, XBool Cursor); void FreeMenu(); - INTN FindMenuShortcutEntry(IN char32_t Shortcut); + INTN FindMenuShortcutEntry(IN wchar_t Shortcut); UINTN RunGenericMenu(IN OUT INTN *DefaultEntryIndex, OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry); UINTN RunMenu(OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry); UINTN InputDialog(); diff --git a/rEFIt_UEFI/gui/menu_items/menu_items.h b/rEFIt_UEFI/gui/menu_items/menu_items.h index adb495819..3019fa397 100644 --- a/rEFIt_UEFI/gui/menu_items/menu_items.h +++ b/rEFIt_UEFI/gui/menu_items/menu_items.h @@ -108,7 +108,7 @@ class REFIT_ABSTRACT_MENU_ENTRY XBool Hidden = false; UINTN Row = 0; CHAR16 ShortcutDigit = 0; - char32_t ShortcutLetter = 0; + CHAR16 ShortcutLetter = 0; XIcon Image = 0; EG_RECT Place = EG_RECT(); ACTION AtClick = ActionNone;