#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 aee51d4b515d6f3a281bbbbee6b637336c5c793a..d9eb7c339d872885342860e483004e790586ca03 100644 (file)
--- 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