applied patch 422308 (fixes for version info for wxWin DLL)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

distrib/msw/tmake/b32.t

@@ -181,12 +181,15 @@ nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
+	-erase $(WXLIBDIR)\version.res
+        brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
         implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
 
 !endif
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+version.res
 
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 

include/wx/version.h

@@ -9,14 +9,22 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_VERSIONH__
-#define _WX_VERSIONH__
+#ifndef _WX_VERSION_H_
+#define _WX_VERSION_H_
 
 // Bump-up with each new version
 #define wxMAJOR_VERSION    2
 #define wxMINOR_VERSION    3
 #define wxRELEASE_NUMBER   0
 #define wxVERSION_STRING   _T("wxWindows 2.3.0")
+
+// These are used by src/msw/version.rc and should always be ASCII, not Unicode
+// and must be updated manually as well each time the version above changes
+#define wxVERSION_NUM_DOT_STRING   "2.3.0"
+#define wxVERSION_NUM_STRING       "230"
+
+// nothing should be updated below this line when updating the version
+
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
 #define wxBETA_NUMBER      0
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
@@ -27,5 +35,5 @@
     (wxMAJOR_VERSION == (major) && wxMINOR_VERSION > (minor)) || \
     (wxMAJOR_VERSION == (major) && wxMINOR_VERSION == (minor) && wxRELEASE_NUMBER >= (release)))
 
-#endif
-// _WX_VERSIONH__
+#endif // _WX_VERSION_H_
+

src/msw/version.rc

@@ -11,6 +11,12 @@
 
 #include "wx/version.h"
 
+#ifdef WXMAKINGDLL
+    #define wxVFT VFT_DLL
+#else
+    #define wxVFT VFT_APP
+#endif
+
 #ifdef _DEBUG
     #define DLL_FLAGS 0x1L
     #define DLL_SUFFIX "d"
@@ -19,30 +25,49 @@
     #define DLL_SUFFIX ""
 #endif
 
+//see http://msdn.microsoft.com/library/psdk/winui/rc_7x2d.htm for values
 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
+ // for NT/win2000 use VOS_NT next
+ FILEOS VOS__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, 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"
         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 "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, 2001 wxWindows development team\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "wxmsw221" DLL_SUFFIX ".dll\0"
+            VALUE "OriginalFilename", "wxmsw" wxVERSION_NUM_STRING DLL_SUFFIX ".dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "wxWindows\0"
-            VALUE "ProductVersion", "2.2.1\0"
+            VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "SpecialBuild", "\0"
         END
     END