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 23c4a3b22c35351e5220738fe17237da4b06656c..5e3f0d71dfb91d45588ae18faa70332c452d614f 100644 (file)
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -25,18 +25,21 @@
     #define DLL_FLAGS 0x0L
 #endif
 
+// 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 0x0409
 #ifdef _UNICODE
-    #define LANG "04090000"
+    #define CHARSET 0x4b0
+    #define LANG_WITH_CHARSET "040904b0"
 #else
-    #define LANG "040904b0"
+    #define CHARSET 0
+    #define LANG_WITH_CHARSET "04090000"
 #endif
 
-#define STRINGIZE0(x) #x
-#define STRINGIZE(x)  STRINGIZE0(x)
-
 1 VERSIONINFO
- FILEVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxBETA_NUMBER
- PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxBETA_NUMBER
+ FILEVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER
+ PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER
  FILEFLAGSMASK 0x3fL
  FILEFLAGS DLL_FLAGS
  FILEOS 0x40004L // VOS_NT_WINDOWS32
@@ -45,21 +48,24 @@
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        // US English Ascii; see http://msdn.microsoft.com/library/psdk/winui/rc_3rxn.htm for codes
-        BLOCK LANG
+        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-2005 wxWidgets development team\0"
+            VALUE "LegalCopyright", "Copyright 1993-2010 wxWidgets development team\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", STRINGIZE(WXDLLNAME) ".dll\0"
+            VALUE "OriginalFilename", wxSTRINGIZE(WXDLLNAME) ".dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "wxWidgets\0"
             VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "SpecialBuild", "\0"
         END
     END
+    BLOCK "VarFileInfo"
+    BEGIN
+            VALUE "Translation", LANG, CHARSET
+    END
 END