From e492150d405b3281ea50df8baa023055297b5a90 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 18 Aug 2002 14:10:52 +0000 Subject: [PATCH] Corrected HTML index, other distro-related tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/docs/latex/ogl/ogl.hpj | 2 +- contrib/src/fl/makefile.vc | 1 + contrib/src/ogl/makefile.vc | 10 +- distrib/msw/innotop.txt | 2 +- distrib/msw/rearchive.bat | 33 +++++ distrib/msw/tardist | 30 ++--- distrib/msw/zipdistinno.bat | 158 ++++++++++------------- docs/html/images/no.gif | Bin 0 -> 298 bytes docs/html/images/somewhat.gif | Bin 0 -> 290 bytes docs/html/images/yes.gif | Bin 0 -> 290 bytes docs/html/index.htm | 220 ++++++++++++++++++++++++++------- docs/latex/wx/hashmap.tex | 16 +-- docs/msw/winxp.txt | 4 +- 13 files changed, 312 insertions(+), 164 deletions(-) create mode 100755 distrib/msw/rearchive.bat create mode 100644 docs/html/images/no.gif create mode 100644 docs/html/images/somewhat.gif create mode 100644 docs/html/images/yes.gif diff --git a/contrib/docs/latex/ogl/ogl.hpj b/contrib/docs/latex/ogl/ogl.hpj index 062c8fb3e2..e1575a145b 100644 --- a/contrib/docs/latex/ogl/ogl.hpj +++ b/contrib/docs/latex/ogl/ogl.hpj @@ -1,5 +1,5 @@ [OPTIONS] -BMROOT=d:\wx2\wxwind~1\contrib\docs\latex\ogl ; Assume that bitmaps are where the source is +BMROOT=c:\wx2dev\wxwind~1\contrib\docs\latex\ogl TITLE=OGL Manual CONTENTS=Contents COMPRESS=HIGH diff --git a/contrib/src/fl/makefile.vc b/contrib/src/fl/makefile.vc index 9fa563d064..503d7dedcc 100644 --- a/contrib/src/fl/makefile.vc +++ b/contrib/src/fl/makefile.vc @@ -30,6 +30,7 @@ THISDIR = $(WXDIR)\contrib\src\fl DOCSOURCES=$(DOCSOURCEDIR)\fl.tex \ $(DOCSOURCEDIR)\classes.tex $(DOCSOURCEDIR)\topics.tex +alldocs: mkdirs html htmlhelp htb hlp pdfrtf html: $(DOCDIR)\html\fl\fl.htm htmlhelp: $(DOCDIR)\htmlhelp\fl.chm htb: $(DOCDIR)\htb\fl.htb diff --git a/contrib/src/ogl/makefile.vc b/contrib/src/ogl/makefile.vc index 833eaf13b3..461dd6a3bc 100644 --- a/contrib/src/ogl/makefile.vc +++ b/contrib/src/ogl/makefile.vc @@ -18,7 +18,7 @@ OGLDIR = $(WXDIR)\contrib\src\ogl OGLINC = $(WXDIR)\contrib\include\wx\ogl THISDIR = $(WXDIR)\contrib\src\ogl EXTRAFLAGS=/DPROLOGIO=1 -DOCDIR=$(WXDIR)\contrib\docs +DOCDIR=$(WXDIR)\docs DOCSOURCEDIR=$(WXDIR)\contrib\docs\latex\ogl !include $(WXDIR)\src\makevc.env @@ -131,6 +131,8 @@ DOCSOURCES=$(DOCSOURCEDIR)\ogl.tex \ $(DOCSOURCEDIR)\classes.tex $(DOCSOURCEDIR)\intro.tex\ $(DOCSOURCEDIR)\topics.tex $(DOCSOURCEDIR)\sample.tex +alldocs: mkdirs html htmlhelp htb hlp pdfrtf + html: $(DOCDIR)\html\ogl\ogl.htm htmlhelp: $(DOCDIR)\htmlhelp\ogl.chm htb: $(DOCDIR)\htb\ogl.htb @@ -138,6 +140,9 @@ hlp: $(DOCDIR)\winhelp\ogl.hlp pdfrtf: $(DOCDIR)\pdf\ogl.rtf ps: $(DOCDIR)\ps\ogl.ps +mkdirs: + -mkdir $(DOCDIR)\html $(DOCDIR)\html\ogl $(DOCDIR)\htb $(DOCDIR)\htmlhelp $(DOCDIR)\winhelp $(DOCDIR)\pdf + touchmanual: touch $(DOCSOURCEDIR)\ogl.tex @@ -145,8 +150,7 @@ $(DOCDIR)\winhelp\ogl.hlp: $(DOCSOURCEDIR)\ogl.rtf $(DOCSOURCEDIR)\ogl.h cd $(DOCSOURCEDIR) -erase ogl.ph hc ogl - move ogl.hlp $(DOCDIR)\winhelp\ogl.hlp - move ogl.cnt $(DOCDIR)\winhelp\ogl.cnt + move ogl.hlp ogl.cnt $(DOCDIR)\winhelp cd $(THISDIR) $(DOCSOURCEDIR)\ogl.rtf: $(DOCSOURCES) diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt index 48aa1a6638..ecfe2891de 100644 --- a/distrib/msw/innotop.txt +++ b/distrib/msw/innotop.txt @@ -41,6 +41,6 @@ DiskClusterSize=512 ReserveBytes=0 UseSetupLdr=1 - SourceDir=c:\wx2dev\wxWindows\deliver\wx + SourceDir=c:\wx2dev\wxWindows\deliver\wxWindows-2.3.3 OutputDir=c:\wx2dev\wxWindows\deliver diff --git a/distrib/msw/rearchive.bat b/distrib/msw/rearchive.bat new file mode 100755 index 0000000000..22a19696db --- /dev/null +++ b/distrib/msw/rearchive.bat @@ -0,0 +1,33 @@ +@echo off +rem Convert a zip archive to one rooted at a particular directory. +rem This script is used by zipdistinno.bat. + +set archive=%1 +set dirname=%2 +set changeto=%3 + +if "%archive%" == "" goto usage +if "%dirname%" == "" goto usage +if "%1" == "-help" goto usage +if "%1" == "--help" goto usage +if "%1" == "/?" goto usage + +pushd %changeto% + +if direxist %dirname% erase /sxyz %dirname% +mkdir %dirname% +cd %dirname% +unzip32 ..\%archive% +cd .. +erase %archive% +zip32 -r %archive% %dirname%/* + +popd + +goto end + +:usage +echo rearchive archive.zip dir changetodir +echo E.g. rearchive wxWindows-2.3.3-html.zip wxWindows-2.3.3 c:\wx2dev\wxWindows\deliver + +:end diff --git a/distrib/msw/tardist b/distrib/msw/tardist index 4603ae04ac..de41459644 100644 --- a/distrib/msw/tardist +++ b/distrib/msw/tardist @@ -170,52 +170,52 @@ gzip $2/wxMac-${WXVER}.tar cd $1 cat $1/distrib/msw/wx_html.rsp > /tmp/html_in.txt expandlines /tmp/html_in.txt /tmp/html.txt -$TAR cf $2/wxWindows-${WXVER}-html.tar -T /tmp/html.txt +$TAR cf $2/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt echo Re-tarring HTML in a subdirectory... cd $2 mkdir wxWindows-${WXVER} cd wxWindows-${WXVER} -$TAR xf ../wxWindows-${WXVER}-html.tar +$TAR xf ../wxWindows-${WXVER}-HTML.tar cd .. -rm -f wxWindows-${WXVER}-html.tar -$TAR cf $2/wxWindows-${WXVER}-html.tar wxWindows-${WXVER}/* +rm -f wxWindows-${WXVER}-HTML.tar +$TAR cf $2/wxWindows-${WXVER}-HTML.tar wxWindows-${WXVER}/* rm -f -r wxWindows-${WXVER} -gzip $2/wxWindows-${WXVER}-html.tar +gzip $2/wxWindows-${WXVER}-HTML.tar ### HTB docs cd $1 cat $1/distrib/msw/wx_htb.rsp > /tmp/htb_in.txt expandlines /tmp/htb_in.txt /tmp/htb.txt -$TAR cf $2/wxWindows-${WXVER}-htb.tar -T /tmp/htb.txt +$TAR cf $2/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt echo Re-tarring HTB in a subdirectory... cd $2 mkdir wxWindows-${WXVER} cd wxWindows-${WXVER} -$TAR xf ../wxWindows-${WXVER}-htb.tar +$TAR xf ../wxWindows-${WXVER}-HTB.tar cd .. -rm -f wxWindows-${WXVER}-htb.tar -$TAR cf $2/wxWindows-${WXVER}-htb.tar wxWindows-${WXVER}/* +rm -f wxWindows-${WXVER}-HTB.tar +$TAR cf $2/wxWindows-${WXVER}-HTB.tar wxWindows-${WXVER}/* rm -f -r wxWindows-${WXVER} -gzip $2/wxWindows-${WXVER}-htb.tar +gzip $2/wxWindows-${WXVER}-HTB.tar ### PDF docs cd $1 cat $1/distrib/msw/wx_pdf.rsp > /tmp/pdf_in.txt expandlines /tmp/pdf_in.txt /tmp/pdf.txt -$TAR cf $2/wxWindows-${WXVER}-pdf.tar -T /tmp/pdf.txt +$TAR cf $2/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt echo Re-tarring PDF in a subdirectory... cd $2 mkdir wxWindows-${WXVER} cd wxWindows-${WXVER} -$TAR xf ../wxWindows-${WXVER}-pdf.tar +$TAR xf ../wxWindows-${WXVER}-PDF.tar cd .. -rm -f wxWindows-${WXVER}-pdf.tar -$TAR cf $2/wxWindows-${WXVER}-pdf.tar wxWindows-${WXVER}/* +rm -f wxWindows-${WXVER}-PDF.tar +$TAR cf $2/wxWindows-${WXVER}-PDF.tar wxWindows-${WXVER}/* rm -f -r wxWindows-${WXVER} -gzip $2/wxWindows-${WXVER}-pdf.tar +gzip $2/wxWindows-${WXVER}-PDF.tar ### Tex2RTF #cd $1 diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat index 8eb74cc88c..e2154bfdf6 100755 --- a/distrib/msw/zipdistinno.bat +++ b/distrib/msw/zipdistinno.bat @@ -43,6 +43,7 @@ erase %dest\make* if direxist %dest\wx erase /sxyz %dest\wx\ if not direxist %dest mkdir %dest +if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version% # Copy FAQ from wxWebSite CVS if not direxist %webfiles% echo Error - %webfiles% does not exist @@ -54,15 +55,6 @@ copy %webfiles%\site\platform.htm %src\docs\html cd %src echo Zipping... -Rem Zip up the complete wxMSW-xxx.zip file -Rem NO, do it by unarchiving component files, deleting/copying some files, then -Rem rearchiving. -Rem zip32 -@ %dest\wxMSW-%version%.zip < %src\distrib\msw\generic.rsp -Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\msw.rsp -Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\wx_chm.rsp -Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\jpeg.rsp -Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\tiff.rsp - Rem Zip up the complete wxOS2-xxx.zip file zip32 -@ %dest\wxOS2-%version%.zip < %src\distrib\msw\generic.rsp zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\os2.rsp @@ -79,6 +71,9 @@ zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\xml.rsp zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp +Rem Rearchive under wxWindows-%version% +call %WXWIN%\distrib\msw\rearchive wxOS2-%version%.zip wxWindows-%version% %dest% + echo Zipping wxMac distribution zip32 -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp @@ -93,69 +88,69 @@ zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp +call %WXWIN%\distrib\msw\rearchive wxMac-%version%.zip wxWindows-%version% %dest% -Rem Below is the old-style separated-out format. This is retained only -Rem for local use, and for creating wxMSW-xxx.zip. +Rem Create wxWindows-%version%-win.zip which is used to create wxMSW echo Zipping individual components -zip32 -@ %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\generic.rsp -zip32 -@ -u %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\makefile.rsp -zip32 -@ %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\msw.rsp -zip32 -@ -u %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\makefile.rsp -zip32 -@ %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\gtk.rsp -zip32 -@ -u %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\makefile.rsp -Rem zip32 -@ %dest\wxWindows-%version%-stubs.zip < %src\distrib\msw\stubs.rsp -zip32 -@ %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\motif.rsp -zip32 -@ -u %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\makefile.rsp -Rem (Obsolete) zip32 -@ %dest\wxWindows-%version%-user.zip < %src\distrib\msw\user.rsp +zip32 -@ %dest\wxWindows-%version%-win.zip < %src\distrib\msw\generic.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\makefile.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\msw.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\ogl.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\mmedia.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\stc.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\tex2rtf.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\jpeg.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\tiff.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\xml.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\contrib.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\dialoged.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utils.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utilmake.rsp +zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\univ.rsp + +call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-win.zip wxWindows-%version% %dest% zip32 -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp +call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-DocSource.zip wxWindows-%version% %dest% + zip32 -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp +call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-WinHelp.zip wxWindows-%version% %dest% + zip32 -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp +call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTML.zip wxWindows-%version% %dest% + zip32 -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp -zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp +call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-PDF.zip wxWindows-%version% %dest% + +Rem zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp +Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Word.zip wxWindows-%version% %dest% + zip32 -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp +call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTB.zip wxWindows-%version% %dest% + zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp +call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTMLHelp.zip wxWindows-%version% %dest% Rem PDF/HTML docs that should go into the Windows setup because Rem there are no WinHelp equivalents -zip32 -@ %dest\extradoc-%version%.zip < %src\distrib\msw\extradoc.rsp +zip32 -@ %dest\wxWindows-%version%-ExtraDoc.zip < %src\distrib\msw\extradoc.rsp +call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-ExtraDoc.zip wxWindows-%version% %dest% Rem zip up Univ-specific files -zip32 -@ %dest\wxWindows-%version%-univ.zip < %src\distrib\msw\univ.rsp +zip32 -@ %dest\wxWindows-%version%-Univ.zip < %src\distrib\msw\univ.rsp +call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Univ.zip wxWindows-%version% %dest% rem VC++ project files -zip32 -@ %dest\wxWindows-%version%-vc.zip < %src\distrib\msw\vc.rsp +zip32 -@ %dest\wxWindows-%version%-VC.zip < %src\distrib\msw\vc.rsp +call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-VC.zip wxWindows-%version% %dest% rem BC++ project files -zip32 -@ %dest\wxWindows-%version%-bc.zip < %src\distrib\msw\bc.rsp +zip32 -@ %dest\wxWindows-%version%-BC.zip < %src\distrib\msw\bc.rsp +call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-BC.zip wxWindows-%version% %dest% rem CodeWarrior project files -zip32 -@ %dest\wxWindows-%version%-cw.zip < %src\distrib\msw\cw.rsp - -rem OGL 3 -zip32 -@ %dest\ogl3-%version%.zip < %src\distrib\msw\ogl.rsp - -rem MMedia -zip32 -@ %dest\mmedia-%version%.zip < %src\distrib\msw\mmedia.rsp - -rem STC (Scintilla widget) -zip32 -@ %dest\stc-%version%.zip < %src\distrib\msw\stc.rsp - -rem GLCanvas: obsolete, now in main library -rem zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.rsp - -rem Tex2RTF -zip32 -@ %dest\tex2rtf2-%version%.zip < %src\distrib\msw\tex2rtf.rsp - -rem JPEG source -zip32 -@ %dest\jpeg-%version%.zip < %src\distrib\msw\jpeg.rsp - -rem TIFF source -zip32 -@ %dest\tiff-%version%.zip < %src\distrib\msw\tiff.rsp - -zip32 -@ %dest\wxxrc-%version%.zip < %src\distrib\msw\xml.rsp - -zip32 -@ %dest\contrib-%version%.zip < %src\distrib\msw\contrib.rsp +zip32 -@ %dest\wxWindows-%version%-CW.zip < %src\distrib\msw\cw.rsp +call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-CW.zip wxWindows-%version% %dest% rem Dialog Editor source and binary erase %dest\dialoged-source.zip @@ -163,10 +158,6 @@ zip32 -@ %dest\dialoged-source.zip < %src\distrib\msw\dialoged.rsp zip32 -j %dest\dialoged-%version%.zip %dest\dialoged-source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt erase %dest\dialoged-source.zip -rem Misc. utils not in the main distribution -zip32 -@ %dest\utils-%version%.zip < %src\distrib\msw\utils.rsp -zip32 -@ -u %dest\utils-%version%.zip < %src\distrib\msw\utilmake.rsp - copy %src\docs\changes.txt %dest\changes-%version%.txt copy %src\docs\msw\install.txt %dest\install-msw-%version%.txt copy %src\docs\mac\install.txt %dest\install-mac-%version%.txt @@ -196,37 +187,26 @@ zip32 %dest\tex2rtf-win32-%version%.zip tex2rtf.* cd %dest -rem Unzip the Windows files into 'wx' -mkdir %dest\wx +rem Unzip the Windows files into 'wxWindows-%version%' + +unzip32 -o wxWindows-%version%-win.zip +unzip32 -o wxWindows-%version%-VC.zip +unzip32 -o wxWindows-%version%-BC.zip +unzip32 -o wxWindows-%version%-HTMLHelp.zip +unzip32 -o wxWindows-%version%-ExtraDoc.zip +Rem Need Word file, for Remstar DB classes +Rem Not any more +Rem unzip32 -o wxWindows-%version%-Word.zip Rem After this change of directory, we're in the Rem temporary 'wx' directory and not acting on Rem the source wxWindows directory. -cd %dest\wx -unzip32 -o ..\wxWindows-%version%-msw.zip -unzip32 -o ..\wxWindows-%version%-gen.zip -unzip32 -o ..\wxWindows-%version%-univ.zip -unzip32 -o ..\wxWindows-%version%-vc.zip -unzip32 -o ..\wxWindows-%version%-bc.zip -unzip32 -o ..\wxWindows-%version%-HTMLHelp.zip -unzip32 -o ..\extradoc-%version%.zip -Rem Need Word file, for Remstar DB classes -unzip32 -o ..\wxWindows-%version%-Word.zip -unzip32 -o ..\ogl3-%version%.zip -unzip32 -o ..\mmedia-%version%.zip -unzip32 -o ..\stc-%version%.zip -unzip32 -o ..\jpeg-%version%.zip -unzip32 -o ..\tiff-%version%.zip -unzip32 -o ..\wxxrc-%version%.zip -unzip32 -o ..\contrib-%version%.zip -unzip32 -o ..\tex2rtf2-%version%.zip +cd %dest%\wxWindows-%version% rem Now delete a few files that are unnecessary attrib -R * -erase /Y BuildCVS.txt *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh descrip.mms -erase /Y configure samples\configure samples\*.in demos\configure demos\*.in contrib\configure contrib\*.in -erase /Y setup.h.in setup.h_vms -erase /SY Makefile.in +erase /Y BuildCVS.txt descrip.mms +erase /Y setup.h_vms erase /Y docs\html\wxbook.htm docs\html\roadmap.htm Rem erase /Y contrib\docs\winhelp\mmedia.* Rem erase /Y contrib\docs\winhelp\stc.* @@ -251,12 +231,10 @@ copy %src\docs\htmlhelp\dialoged.chm bin copy %src\docs\htmlhelp\tex2rtf.chm bin Rem Make wxMSW-xxx.zip -zip32 -r ..\wxMSW-%version%.zip * +cd %dest% +zip32 -r wxMSW-%version%.zip wxWindows-%version%/* +cd wxWindows-%version% -rem Time to regenerate the Inno Setup script, wxwin2.iss. -rem NB: if you've changed wxwin2.iss using ScriptMaker, call splitinno.exe -rem from within distrib\msw, to split off innotop.txt and innobott.txt. -rem (NOT YET IMPLEMENTED) echo Calling 'makeinno' to generate wxwin2.iss... call %WXWIN\distrib\msw\makeinno.bat @@ -273,17 +251,17 @@ Rem ren %WXWIN\deliver2\setup.EXE %WXWIN\deliver2\wxMSW-%version%-setup.exe cd %dest rem Put all the setup files into a single zip archive. -zip32 wxMSW-%version%-setup.zip readme-%version%.txt setup.* +zip32 wxMSW-%version%-setup.zip readme-%version%.txt setup*.* echo wxWindows archived. goto end :usage -echo DOS wxWindows distribution. Zips up all GTK/Motif/MSW/doc files, -echo and optionally makes a deliver2\wx directory and a setup.exe -echo if you specify 'inno' (skipping the zipping if you use 'innoonly'). +echo DOS wxWindows distribution. Zips up all MSW, OS/2, Mac and doc files, +echo and optionally makes a setup.exe echo if you specify 'inno' +echo (skipping the zipping if you use 'innoonly'). echo. -echo "Usage: zipdist [inno | innoonly]" +echo "Usage: zipdistinno [inno | innoonly]" :end diff --git a/docs/html/images/no.gif b/docs/html/images/no.gif new file mode 100644 index 0000000000000000000000000000000000000000..65fc311b1d013805d43158ffb7c1a1674bc896e4 GIT binary patch literal 298 zcmZ?wbhEHb6k!lyxXQ_Z2OKzX0FUe-ky8B0!pOkD$)E#r56DjrZ0-kI3OsbA+PPYS zCVD8%IR5O@j25?EKkcxSSL4=m4OyyNfe8 SiXwy3s;c5zi+fxg8LR<3{3^)+ literal 0 HcmV?d00001 diff --git a/docs/html/images/somewhat.gif b/docs/html/images/somewhat.gif new file mode 100644 index 0000000000000000000000000000000000000000..11dd29b01839f13e3cf48595ebaaa7c3ca1dc896 GIT binary patch literal 290 zcmZ?wbhEHb6k!lyxXQ_Z3;h4jaNxj!bLWzADHtT;ia%Kx85lSjbU^L_`N@IJ{yZ0ir)0I8i6Nm^hBLjg{-=pwlIvvjI+;f{=F?x8gc6DvUfz~g-E^p`f0c9 Q+efoQ>T8?w+#MOL0Ry@whX4Qo literal 0 HcmV?d00001 diff --git a/docs/html/images/yes.gif b/docs/html/images/yes.gif new file mode 100644 index 0000000000000000000000000000000000000000..759fc9e8e9d51eacd30fe15cd4771d5f6821d5ed GIT binary patch literal 290 zcmZ?wbhEHb6k!lyxXQ_Z3!GtLIdI^>ACnYZ3I>U|;!hSv1_n+B9gurKesW;5KhRR( zp(EAr%*xcLqBs4lM&L;sJyEAsA*=4DEevBZ>W{gAyO~De%dYj Q_R;K+`r4*EcSi - + Welcome to wxWindows 2, the première cross-platform GUI C++ framework. This is an index of the plain text, HTML, Windows Help and Acrobat documentation: availability depends on what you've -downloaded from the wxWindows Web site.

+downloaded from the wxWindows Web site.

@@ -28,20 +28,38 @@ downloaded from the wxWindows Web site.

-

Installation and release notes

+

+ + + + + +
+ +Installation and release notes + +
+ +

-

wxWindows manuals

+Further platform-specific notes: + + + +

+ + + + + +
+ +wxWindows manuals + +
+ +

+ +To use manuals in wxHTML Help form (extension htb), you can use the HelpView +application, either compiling it from utils/helpview in the distribution, +or downloading a binary, for example from here.

+ +See also the wxWindows Tutorial +by Franky Braem, in PDF format.

+ +

- +
- - - - + + + + + + + + + + + + + + + + + + + + +
+ HTML + WinHelp + MS HTML Help + +wxHTML Help + PDF
-Reference Manual +wxWindows Reference + +wxWindows Reference + +wxWindows Reference + +wxWindows Reference + +wxWindows Reference +
+Dialog Editor + +Dialog Editor -Reference Manual +Dialog Editor -Reference Manual +Dialog Editor -Reference Manual +Dialog Editor
-Dialog Editor Manual +Tex2RTF -Dialog Editor Manual +Tex2RTF -Dialog Editor Manual +Tex2RTF -Dialog Editor Manual +Tex2RTF + +Tex2RTF
-Tex2RTF Manual +FL Library -Tex2RTF Manual +FL Library + -Tex2RTF Manual +FL Library -Tex2RTF Manual +FL Library + +FL Library
-Remstar ODBC Classes +OGL Library + +OGL Library + -

+OGL Library 		-

+OGL Library 		-Remstar ODBC Classes +OGL Library
-

Technical notes

+

+ + + + + +
+ +Technical notes + +
+ +

-

Third-party tools

+

+ + + + + +
+ +Thirty-party tools + +
+ +

-

Samples

+

+ + + + + +
+ +Samples + +
+ +

Each of the following demonstrates one or more aspect of wxWindows.

@@ -232,6 +351,7 @@ applications and also as a help facility.

  • image: shows off the cross-platform wxImage class.
  • internat: use of wxWindows' internationalization support.
  • joytest: tests the wxJoystick class (currently Windows and GTK only). +
  • keyboard: tests keyboard support.
  • layout: shows the constraint layout system in action.
  • listctrl: demonstrates the wxListCtrl (implemented natively on WIN32, and using a generic version on other platforms). @@ -246,6 +366,7 @@ To compile this, you must edit include/wx/wxprec.h, comment out the windows.h in platforms that don't support it, a normal-sized title bar is displayed.
  • minimal: just shows a frame, a menubar, and a statusbar. About as small a wxWindows application as you can get. +
  • mobile: mini applications for embedded platforms.
  • nativdlg: shows how wxWindows can load a standard Windows dialog resource, translating the controls into wxWindows controls (Windows only).
  • newgrid: demonstrates the new wxGrid implementation, by Michael Bedward and others. @@ -259,8 +380,9 @@ Excel to be present).
  • propsize: demonstrates proportional sizer classes.
  • regtest: tests the low-level Windows registry functions (Windows only).
  • resource: shows how to use wxWindows resources (.wxr files). -
  • richedit: a work-in-progress rich text editor with plain text and HTML export +
  • rotate: demonstrates interpolated and non-interpolated rotation of a wxImage.
  • sashtest: demonstrates use of the wxSashWindow class to allow @@ -286,7 +408,19 @@ wxTime, wxDate and wxVariant.
  • wizard: demonstrates the wxWizard class. -

    Demos

    +

    + + + + + +
    + +Demos + +
    + +

    The following are fully-fledged applications.

    @@ -299,8 +433,6 @@ The following are fully-fledged applications.

  • poem: a little poetry display program. -
    -     diff --git a/docs/latex/wx/hashmap.tex b/docs/latex/wx/hashmap.tex index fcaaab9044..ce05912dd7 100644 --- a/docs/latex/wx/hashmap.tex +++ b/docs/latex/wx/hashmap.tex @@ -1,6 +1,6 @@ \section{\class{wxHashMap}}\label{wxhashmap} -This is a simple, type safe, and reasonably efficient hash map class, +This is a simple, type-safe, and reasonably efficient hash map class, whose interface is a subset of the interface of STL containers. \wxheading{Example} @@ -135,8 +135,8 @@ Copy constructor. \func{iterator}{begin}{} -Returns an iterator pointing at the first element of the hash map -( please remember that hash maps do not guarantee ordering ). +Returns an iterator pointing at the first element of the hash map. +Please remember that hash maps do not guarantee ordering. \membersection{wxHashMap::clear} @@ -155,7 +155,7 @@ This function can actually return 0 or 1. \constfunc{bool}{empty}{} -TRUE if the hash map does not contain any element, FALSE otherwise. +Returns TRUE if the hash map does not contain any element, FALSE otherwise. \membersection{wxHashMap::end} @@ -163,15 +163,15 @@ TRUE if the hash map does not contain any element, FALSE otherwise. \func{iterator}{end}{} -Returns an iterator pointing at the one-after-the-last element of the hash map -( please remember that hash maps do not guarantee ordering ). +Returns an iterator pointing at the one-after-the-last element of the hash map. +Please remember that hash maps do not guarantee ordering. \membersection{wxHashMap::erase} \func{size\_type}{erase}{\param{const key\_type\&}{ key}} Erases the element with the given key, and returns the number of element -erased ( either 0 or 1 ). +erased (either 0 or 1). \func{void}{erase}{\param{iterator}{ it}} @@ -188,7 +188,7 @@ the iterator is no longer valid and must not be used. If an element with the given key is present, the functions returns an iterator pointing at that element, otherwise an invalid iterator -is returned ( i.e. hashmap.find( non\_existent\_key ) == hashmap.end() ). +is returned (i.e. hashmap.find( non\_existent\_key ) == hashmap.end()). \membersection{wxHashMap::insert} diff --git a/docs/msw/winxp.txt b/docs/msw/winxp.txt index 021405a5bd..b584381ab5 100644 --- a/docs/msw/winxp.txt +++ b/docs/msw/winxp.txt @@ -1,5 +1,5 @@ -Microsoft Windows XP Support in wxWindows 2.3.2 ------------------------------------------------ +Microsoft Windows XP Support from wxWindows 2.3.2 +------------------------------------------------- Windows XP introduces the themes (called "visual styles" in the Microsoft documentation) in Windows world. As wxWindows uses the standard Windows -- 2.45.2