changed wxAuiBlendColour() to work with unsigned chars instead of doubles as it's...

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

diff --git a/src/msw/version.rc b/src/msw/version.rc
index 1e53b56e78b762a6d086bf0c8e987ecee7359e20..eba2134fe06fcfba1e0da3fc52c3d2be7b150206 100644 (file)
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -6,67 +6,55 @@
 // 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"
 

+// 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
 #ifdef WXMAKINGDLL

-    #define wxVFT VFT_DLL
+    #define wxVFT 2 // VFT_DLL

 #else
 #else

-    #define wxVFT VFT_APP
+    #define wxVFT 1 // VFT_APP

 #endif
 
 #ifdef _DEBUG
     #define DLL_FLAGS 0x1L
 #endif
 
 #ifdef _DEBUG
     #define DLL_FLAGS 0x1L

-    #define DLL_SUFFIX "d"

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

-    #define DLL_SUFFIX ""

 #endif
 
 #endif
 

-//see http://msdn.microsoft.com/library/psdk/winui/rc_7x2d.htm for values
+#ifdef _UNICODE
+    #define LANG "04090000"
+#else
+    #define LANG "040904b0"
+#endif
+

 1 VERSIONINFO
 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
  FILEFLAGSMASK 0x3fL
  FILEFLAGS DLL_FLAGS

- // for NT/win2000 use VOS_NT next
- FILEOS VOS__WINDOWS32
+ FILEOS 0x40004L // VOS_NT_WINDOWS32

  FILETYPE wxVFT
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         // US English Ascii; see http://msdn.microsoft.com/library/psdk/winui/rc_3rxn.htm for codes
  FILETYPE wxVFT
  FILESUBTYPE 0x0L
 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

         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
             VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "SpecialBuild", "\0"
         END