diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh index 686ebbfc52..9e043118e1 100644 --- a/distrib/msw/makesetup.sh +++ b/distrib/msw/makesetup.sh @@ -266,8 +266,9 @@ dospinwxall() dospinmsw fi cp $DESTDIR/wxWidgets-$VERSION-win.zip $DESTDIR/wxWidgets-$VERSION-all.zip - - zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < `cat $APPDIR/distrib/msw/cw_mac.rsp $APPDIR/distrib/msw/x11.rsp $APPDIR/distrib/msw/cocoa.rsp $APPDIR/distrib/msw/motif.rsp $APPDIR/distrib/msw/mac.rsp $APPDIR/distrib/msw/wince.rsp $APPDIR/distrib/msw/mgl.rsp $APPDIR/distrib/msw/os2.rsp` + + cat $APPDIR/distrib/msw/cw_mac.rsp $APPDIR/distrib/msw/x11.rsp $APPDIR/distrib/msw/cocoa.rsp $APPDIR/distrib/msw/motif.rsp $APPDIR/distrib/msw/mac.rsp $APPDIR/distrib/msw/mgl.rsp $APPDIR/distrib/msw/os2.rsp | sort | uniq > /tmp/all.txt + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-all.zip < /tmp/all.txt if [ -d $DESTDIR/wxWidgets-$VERSION ]; then rm -f -r $DESTDIR/wxWidgets-$VERSION @@ -411,6 +412,24 @@ dospinsetup() rm -f $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip zip $ZIPFLAGS $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip wxWidgets-$VERSION-LinuxDocs.zip wxWidgets-$VERSION-VC.zip wxWidgets-$VERSION-DMC.zip wxWidgets-$VERSION-eVC.zip wxWidgets-$VERSION-CW-Mac.zip + if [ ! -f $DESTDIR/wxWidgets-$VERSION-HTMLHelp.zip ]; then + cd $APPDIR + echo Creating $DESTDIR/wxWidgets-$VERSION-HTMLHelp.zip + zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-HTMLHelp.zip < $APPDIR/distrib/msw/wx_chm.rsp + rearchive wxWidgets-$VERSION-HTMLHelp.zip wxWidgets-$VERSION $DESTDIR + cd $DESTDIR + fi + + if [ ! -f $DESTDIR/wxWidgets-$VERSION-ExtraDoc.zip ]; then + cd $APPDIR + echo Creating $DESTDIR/wxWidgets-$VERSION-ExtraDoc.zip + zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-ExtraDoc.zip < $APPDIR/distrib/msw/extradoc.rsp + rearchive wxWidgets-$VERSION-ExtraDoc.zip wxWidgets-$VERSION $DESTDIR + cd $DESTDIR + fi + + rm -f -r wxWidgets-$VERSION + echo Unzipping the Windows files into wxWidgets-$VERSION mkdir -p wxWidgets-$VERSION @@ -420,6 +439,7 @@ dospinsetup() unzip $ZIPFLAGS -o wxWidgets-$VERSION-DMC.zip -d wxWidgets-$VERSION unzip $ZIPFLAGS -o wxWidgets-$VERSION-BC.zip -d wxWidgets-$VERSION unzip $ZIPFLAGS -o wxWidgets-$VERSION-CW.zip -d wxWidgets-$VERSION + unzip $ZIPFLAGS -o wxWidgets-$VERSION-HTMLHelp.zip unzip $ZIPFLAGS -o wxWidgets-$VERSION-ExtraDoc.zip @@ -545,7 +565,7 @@ dospinsetup() echo Putting all the setup files into a single zip archive zip wxMSW-$VERSION-setup.zip readme-$VERSION.txt setup*.* - rm -f wxWidgets-$VERSION-win.zip +# rm -f wxWidgets-$VERSION-win.zip rm -f wxWidgets-$VERSION-ExtraDoc.zip echo If you saw no warnings or errors, $APPTITLE was successfully spun. diff --git a/docs/html/faqmsw.htm b/docs/html/faqmsw.htm index 070637bc53..f266bf1ba6 100644 --- a/docs/html/faqmsw.htm +++ b/docs/html/faqmsw.htm @@ -46,6 +46,8 @@ See also top-level FAQ page.
  • Is MS Active Accessibility supported?
  • Why does Visual C++ complain about corrupted project files??
  • Visual C++ gives errors about multiply defined symbols, what can I do?
    • +
  • Why do I get compilation erros when using wxWidgets with DirectShow?
    • +
  • How do I handle Windows messages in my wxWidgets program?
    • @@ -224,7 +226,7 @@ you need to configure wxWidgets to compile without debugging information: see docs/msw/install.txt for details. You may find that using configure instead of makefile.g95 is easier, particularly since you can maintain debug and release versions of the library simultaneously, in different directories. -Also, run 'strip' after linking to remove all traces of debug info. +Also, run 'strip' after linking to remove all traces of debug info.

    Is wxWidgets compatible with MFC?

    @@ -335,7 +337,7 @@ example) and regenerate the makefile using tmake.

    tmake can be found at www.troll.no/freebies/tmake.html. -It's a Perl5 program and so it needs Perl (doh). There is a binary for +It's a Perl5 program and so it needs Perl (doh). There is a binary for Windows (available from the same page), but I haven't used it, so I don't know if it works as flawlessly as "perl tmake" does (note for people knowing Perl: don't try to run tmake with -w, it won't @@ -344,7 +346,7 @@ just go to distrib/msw/tmake and type

    tmake -t b32 wxwin.pro -o ../../src/msw/makefile.b32

    -The makefiles are untested - I don't have any of Borland, Watcom or +The makefiles are untested - I don't have any of Borland, Watcom or Symantec and I don't have enough diskspace to recompile even with VC6 using makefiles. The new makefiles are as close as possible to the old ones, but not closer: in fact, there has been many strange things @@ -451,7 +453,7 @@ First, you can use wxRegKey directly, for example: regKey.SetName(idName); { - wxLogNull dummy; + wxLogNull dummy; if (!regKey.Create()) { idName = wxT("HKEY_CURRENT_USER\\SOFTWARE\\My Company\\My Product\\Stuff\\"); @@ -536,6 +538,33 @@ slightly smaller and faster. But the most important thing is to use the same CRT setting for all components of your project. +

    Why do I get compilation erros when using wxWidgets with DirectShow?

    + +If you get errors when including Microsoft DirectShow or DirectDraw headers, +the following message from Peter Whaite could help: +
    +> This causes compilation errors within DirectShow: +> +> wxutil.h(125) : error C2065: 'EXECUTE_ASSERT' : undeclared identifier +> amfilter.h(1099) : error C2065: 'ASSERT' : undeclared identifier + +The reason for this is that __WXDEBUG__ is also used by the DXSDK (9.0 +in my case) to '#pragma once' the contents of +DXSDK/Samples/C++/DirectShow/BaseClasses/wxdebug.h. So if __WXDEBUG__ +is defined, then wxdebug.h doesn't get included, and the assert macros +don't get defined. You have to #undef __WXDEBUG__ before including the +directshow baseclass's <streams.h>. +
    + + +

    How do I handle Windows messages in my wxWidgets program?

    + +To handle a Windows message you need to override a virtual +MSWWindowProc() method in a wxWindow-derived class. You should then +test if nMsg parameter is the message you need to process and perform +the necessary action if it is or call the base class method otherwise. + + diff --git a/docs/publicity/announce.txt b/docs/publicity/announce.txt index 1443fdcbda..572d8ae6f4 100644 --- a/docs/publicity/announce.txt +++ b/docs/publicity/announce.txt @@ -1,7 +1,7 @@ Announcing wxWidgets 2.5.3: a cross-platform GUI toolkit ---------------------------------------------------------------- -May 31st, 2004 -- the wxWidgets team is pleased to announce +October 11th, 2004 -- the wxWidgets team is pleased to announce a development snapshot release of the mature cross-platform C++ application framework. @@ -33,7 +33,7 @@ shaped frame and dialog windows on Windows and GTK+, more efficient UI update processing, print preview improvements, wxCrashReport class, OpenWatcom and Digital Mars compiler support, and more. Improvements -over 2.5.1 include much improved Mac OS X and Windows CE +over 2.5.2 include much improved Mac OS X and Windows CE support, as well as the usual bug fixes and minor enhancements. *** About wxWidgets