Applied patch from Neil Robinson to allow manipulation of unattached menubars

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

diff --git a/src/msw/version.rc b/src/msw/version.rc
index a5a4e7a65792bce210029895ecc501f614c2f824..6a294e5dab32965e7a272dd486fc6fef73e34f0d 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,10 +21,8 @@
 
 #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
 
 #ifdef _UNICODE
 #endif
 
 #ifdef _UNICODE


@@ -33,9 +31,12 @@
     #define LANG "040904b0"
 #endif
 
     #define LANG "040904b0"
 #endif
 

+#define STRINGIZE0(x) #x
+#define STRINGIZE(x)  STRINGIZE0(x)
+

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


@@ -47,16 +48,16 @@ BEGIN
         // US English Ascii; see http://msdn.microsoft.com/library/psdk/winui/rc_3rxn.htm for codes
         BLOCK LANG
         BEGIN
         // 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", "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-2004 wxWindows development team\0"
+            VALUE "LegalCopyright", "Copyright © 1993-2006 wxWidgets development team\0"

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

-            VALUE "OriginalFilename", "wxmsw" wxVERSION_NUM_STRING DLL_SUFFIX ".dll\0"
+            VALUE "OriginalFilename", STRINGIZE(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