From 80f1a8d1b590351ba812f39737723ec7d04a0d82 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Tue, 10 Mar 2026 22:33:45 +1100 Subject: [PATCH] Remove Win32 callback types from UI keyboard scenes --- Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp | 2 +- Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.h | 4 ++-- .../Platform/Common/UI/UIScene_DebugCreateSchematic.cpp | 4 ++-- .../Platform/Common/UI/UIScene_DebugCreateSchematic.h | 4 ++-- .../Platform/Common/UI/UIScene_DebugSetCamera.cpp | 2 +- Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.h | 4 ++-- Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp | 4 ++-- Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.h | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp index f3000b74e..5d56e7515 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp @@ -306,7 +306,7 @@ UIControl *UIScene_AnvilMenu::getSection(ESceneSection eSection) return control; } -int UIScene_AnvilMenu::KeyboardCompleteCallback(LPVOID lpParam,bool bRes) +int UIScene_AnvilMenu::KeyboardCompleteCallback(void *lpParam,bool bRes) { // 4J HEG - No reason to set value if keyboard was cancelled UIScene_AnvilMenu *pClass=(UIScene_AnvilMenu *)lpParam; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.h index 53ce46871..829264155 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.h @@ -55,7 +55,7 @@ protected: virtual UIControl *getSection(ESceneSection eSection); - static int KeyboardCompleteCallback(LPVOID lpParam,bool bRes); + static int KeyboardCompleteCallback(void *lpParam,bool bRes); virtual void handleEditNamePressed(); virtual void setEditNameValue(const std::wstring &name); virtual void setEditNameEditable(bool enabled); @@ -63,4 +63,4 @@ protected: void setCostLabel(const std::wstring &label, bool canAfford); void showCross(bool show); -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp index 897cebb73..34256547e 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp @@ -134,7 +134,7 @@ void UIScene_DebugCreateSchematic::handleCheckboxToggled(F64 controlId, bool sel } } -int UIScene_DebugCreateSchematic::KeyboardCompleteCallback(LPVOID lpParam,bool bRes) +int UIScene_DebugCreateSchematic::KeyboardCompleteCallback(void *lpParam,bool bRes) { UIScene_DebugCreateSchematic *pClass=(UIScene_DebugCreateSchematic *)lpParam; @@ -213,4 +213,4 @@ int UIScene_DebugCreateSchematic::KeyboardCompleteCallback(LPVOID lpParam,bool b return 0; } -#endif \ No newline at end of file +#endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.h b/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.h index 80ec8d057..763803919 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.h @@ -68,6 +68,6 @@ protected: virtual void handleCheckboxToggled(F64 controlId, bool selected); private: - static int KeyboardCompleteCallback(LPVOID lpParam,const bool bRes); + static int KeyboardCompleteCallback(void *lpParam,const bool bRes); }; -#endif \ No newline at end of file +#endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.cpp index 46d2460c8..21d196fd3 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.cpp @@ -116,7 +116,7 @@ void UIScene_DebugSetCamera::handleCheckboxToggled(F64 controlId, bool selected) } } -int UIScene_DebugSetCamera::KeyboardCompleteCallback(LPVOID lpParam,bool bRes) +int UIScene_DebugSetCamera::KeyboardCompleteCallback(void *lpParam,bool bRes) { UIScene_DebugSetCamera *pClass=(UIScene_DebugSetCamera *)lpParam; uint16_t pchText[2048];//[128]; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.h b/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.h index 926a54040..6a99cdaf8 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.h @@ -64,6 +64,6 @@ protected: virtual void handleCheckboxToggled(F64 controlId, bool selected); private: - static int KeyboardCompleteCallback(LPVOID lpParam,const bool bRes); + static int KeyboardCompleteCallback(void *lpParam,const bool bRes); }; -#endif \ No newline at end of file +#endif diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp index fb85bd56b..c8466f6b1 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp @@ -140,7 +140,7 @@ void UIScene_SignEntryMenu::handleInput(int iPad, int key, bool repeat, bool pre } } -int UIScene_SignEntryMenu::KeyboardCompleteCallback(LPVOID lpParam,bool bRes) +int UIScene_SignEntryMenu::KeyboardCompleteCallback(void *lpParam,bool bRes) { // 4J HEG - No reason to set value if keyboard was cancelled UIScene_SignEntryMenu *pClass=(UIScene_SignEntryMenu *)lpParam; @@ -203,4 +203,4 @@ void UIScene_SignEntryMenu::handleDestroy() #if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO) InputManager.DestroyKeyboard(); #endif -} \ No newline at end of file +} diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.h index d2535ce78..62ac378d0 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.h @@ -53,6 +53,6 @@ public: protected: void handlePress(F64 controlId, F64 childId); - static int KeyboardCompleteCallback(LPVOID lpParam,const bool bRes); + static int KeyboardCompleteCallback(void *lpParam,const bool bRes); virtual void handleDestroy(); -}; \ No newline at end of file +};