Use the current font for the DoGetBestSize calculation

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

diff --git a/src/msw/version.rc b/src/msw/version.rc
index eaca646963ac431b7ac2c4126e212e2d9d6259b6..23c4a3b22c35351e5220738fe17237da4b06656c 100644 (file)
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -6,43 +6,59 @@
 // Created:     09.07.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin
-// Licence:     wxWindows license
+// Licence:     wxWidgets license
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/version.h"
 
+// see http://msdn.microsoft.com/library/psdk/winui/rc_7x2d.htm for values: we
+// don't use symbolic constants because older compilers might not have them
+#ifdef WXMAKINGDLL
+    #define wxVFT 2 // VFT_DLL
+#else
+    #define wxVFT 1 // VFT_APP
+#endif
+
 #ifdef _DEBUG
     #define DLL_FLAGS 0x1L
-    #define DLL_SUFFIX "d"
 #else
     #define DLL_FLAGS 0x0L
-    #define DLL_SUFFIX ""
 #endif
 
+#ifdef _UNICODE
+    #define LANG "04090000"
+#else
+    #define LANG "040904b0"
+#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
  FILEFLAGSMASK 0x3fL
  FILEFLAGS DLL_FLAGS
- FILEOS 0x40004L
- FILETYPE 0x2L
+ FILEOS 0x40004L // VOS_NT_WINDOWS32
+ FILETYPE wxVFT
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "040904b0"
+        // US English Ascii; see http://msdn.microsoft.com/library/psdk/winui/rc_3rxn.htm for codes
+        BLOCK LANG
         BEGIN
-            VALUE "Comments", "wxWindows cross-platform GUI framework\0"
-            VALUE "CompanyName", "wxWindows development team\0"
-            VALUE "FileDescription", "wxWindows for MSW\0"
-            VALUE "FileVersion", "2.2.1\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 "LegalCopyright", "Copyright © 1993, 2000 wxWindows development team\0"
+            VALUE "LegalCopyright", "Copyright © 1993-2005 wxWidgets development team\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "wxmsw221" DLL_SUFFIX ".dll\0"
+            VALUE "OriginalFilename", STRINGIZE(WXDLLNAME) ".dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "wxWindows\0"
-            VALUE "ProductVersion", "2.2.1\0"
+            VALUE "ProductName", "wxWidgets\0"
+            VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "SpecialBuild", "\0"
         END
     END