Fixed VC6 compilation - wxAny(const wxVariant&) ctor required a specific 'template<>')

[wxWidgets.git] / src / msw / version.rc

diff --git a/src/msw/version.rc b/src/msw/version.rc
index c3f51db8f59db2a02b4c515bd80745d05f475bf1..5e3f0d71dfb91d45588ae18faa70332c452d614f 100644 (file)
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -28,11 +28,13 @@
 // 0x0409 is US English, 0x04b0 is Unicode and 0x0000 is 7 bit ASCII. see
 // http://msdn.microsoft.com/en-us/library/aa381049(VS.85).aspx for the full
 // list of languages and charsets
-#define LANG "0409"
+#define LANG 0x0409
 #ifdef _UNICODE
-    #define CHARSET "04b0"
+    #define CHARSET 0x4b0
+    #define LANG_WITH_CHARSET "040904b0"
 #else
-    #define CHARSET "0000"
+    #define CHARSET 0
+    #define LANG_WITH_CHARSET "04090000"
 #endif
 
 1 VERSIONINFO
@@ -46,14 +48,14 @@
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK LANG CHARSET
+        BLOCK LANG_WITH_CHARSET
         BEGIN
             VALUE "Comments", "wxWidgets cross-platform GUI framework\0"
             VALUE "CompanyName", "wxWidgets development team\0"
             VALUE "FileDescription", "wxWidgets for MSW\0"
             VALUE "FileVersion", "wxWidgets Library " wxVERSION_NUM_DOT_STRING "\0"
             VALUE "InternalName", "wxMSW\0"
-            VALUE "LegalCopyright", "Copyright © 1993-2007 wxWidgets development team\0"
+            VALUE "LegalCopyright", "Copyright 1993-2010 wxWidgets development team\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", wxSTRINGIZE(WXDLLNAME) ".dll\0"
             VALUE "PrivateBuild", "\0"
@@ -62,11 +64,8 @@ BEGIN
             VALUE "SpecialBuild", "\0"
         END
     END
-    // windres can't handle the syntax below for some reason (see #11055)
-#ifndef __GNUC__
     BLOCK "VarFileInfo"
     BEGIN
             VALUE "Translation", LANG, CHARSET
     END
-#endif // !__GNUC__
 END