From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 5 Jan 2003 22:11:24 +0000 (+0000)
Subject: #undef LoadIcon() too
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8b39c006d83b66e4a84232bc44d5288838cb4103

#undef LoadIcon() too


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

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index aee51d4b51..d9eb7c339d 100644
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -252,6 +252,20 @@
    }
 #endif
 
+// LoadIcon
+#ifdef LoadIcon
+    #undef LoadIcon
+    inline HINSTANCE LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName)
+    {
+        #ifdef _UNICODE
+            return LoadIconW(hInstance, lpIconName);
+        #else // ANSI
+            return LoadIconA(hInstance, lpIconName);
+        #endif // Unicode/ANSI
+    }
+#endif // LoadIcon
+
+
 // LoadLibrary
 
 #ifdef LoadLibrary