Change Shortcut to wchar_t to silence warnings.

CloverHackyColor · Nov 20, 2023 · 6ac9ed1 · 6ac9ed1
1 parent ca16621
commit 6ac9ed1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -423,7 +423,7 @@ class REFIT_MENU_SCREEN
   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
@@ -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;