undef LoadMenu() (patch #521743)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index e83f34baa64ec0f1757a3079aada60b2eccc0f24..2a63c4864b37fc377341d91354047bfd56f430ae 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -43,6 +43,21 @@
     }
 #endif
 
     }
 #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
 // GetCharWidth
 
 #ifdef GetCharWidth