Don't overwrite status message when restoring it if it changed.

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

diff --git a/src/msw/version.rc b/src/msw/version.rc
index 2ca75bce83cdf85292f47f84760602f35b385c06..dc7fbe8c52f5acc25b604b89402bdb7f426f7b05 100644 (file)
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -6,7 +6,7 @@
 // Created:     09.07.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin
 // Created:     09.07.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin

-// Licence:     wxWindows license
+// Licence:     wxWidgets license

 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/version.h"
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/version.h"


@@ -21,15 +21,25 @@
 
 #ifdef _DEBUG
     #define DLL_FLAGS 0x1L
 
 #ifdef _DEBUG
     #define DLL_FLAGS 0x1L

-    #define DLL_SUFFIX "d"

 #else
     #define DLL_FLAGS 0x0L
 #else
     #define DLL_FLAGS 0x0L

-    #define DLL_SUFFIX ""
+#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 CHARSET 0x4b0
+    #define LANG_WITH_CHARSET "040904b0"
+#else
+    #define CHARSET 0
+    #define LANG_WITH_CHARSET "04090000"

 #endif
 
 1 VERSIONINFO
 #endif
 
 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
  FILEFLAGSMASK 0x3fL
  FILEFLAGS DLL_FLAGS
  FILEOS 0x40004L // VOS_NT_WINDOWS32


@@ -38,37 +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 "04090000" 
-        BEGIN
-            VALUE "Comments", "wxWindows cross-platform GUI framework\0"
-            VALUE "CompanyName", "wxWindows development team\0"
-            VALUE "FileDescription", "wxWindows for MSW\0"
-            VALUE "FileVersion", "wxWindows Library " wxVERSION_NUM_DOT_STRING "\0"
-            VALUE "InternalName", "wxMSW\0"
-            VALUE "LegalCopyright", "Copyright © 1993, 2001 wxWindows development team\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "wxmsw" wxVERSION_NUM_STRING DLL_SUFFIX ".dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "wxWindows\0"
-            VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
-            VALUE "SpecialBuild", "\0"
-        END
-        //US English Unicode; see http://msdn.microsoft.com/library/psdk/winui/rc_3rxn.htm for codes
-        BLOCK "040904b0"
+        BLOCK LANG_WITH_CHARSET

         BEGIN
         BEGIN

-            VALUE "Comments", "wxWindows cross-platform GUI framework\0"
-            VALUE "CompanyName", "wxWindows development team\0"
-            VALUE "FileDescription", "wxWindows for MSW\0"
-            VALUE "FileVersion", "wxWindows Library " wxVERSION_NUM_DOT_STRING "\0"
+            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 "InternalName", "wxMSW\0"

-            VALUE "LegalCopyright", "Copyright © 1993, 2001 wxWindows development team\0"
+            VALUE "LegalCopyright", "Copyright © 1993-2007 wxWidgets development team\0"

             VALUE "LegalTrademarks", "\0"
             VALUE "LegalTrademarks", "\0"

-            VALUE "OriginalFilename", "wxmsw" wxVERSION_NUM_STRING DLL_SUFFIX ".dll\0"
+            VALUE "OriginalFilename", wxSTRINGIZE(WXDLLNAME) ".dll\0"

             VALUE "PrivateBuild", "\0"
             VALUE "PrivateBuild", "\0"

-            VALUE "ProductName", "wxWindows\0"
+            VALUE "ProductName", "wxWidgets\0"

             VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "SpecialBuild", "\0"
         END
     END
             VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "SpecialBuild", "\0"
         END
     END

+    BLOCK "VarFileInfo"
+    BEGIN
+            VALUE "Translation", LANG, CHARSET
+    END

 END
 END