From 731db7098007e6cad7363300510e1538b6780196 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 23 Feb 2002 21:05:40 +0000 Subject: [PATCH] undef LoadMenu() (patch #521743) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/winundef.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index e83f34baa6..2a63c4864b 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -43,6 +43,21 @@ } #endif +// LoadMenu + +#ifdef LoadMenu + #undef LoadMenu + + inline HMENU LoadMenu(HINSTANCE instance, LPCTSTR name) + { + #ifdef _UNICODE + return LoadMenuW(instance, name); + #else + return LoadMenuA(instance, name); + #endif + } +#endif + // GetCharWidth #ifdef GetCharWidth