#undef LoadIcon/Bitmap() too

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

docs/changes.txt

@@ -191,6 +191,11 @@ Unix:
 
 - fixed build problems with OpenGL when libGL(U) were in different directories
 
+wxMSW:
+
+- compilation fix for VC++ command line build (missing version.mak)
+- compilation fix for XRC with mingw32
+
 
 2.4.1
 -----

include/wx/msw/winundef.h

@@ -251,8 +251,33 @@
    }
 #endif
 
-// LoadLibrary
+// LoadIcon
+#ifdef LoadIcon
+    #undef LoadIcon
+    inline HICON LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName)
+    {
+        #ifdef _UNICODE
+            return LoadIconW(hInstance, lpIconName);
+        #else // ANSI
+            return LoadIconA(hInstance, lpIconName);
+        #endif // Unicode/ANSI
+    }
+#endif // LoadIcon
 
+// LoadBitmap
+#ifdef LoadBitmap
+    #undef LoadBitmap
+    inline HBITMAP LoadBitmap(HINSTANCE hInstance, LPCTSTR lpBitmapName)
+    {
+        #ifdef _UNICODE
+            return LoadBitmapW(hInstance, lpBitmapName);
+        #else // ANSI
+            return LoadBitmapA(hInstance, lpBitmapName);
+        #endif // Unicode/ANSI
+    }
+#endif // LoadBitmap
+
+// LoadLibrary
 #ifdef LoadLibrary
     #undef LoadLibrary
     #ifdef _UNICODE
@@ -326,7 +351,7 @@
 
 // For WINE
 
-#if defined(GetWindowStyle) || defined(__WXWINE__)
+#if defined(GetWindowStyle)
   #undef GetWindowStyle
 #endif