Avoid outputting the assert message twice in non-GUI code.

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

diff --git a/src/msw/version.rc b/src/msw/version.rc
index 6a294e5dab32965e7a272dd486fc6fef73e34f0d..ddc625f315dbf73977a403d4bfe80b5c9547242d 100644 (file)
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -25,15 +25,18 @@
     #define DLL_FLAGS 0x0L
 #endif
 
     #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
 #ifdef _UNICODE

-    #define LANG "04090000"
+    #define CHARSET 0x4b0
+    #define LANG_WITH_CHARSET "040904b0"

 #else
 #else

-    #define LANG "040904b0"
+    #define CHARSET 0
+    #define LANG_WITH_CHARSET "04090000"

 #endif
 
 #endif
 

-#define STRINGIZE0(x) #x
-#define STRINGIZE(x)  STRINGIZE0(x)
-

 1 VERSIONINFO
  FILEVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER
  PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER
 1 VERSIONINFO
  FILEVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER
  PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER


@@ -45,21 +48,24 @@
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
 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"
         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-2006 wxWidgets development team\0"
+            VALUE "LegalCopyright", "Copyright 1993-2009 wxWidgets development team\0"

             VALUE "LegalTrademarks", "\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
             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
 END