reverted wxPopupWindow implementation to the original version using WS_CHILD and...

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

diff --git a/src/msw/version.rc b/src/msw/version.rc
index 9a1a536efdf8e8e7fc7472b3eb4c28d27ecd5c8e..562587cae69b4446f151ce9e7270c1e117c0af09 100644 (file)
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -9,39 +9,66 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,0,0
- PRODUCTVERSION 2,2,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef __WXDEBUG__
- FILEFLAGS 0x1L
+#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
- FILEFLAGS 0x0L
+    #define DLL_FLAGS 0x0L
+    #define DLL_SUFFIX ""
 #endif
- FILEOS 0x40004L
- FILETYPE 0x2L
+
+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 // 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
+        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-2002 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"
         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, 0, 0\0"
+            VALUE "FileVersion", "wxWindows Library " wxVERSION_NUM_DOT_STRING "\0"
             VALUE "InternalName", "wxMSW\0"
-            VALUE "LegalCopyright", "Copyright © 1993,2000 wxWindows development team\0"
+            VALUE "LegalCopyright", "Copyright © 1993-2002 wxWindows development team\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "wx220.dll\0"
+            VALUE "OriginalFilename", "wxmsw" wxVERSION_NUM_STRING DLL_SUFFIX ".dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "wxMSW\0"
-            VALUE "ProductVersion", "2, 2, 0, 0\0"
+            VALUE "ProductName", "wxWindows\0"
+            VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "SpecialBuild", "\0"
         END
     END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
 END