diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat index bb12a1c439..697ea4bcac 100755 --- a/distrib/msw/zipdistinno.bat +++ b/distrib/msw/zipdistinno.bat @@ -7,7 +7,7 @@ set webfiles=c:\wx2dev\wxWebSite set inno=0 Rem Set this to the required version -set version=2.3.2 +set version=2.3.3 if "%src" == "" goto usage if "%dest" == "" goto usage @@ -244,7 +244,7 @@ call %WXWIN\distrib\msw\makeinno.bat erase /Y %dest\setup.* rem Now invoke Inno Setup on the new wxwin2.iss -set innocmd="C:\Program Files\Inno Setup 1.3\compil32.exe" /cc %WXWIN\distrib\msw\wxwin2.iss +set innocmd="C:\Program Files\Inno Setup 2\compil32.exe" /cc %WXWIN\distrib\msw\wxwin2.iss echo Invoking %innocmd... start "Inno Setup" /w %innocmd% pause Press any key to continue with the wxWindows distribution... diff --git a/docs/html/faqgen.htm b/docs/html/faqgen.htm index d945ff7ff8..43776e0578 100644 --- a/docs/html/faqgen.htm +++ b/docs/html/faqgen.htm @@ -130,10 +130,10 @@ platform-independent code, such as the wxTreeCtrl and wxListCtrl classes.

No. This is a much-discussed topic that has (many times) ended with the conclusion that it is in wxWindows' best interests to avoid use of templates. Not all compilers can handle templates adequately so it would dramatically reduce the number of compilers -and platforms that could be supported. It would also be undesirable to make +and platforms that could be supported. It would also be undersirable to make wxWindows dependent on another large library that may have to be downloaded and installed. In addition, use of templates can lead to executable bloat, which is something -wxWindows 2 is strenuously trying to avoid.

+wxWindows 2 is strenously trying to avoid.

The standard C++ string class is not used, again because it is not available to all compilers, and it is not necessarily a very efficient implementation. Also, we retain more flexibility diff --git a/docs/html/faqmac.htm b/docs/html/faqmac.htm index 7b4663fb96..722f83ca55 100644 --- a/docs/html/faqmac.htm +++ b/docs/html/faqmac.htm @@ -30,11 +30,11 @@ See also top-level FAQ page.

  • How is the Mac OS X port different from the Classic Mac OS port?
  • How are improvements to the Classic Mac OS port integrated into the Mac OS X port?
  • What compilers are supported?
    • -
  • How does CVS handle file types/creators under Mac OS 8.x/9.x?
    • -
  • How does CVS handle file types/creators under Mac OS X?
    • -
  • What steps are required to build wxMac using CodeWarrior Pro 5.3?
    • +
  • How does CVS handle file types/creators under Mac OS 8.x /9.x?
    • +
  • How does CVS handle file types/creators under Mac OS X?
    • +
  • What steps are required to build wxMac using CodeWarrior P ro 5.3?
  • What steps are required to build wxMac under Mac OS X?
    • -
  • What important settings are required in the CodeWarrior Project Preferences?
    • +
  • What important settings are required in the CodeWarrior P roject Preferences?
  • What are the smart preprocessing errors with the Apple Developer Tools?
  • How does wxMac support the standard Apple About menu item and Help menu?
    • diff --git a/docs/html/faqmot.htm b/docs/html/faqmot.htm index 9fd1f83a0c..8920cbe82d 100644 --- a/docs/html/faqmot.htm +++ b/docs/html/faqmot.htm @@ -64,7 +64,7 @@ system is in preparation.

    Does Dialog Editor work with wxWindows for Motif?

    -Support for Dialog Editor is almost there, but there are some wrinkles to iron +Suport for Dialog Editor is almost there, but there are some wrinkles to iron out. You may find it's useful though: compile it and see.

    diff --git a/docs/html/faqmsw.htm b/docs/html/faqmsw.htm index cf82acb137..30970bb620 100644 --- a/docs/html/faqmsw.htm +++ b/docs/html/faqmsw.htm @@ -305,7 +305,7 @@ The templates are described in tmake ref manual (1-2 pages of text) and are quite simple. They do contain some Perl code, but my Perl is primitive (very C like) so it should be possible for anybody to make trivial modifications to it (I hope that only trivial modifications -will be needed). I've tagged the old makefiles as MAKEFILES_WITHOUT_TMAKE +will be needed). I've tagged the ol makefiles as MAKEFILES_WITHOUT_TMAKE in the cvs, so you can always retrieve them and compare the new ones, this will make it easier to solve the problems you might have.