Re: TortoiseCVS RC4 patches

"Arthur Barrett" <arthur.barrett-qn/[email protected]> Thu, 17 Dec 2009 10:03:24 +1100
Newsgroups	gmane.comp.version-control.cvs.tortoisecvs.user
Message-ID	<[email protected]>
Torsten,

> This must mean that wxUSE_STD_STRING is not set correctly:
> 
> #define wxUSE_STD_STRING  1

When I grep the #define's and compare TortoiseCVS\wxw\lib\vc_lib\mswu\wx\setup.h wxWidgets-2.8.9\include\wx\msw\setup.h with wxWidgets-2.8.9\include\wx\msw\setup.h I do not see that wxUSE_STD_STRING is different.

The complete set of differences are (are all these changes really needed?):

** NOTE ** I had already changed wxUSE_STL to 1 as per yesterdays conversation...
 
10,11c10,11
< #define wxUSE_ON_FATAL_EXCEPTION 1
< #define wxUSE_STACKWALKER 1
---
> #define wxUSE_ON_FATAL_EXCEPTION 0
> #define wxUSE_STACKWALKER 0
13c13
<     #define wxUSE_UNICODE 0
---
>     #define wxUSE_UNICODE 1
25c25
< #define wxUSE_STD_IOSTREAM  0
---
> #define wxUSE_STD_IOSTREAM  1
42c42
< #define wxUSE_DIALUP_MANAGER   1
---
> #define wxUSE_DIALUP_MANAGER   0
45,49c45,49
< #define wxUSE_SOCKETS       1
< #define wxUSE_FILESYSTEM    1
< #define wxUSE_FS_ZIP        1
< #define wxUSE_FS_ARCHIVE    1
< #define wxUSE_FS_INET       1
---
> #define wxUSE_SOCKETS       0
> #define wxUSE_FILESYSTEM    0
> #define wxUSE_FS_ZIP        0
> #define wxUSE_FS_ARCHIVE    0
> #define wxUSE_FS_INET       0
51,53c51,53
< #define wxUSE_ZIPSTREAM     1
< #define wxUSE_TARSTREAM     1
< #define wxUSE_ZLIB          1
---
> #define wxUSE_ZIPSTREAM     0
> #define wxUSE_TARSTREAM     0
> #define wxUSE_ZLIB          0
58,62c58,62
< #define wxUSE_PROTOCOL 1
< #define wxUSE_PROTOCOL_FILE 1
< #define wxUSE_PROTOCOL_FTP 1
< #define wxUSE_PROTOCOL_HTTP 1
< #define wxUSE_URL 1
---
> #define wxUSE_PROTOCOL 0
> #define wxUSE_PROTOCOL_FILE 0
> #define wxUSE_PROTOCOL_FTP 0
> #define wxUSE_PROTOCOL_HTTP 0
> #define wxUSE_URL 0
70c70
< #define wxUSE_XRC       1
---
> #define wxUSE_XRC       0
73c73
< #define wxUSE_GRAPHICS_CONTEXT 0
---
> #define wxUSE_GRAPHICS_CONTEXT 1
159c159
< #define wxUSE_HTML          1
---
> #define wxUSE_HTML          0
170,171c170,171
< #define wxUSE_MS_HTML_HELP 1
< #define wxUSE_WXHTML_HELP 1
---
> #define wxUSE_MS_HTML_HELP 0
> #define wxUSE_WXHTML_HELP 0
179c179
< #define wxODBC_FWD_ONLY_CURSORS        1
---
> #define wxODBC_FWD_ONLY_CURSORS  1
184,190c184,190
< #define wxUSE_LIBPNG        1
< #define wxUSE_LIBJPEG       1
< #define wxUSE_LIBTIFF       1
< #define wxUSE_TGA           1
< #define wxUSE_GIF           1
< #define wxUSE_PNM           1
< #define wxUSE_PCX           1
---
> #define wxUSE_LIBPNG        0
> #define wxUSE_LIBJPEG       0
> #define wxUSE_LIBTIFF       0
> #define wxUSE_TGA           0
> #define wxUSE_GIF           0
> #define wxUSE_PNM           0
> #define wxUSE_PCX           0
216c216
< #define wxUSE_CRASHREPORT 1
---
> #define wxUSE_CRASHREPORT 0


BTW- the tortoisecvs development page states "When you compile wxWidgets with Visual C++, make sure you set these values (in lib/vc_lib/msw*/wx/setup.h)" which I believe is incorrect - the correct file to change is /include/wx/msw/setup.h which is copied to /vc_lib/msw*/wx/setup.h during the build process.

Just to be sure I greped the #define's and compared TortoiseCVS\wxw\lib\vc_lib\mswu\wx\setup.h wxWidgets-2.8.9\include\wx\msw\setup.h with wxWidgets-2.8.9\lib\vc_lib\mswu\wx\setup.h:

D:\cvsbin\release builder>diff  setup_mswu-dos.txt  tcvs-setu
10,11c10,11
< #define wxUSE_ON_FATAL_EXCEPTION 1
< #define wxUSE_STACKWALKER 1
---
> #define wxUSE_ON_FATAL_EXCEPTION 0
> #define wxUSE_STACKWALKER 0
13c13
<     #define wxUSE_UNICODE 0
---
>     #define wxUSE_UNICODE 1
25c25
< #define wxUSE_STD_IOSTREAM  0
---
> #define wxUSE_STD_IOSTREAM  1
42c42
< #define wxUSE_DIALUP_MANAGER   1
---
> #define wxUSE_DIALUP_MANAGER   0
45,49c45,49
< #define wxUSE_SOCKETS       1
< #define wxUSE_FILESYSTEM    1
< #define wxUSE_FS_ZIP        1
< #define wxUSE_FS_ARCHIVE    1
< #define wxUSE_FS_INET       1
---
> #define wxUSE_SOCKETS       0
> #define wxUSE_FILESYSTEM    0
> #define wxUSE_FS_ZIP        0
> #define wxUSE_FS_ARCHIVE    0
> #define wxUSE_FS_INET       0
51,53c51,53
< #define wxUSE_ZIPSTREAM     1
< #define wxUSE_TARSTREAM     1
< #define wxUSE_ZLIB          1
---
> #define wxUSE_ZIPSTREAM     0
> #define wxUSE_TARSTREAM     0
> #define wxUSE_ZLIB          0
58,62c58,62
< #define wxUSE_PROTOCOL 1
< #define wxUSE_PROTOCOL_FILE 1
< #define wxUSE_PROTOCOL_FTP 1
< #define wxUSE_PROTOCOL_HTTP 1
< #define wxUSE_URL 1
---
> #define wxUSE_PROTOCOL 0
> #define wxUSE_PROTOCOL_FILE 0
> #define wxUSE_PROTOCOL_FTP 0
> #define wxUSE_PROTOCOL_HTTP 0
> #define wxUSE_URL 0
70c70
< #define wxUSE_XRC       1
---
> #define wxUSE_XRC       0
73c73
< #define wxUSE_GRAPHICS_CONTEXT 0
---
> #define wxUSE_GRAPHICS_CONTEXT 1
159c159
< #define wxUSE_HTML          1
---
> #define wxUSE_HTML          0
170,171c170,171
< #define wxUSE_MS_HTML_HELP 1
< #define wxUSE_WXHTML_HELP 1
---
> #define wxUSE_MS_HTML_HELP 0
> #define wxUSE_WXHTML_HELP 0
179c179
< #define wxODBC_FWD_ONLY_CURSORS        1
---
> #define wxODBC_FWD_ONLY_CURSORS  1
184,190c184,190
< #define wxUSE_LIBPNG        1
< #define wxUSE_LIBJPEG       1
< #define wxUSE_LIBTIFF       1
< #define wxUSE_TGA           1
< #define wxUSE_GIF           1
< #define wxUSE_PNM           1
< #define wxUSE_PCX           1
---
> #define wxUSE_LIBPNG        0
> #define wxUSE_LIBJPEG       0
> #define wxUSE_LIBTIFF       0
> #define wxUSE_TGA           0
> #define wxUSE_GIF           0
> #define wxUSE_PNM           0
> #define wxUSE_PCX           0
216c216
< #define wxUSE_CRASHREPORT 1
---
> #define wxUSE_CRASHREPORT 0



Regards,


Arthur





------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev