diff --git a/contrib/docs/latex/fl/contents.gif b/contrib/docs/latex/fl/contents.gif index 723174f81d..da92528ddd 100644 Binary files a/contrib/docs/latex/fl/contents.gif and b/contrib/docs/latex/fl/contents.gif differ diff --git a/contrib/docs/latex/gizmos/contents.gif b/contrib/docs/latex/gizmos/contents.gif index 723174f81d..da92528ddd 100644 Binary files a/contrib/docs/latex/gizmos/contents.gif and b/contrib/docs/latex/gizmos/contents.gif differ diff --git a/contrib/docs/latex/mmedia/contents.gif b/contrib/docs/latex/mmedia/contents.gif index 3dddfa3dd5..da92528ddd 100644 Binary files a/contrib/docs/latex/mmedia/contents.gif and b/contrib/docs/latex/mmedia/contents.gif differ diff --git a/contrib/docs/latex/ogl/contents.gif b/contrib/docs/latex/ogl/contents.gif index 723174f81d..da92528ddd 100644 Binary files a/contrib/docs/latex/ogl/contents.gif and b/contrib/docs/latex/ogl/contents.gif differ diff --git a/contrib/docs/latex/svg/contents.gif b/contrib/docs/latex/svg/contents.gif index 723174f81d..da92528ddd 100644 Binary files a/contrib/docs/latex/svg/contents.gif and b/contrib/docs/latex/svg/contents.gif differ diff --git a/contrib/samples/ogl/studio/manual/contents.gif b/contrib/samples/ogl/studio/manual/contents.gif index 3dddfa3dd5..da92528ddd 100644 Binary files a/contrib/samples/ogl/studio/manual/contents.gif and b/contrib/samples/ogl/studio/manual/contents.gif differ diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 7d0a054cb2..668c0a3638 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -940,7 +940,7 @@ samples/rotate/*.def samples/rotate/*.ico samples/rotate/*.xpm samples/rotate/*.txt -samples/rotate/*.bmp +samples/rotate/*.png samples/rotate/*.pro samples/sashtest/*.cpp diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat index 3b08c6cc65..11d4c1c949 100755 --- a/distrib/msw/zipdistinno.bat +++ b/distrib/msw/zipdistinno.bat @@ -1,5 +1,5 @@ @echo off -rem Zip up an external, generic + Windows distribution of wxWindows 2 +rem Zip up an external, generic + Windows distribution of wxWidgets 2 rem using Inno Setup + ScriptMaker set src=%wxwin set dest=%src\deliver @@ -7,7 +7,7 @@ set webfiles=c:\wx2dev\wxWebSite set inno=0 Rem Set this to the required version -set version=2.4.2 +set version=2.4.3 if "%src" == "" goto usage if "%dest" == "" goto usage @@ -17,7 +17,7 @@ if "%1" == "/?" goto usage if "%1" == "innoonly" goto dounzip if "%1" == "inno" set inno=1 if "%1" == "tidyup" goto tidyup -echo About to archive an external wxWindows distribution: +echo About to archive an external wxWidgets distribution: echo From %src echo To %dest if "%inno" == "1" echo with Inno Setup creation. @@ -43,7 +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% +if direxist %dest%\wxWidgets-%version% erase /sxyz %dest%\wxWidgets-%version% Rem Copy FAQ from wxWebSite CVS if not direxist %webfiles% echo Error - %webfiles% does not exist @@ -76,11 +76,11 @@ zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\xml.rsp zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp -Rem Rearchive under wxWindows-%version% -if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version% +Rem Rearchive under wxWidgets-%version% +if direxist %dest%\wxWidgets-%version% erase /sxyz %dest%\wxWidgets-%version% -mkdir %dest%\wxWindows-%version% -cd %dest%\wxWindows-%version% +mkdir %dest%\wxWidgets-%version% +cd %dest%\wxWidgets-%version% unzip ..\wxOS2-%version%.zip echo Overwriting with OS2-specific versions of configure files... unzip -o %src%\distrib\os2\os2-specific.zip @@ -97,7 +97,7 @@ call %src%\distrib\msw\lower.bat cd %dest% erase wxOS2-%version%.zip -zip -r wxOS2-%version%.zip wxWindows-%version%/* +zip -r wxOS2-%version%.zip wxWidgets-%version%/* cd %src% @@ -119,14 +119,14 @@ zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp -zip -@ %dest%\wxWindows-%version%-CW-Mac.zip < %src%\distrib\msw\cw_mac.rsp +zip -@ %dest%\wxWidgets-%version%-CW-Mac.zip < %src%\distrib\msw\cw_mac.rsp erase /Y %src%\include\wx\setup.h -if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version% +if direxist %dest%\wxWidgets-%version% erase /sxyz %dest%\wxWidgets-%version% -mkdir %dest%\wxWindows-%version% -cd %dest%\wxWindows-%version% +mkdir %dest%\wxWidgets-%version% +cd %dest%\wxWidgets-%version% unzip ..\wxMac-%version%.zip erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf erase /SXY docs\html\dialoged docs\html\tex2rtf docs\htmlhelp @@ -134,93 +134,93 @@ erase /SXY docs\html\dialoged docs\html\tex2rtf docs\htmlhelp cd %dest% erase wxMac-%version%.zip -zip -r wxMac-%version%.zip wxWindows-%version%/* +zip -r wxMac-%version%.zip wxWidgets-%version%/* cd %src% -Rem Create wxWindows-%version%-win.zip which is used to create wxMSW +Rem Create wxWidgets-%version%-win.zip which is used to create wxMSW echo Zipping individual components -zip -@ %dest\wxWindows-%version%-win.zip < %src\distrib\msw\generic.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\makefile.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\msw.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\ogl.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\mmedia.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\stc.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\tex2rtf.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\jpeg.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\tiff.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\xml.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\contrib.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\dialoged.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utils.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utilmake.rsp -zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\univ.rsp +zip -@ %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\generic.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\makefile.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\msw.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\ogl.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\mmedia.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\stc.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\tex2rtf.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\jpeg.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\tiff.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\xml.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\contrib.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\dialoged.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\utils.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\utilmake.rsp +zip -@ -u %dest\wxWidgets-%version%-win.zip < %src\distrib\msw\univ.rsp -echo Re-archiving wxWindows-%version%-win.zip -call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-win.zip wxWindows-%version% %dest% +echo Re-archiving wxWidgets-%version%-win.zip +call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-win.zip wxWidgets-%version% %dest% echo Removing .mms files -zip -d %dest%\wxWindows-%version%-win.zip wxWindows-%version%/src/gtk/descrip.mms wxWindows-%version%/src/motif/descrip.mms +zip -d %dest%\wxWidgets-%version%-win.zip wxWidgets-%version%/src/gtk/descrip.mms wxWidgets-%version%/src/motif/descrip.mms -echo Creating %dest\wxWindows-%version%-DocSource.zip -zip -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp -call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-DocSource.zip wxWindows-%version% %dest% +echo Creating %dest\wxWidgets-%version%-DocSource.zip +zip -@ %dest\wxWidgets-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp +call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-DocSource.zip wxWidgets-%version% %dest% -echo Creating %dest\wxWindows-%version%-WinHelp.zip -zip -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp -call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-WinHelp.zip wxWindows-%version% %dest% +echo Creating %dest\wxWidgets-%version%-WinHelp.zip +zip -@ %dest\wxWidgets-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp +call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-WinHelp.zip wxWidgets-%version% %dest% -echo Creating %dest\wxWindows-%version%-HTML.zip -zip -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp -call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTML.zip wxWindows-%version% %dest% +echo Creating %dest\wxWidgets-%version%-HTML.zip +zip -@ %dest\wxWidgets-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp +call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-HTML.zip wxWidgets-%version% %dest% -echo Creating %dest\wxWindows-%version%-PDF.zip -zip -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp -call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-PDF.zip wxWindows-%version% %dest% +echo Creating %dest\wxWidgets-%version%-PDF.zip +zip -@ %dest\wxWidgets-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp +call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-PDF.zip wxWidgets-%version% %dest% -Rem zip -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp -Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Word.zip wxWindows-%version% %dest% +Rem zip -@ %dest\wxWidgets-%version%-Word.zip < %src\distrib\msw\wx_word.rsp +Rem call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-Word.zip wxWidgets-%version% %dest% -echo Creating %dest\wxWindows-%version%-HTB.zip -zip -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp -call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTB.zip wxWindows-%version% %dest% +echo Creating %dest\wxWidgets-%version%-HTB.zip +zip -@ %dest\wxWidgets-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp +call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-HTB.zip wxWidgets-%version% %dest% -echo Creating %dest\wxWindows-%version%-HTMLHelp.zip -zip -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp -call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTMLHelp.zip wxWindows-%version% %dest% +echo Creating %dest\wxWidgets-%version%-HTMLHelp.zip +zip -@ %dest\wxWidgets-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp +call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-HTMLHelp.zip wxWidgets-%version% %dest% Rem Add Linuxy docs to a separate archive to be transported to Linux for the Rem Linux-based releases -echo Creating %dest\wxWindows-%version%-LinuxDocs.zip -zip -@ %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_html.rsp -zip -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_pdf.rsp -zip -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_htb.rsp +echo Creating %dest\wxWidgets-%version%-LinuxDocs.zip +zip -@ %dest\wxWidgets-%version%-LinuxDocs.zip < %src\distrib\msw\wx_html.rsp +zip -@ -u %dest\wxWidgets-%version%-LinuxDocs.zip < %src\distrib\msw\wx_pdf.rsp +zip -@ -u %dest\wxWidgets-%version%-LinuxDocs.zip < %src\distrib\msw\wx_htb.rsp Rem PDF/HTML docs that should go into the Windows setup because Rem there are no WinHelp equivalents -echo Creating %dest\wxWindows-%version%-ExtraDoc.zip -zip -@ %dest\wxWindows-%version%-ExtraDoc.zip < %src\distrib\msw\extradoc.rsp -call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-ExtraDoc.zip wxWindows-%version% %dest% +echo Creating %dest\wxWidgets-%version%-ExtraDoc.zip +zip -@ %dest\wxWidgets-%version%-ExtraDoc.zip < %src\distrib\msw\extradoc.rsp +call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-ExtraDoc.zip wxWidgets-%version% %dest% Rem zip up Univ-specific files -echo Creating %dest\wxWindows-%version%-Univ.zip -zip -@ %dest\wxWindows-%version%-Univ.zip < %src\distrib\msw\univ.rsp -call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Univ.zip wxWindows-%version% %dest% +echo Creating %dest\wxWidgets-%version%-Univ.zip +zip -@ %dest\wxWidgets-%version%-Univ.zip < %src\distrib\msw\univ.rsp +call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-Univ.zip wxWidgets-%version% %dest% rem VC++ project files -echo Creating %dest\wxWindows-%version%-VC.zip -zip -@ %dest\wxWindows-%version%-VC.zip < %src\distrib\msw\vc.rsp -Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-VC.zip wxWindows-%version% %dest% +echo Creating %dest\wxWidgets-%version%-VC.zip +zip -@ %dest\wxWidgets-%version%-VC.zip < %src\distrib\msw\vc.rsp +Rem call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-VC.zip wxWidgets-%version% %dest% rem BC++ project files -echo Creating %dest\wxWindows-%version%-BC.zip -zip -@ %dest\wxWindows-%version%-BC.zip < %src\distrib\msw\bc.rsp -Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-BC.zip wxWindows-%version% %dest% +echo Creating %dest\wxWidgets-%version%-BC.zip +zip -@ %dest\wxWidgets-%version%-BC.zip < %src\distrib\msw\bc.rsp +Rem call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-BC.zip wxWidgets-%version% %dest% rem CodeWarrior project files -echo Creating %dest\wxWindows-%version%-CW.zip -zip -@ %dest\wxWindows-%version%-CW.zip < %src\distrib\msw\cw.rsp -Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-CW.zip wxWindows-%version% %dest% +echo Creating %dest\wxWidgets-%version%-CW.zip +zip -@ %dest\wxWidgets-%version%-CW.zip < %src\distrib\msw\cw.rsp +Rem call %WXWIN%\distrib\msw\rearchive wxWidgets-%version%-CW.zip wxWidgets-%version% %dest% rem Dialog Editor source and binary Rem erase %dest\dialoged-source.zip @@ -262,32 +262,32 @@ Rem zip %dest\tex2rtf-win32-%version%.zip tex2rtf.* cd %dest rem Put all archives for transit to Linux in a zip file -echo Creating %dest\wxWindows-%version%-LinuxTransit.zip -erase %dest\wxWindows-%version%-LinuxTransit.zip -zip %dest\wxWindows-%version%-LinuxTransit.zip wxWindows-%version%-LinuxDocs.zip wxWindows-%version%-VC.zip wxWindows-%version%-CW-Mac.zip +echo Creating %dest\wxWidgets-%version%-LinuxTransit.zip +erase %dest\wxWidgets-%version%-LinuxTransit.zip +zip %dest\wxWidgets-%version%-LinuxTransit.zip wxWidgets-%version%-LinuxDocs.zip wxWidgets-%version%-VC.zip wxWidgets-%version%-CW-Mac.zip -echo Unzipping the Windows files into wxWindows-%version% +echo Unzipping the Windows files into wxWidgets-%version% -unzip -o wxWindows-%version%-win.zip -unzip -o wxWindows-%version%-VC.zip -d wxWindows-%version -unzip -o wxWindows-%version%-BC.zip -d wxWindows-%version -unzip -o wxWindows-%version%-CW.zip -d wxWindows-%version -unzip -o wxWindows-%version%-HTMLHelp.zip -unzip -o wxWindows-%version%-ExtraDoc.zip +unzip -o wxWidgets-%version%-win.zip +unzip -o wxWidgets-%version%-VC.zip -d wxWidgets-%version +unzip -o wxWidgets-%version%-BC.zip -d wxWidgets-%version +unzip -o wxWidgets-%version%-CW.zip -d wxWidgets-%version +unzip -o wxWidgets-%version%-HTMLHelp.zip +unzip -o wxWidgets-%version%-ExtraDoc.zip Rem Need Word file, for Remstar DB classes Rem Not any more -Rem unzip -o wxWindows-%version%-Word.zip +Rem unzip -o wxWidgets-%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%\wxWindows-%version% +Rem the source wxWidgets directory. +cd %dest%\wxWidgets-%version% rem Now delete a few files that are unnecessary attrib -R * erase /Y BuildCVS.txt descrip.mms erase /Y setup.h_vms -erase /Y docs\html\wxbook.htm docs\html\roadmap.htm +erase /Y docs\html\roadmap.htm Rem erase /Y contrib\docs\winhelp\mmedia.* Rem erase /Y contrib\docs\winhelp\stc.* Rem erase /Y contrib\docs\htmlhelp\mmedia.* @@ -319,8 +319,8 @@ Rem copy %src\docs\pdf\wxTutorial.pdf docs\pdf Rem Make wxMSW-xxx.zip cd %dest% -zip -r wxMSW-%version%.zip wxWindows-%version%/* -cd wxWindows-%version% +zip -r wxMSW-%version%.zip wxWidgets-%version%/* +cd wxWidgets-%version% echo Calling 'makeinno' to generate wxwin2.iss... call %WXWIN\distrib\msw\makeinno.bat @@ -328,10 +328,10 @@ 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 4\compil32.exe" /cc %WXWIN\distrib\msw\wxwin2.iss +set innocmd="C:\Program Files\Inno Setup 5\compil32.exe" /cc %WXWIN\distrib\msw\wxwin2.iss echo Invoking %innocmd... start "Inno Setup" /w %innocmd% -Rem pause Press any key to continue with the wxWindows distribution... +Rem pause Press any key to continue with the wxWidgets distribution... :tidyup cd %dest @@ -339,15 +339,15 @@ cd %dest rem Put all the setup files into a single zip archive. zip wxMSW-%version%-setup.zip readme-%version%.txt setup*.* -erase /Y wxWindows-%version%-win.zip -erase /Y wxWindows-%version%-ExtraDoc.zip +erase /Y wxWidgets-%version%-win.zip +erase /Y wxWidgets-%version%-ExtraDoc.zip -echo wxWindows archived. +echo wxWidgets archived. goto end :usage -echo DOS wxWindows distribution. Zips up all MSW, OS/2, Mac and doc files, +echo DOS wxWidgets 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. diff --git a/docs/base/readme.txt b/docs/base/readme.txt index 85af0f17fb..7525fadcac 100644 --- a/docs/base/readme.txt +++ b/docs/base/readme.txt @@ -2,7 +2,7 @@ ============= NB: this file applies to wxBase library only. If you are using a GUI version - of wxWindows, please refer to the documentation in the appropriate + of wxWidgets, please refer to the documentation in the appropriate subdirectory (msw, gtk, motif &c). @@ -11,7 +11,7 @@ NB: this file applies to wxBase library only. If you are using a GUI version 0. Introduction --------------- - wxBase is the library providing most of the non-GUI classes of the wxWindows + wxBase is the library providing most of the non-GUI classes of the wxWidgets cross-platform C++ framework. wxBase has some generic classes such as yet another C++ string class, typesafe dynamic arrays, hashes and lists and, more excitingly, wxDateTime - a very flexible and powerful class for manipulating @@ -75,7 +75,7 @@ compiler you use. 3. Installing under Unix/BeOS ----------------------------- -NB: If you're building wxBase from the wxWindows distribution and not from a +NB: If you're building wxBase from the wxWidgets distribution and not from a separate wxBase one you will need to add "--disable-gui" to configure arguments below! @@ -84,7 +84,7 @@ you get any errors from the native Unix make. The recommended way to build wxBase is: - % cd ..../wxWindows + % cd ..../wxWidgets % mkdir base-release # or any other directory of your liking % cd base-release % ../configure @@ -108,17 +108,17 @@ To build the sample then cd to samples/console and make there. wxBase classes. It doesn't do anything useful per itself but you may want to look at its code to see examples of usage of the class you are interested in. - There is no separate documentation for wxBase, please refer to wxWindows + There is no separate documentation for wxBase, please refer to wxWidgets documentation instead. - Support for wxBase is available from the same places as for wxWindows itself, + Support for wxBase is available from the same places as for wxWidgets itself, namely: * Usenet newsgroup comp.soft-sys.wxwindows -* Mailing lists: see http://lists.wxwindows.org/ for more information +* Mailing lists: see http://lists.wxwidgets.org/ for more information -* WWW page: http://www.wxwindows.org/ +* WWW page: http://www.wxwidgets.org/ Hope you will find wxBase useful! diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt index 09443b5f32..cf594f9c0a 100644 --- a/docs/gtk/changes.txt +++ b/docs/gtk/changes.txt @@ -1,5 +1,5 @@ -*** wxWindows 2.3.3 *** +*** wxWidgets 2.3.3 *** Look at the General changes file for more encompassing on the changes that have taken place in 2.3.3. This file has @@ -78,13 +78,13 @@ wxStaticBox honours wxALIGN_XXX styles Reworked wxConfig class interface. Reworked wxDynamicLibary class for loading classes (particularly -wxWindows classes) from dynamic libraries. +wxWidgets classes) from dynamic libraries. Removed wxObjectStream class. Further improvements to wxFileName class. -*** wxWindows 2.3.2 *** +*** wxWidgets 2.3.2 *** Addition of wxFileName class to handler DOS, Unix, Mac and VMS filenames and paths in a platform independent way. @@ -92,7 +92,7 @@ and paths in a platform independent way. Addition of a wxPopupWindow class to imitate temporary windows such as those used combo boxes or in tool tips. -Addition of wxToggleButton which was missing in wxWindows 2.2. +Addition of wxToggleButton which was missing in wxWidgets 2.2. Support for virtual lists in wxListCtrl. @@ -122,15 +122,15 @@ cross compilations. Improved wxSizer-based layout system for better support for dynamic layout. -*** wxWindows 2.3.0 *** +*** wxWidgets 2.3.0 *** scaling for map modes other than wxMM_TEXT works correctly (Derry Bryson) -*** wxWindows 2.2.6 *** +*** wxWidgets 2.2.6 *** wxGauge now supports wxGA_VERTICAL (Shane Forsythe) -*** 29th January 2001: wxWindows 2.2.5 released *** +*** 29th January 2001: wxWidgets 2.2.5 released *** Synchronized with wxMSW 2.2.5, include macros for upwards 2.4.0 compatibility. @@ -140,7 +140,7 @@ Added missing wxEntry prototype to wx/gtk/app.h. Fixed compilation with --enable-no_rtti/no_exceptions with older egcs. -*** 15th January 2001: wxWindows 2.2.4 released *** +*** 15th January 2001: wxWidgets 2.2.4 released *** Corrected wxYield() to handle recursive calls more gracefully (and with a warning in debug mode). @@ -172,7 +172,7 @@ Various other fixes. Synchronized release with wxMSW again. -*** 3rd November: wxWindows 2.2.3 released *** +*** 3rd November: wxWidgets 2.2.3 released *** Fixed bugs in HTTP code. @@ -199,7 +199,7 @@ Updated AFM font metrics for Ghostscript fonts and let Linux and FreeBSD default to using GS fonts (and not Adobe fonts). -*** 20th September: wxWindows 2.2.2 released *** +*** 20th September: wxWidgets 2.2.2 released *** Fixed wxSizer bug that made items with option flags greater than 1 report a wrong size. @@ -217,7 +217,7 @@ Fixed wxListCtrl::HitTest() for report mode. Other minor fixes. -*** 20th August 2000: wxWindows 2.2.1 released *** +*** 20th August 2000: wxWidgets 2.2.1 released *** Minor build fixes. @@ -250,7 +250,7 @@ Minor correction to doc-view architecture. Minor wxCommandLineParser changes. -*** 10th July 2000: wxWindows 2.2.0 released *** +*** 10th July 2000: wxWidgets 2.2.0 released *** Added code for writing BMP images. @@ -281,7 +281,7 @@ Various fixes to the new wxGrid class. Bug-fixes. -*** 4th June 2000: wxWindows pre-2.2 release *** +*** 4th June 2000: wxWidgets pre-2.2 release *** Complete freeze now. Only vital bug-fixes allowed. @@ -293,12 +293,12 @@ Reworked wxURL. MANY bugfixes. -*** 22th March 2000: wxWindows 2.1.15 released *** +*** 22th March 2000: wxWidgets 2.1.15 released *** Build fix. RPMs no longer require GTK's include files. An extra library for the OpenGl class now gets built -*** 19th March 2000: wxWindows 2.1.14 released *** +*** 19th March 2000: wxWidgets 2.1.14 released *** An extra library for the OpenGl class now gets built and installed. There is also an extra RPM for this @@ -359,7 +359,7 @@ style when using the default. The L-GPL iODBC library must now be enables explicitly so as to not mislead people into reading the license wrong. -*** 24th January '2000: wxWindows 2.1.13 released *** +*** 24th January '2000: wxWidgets 2.1.13 released *** Corrections to TAB handling in notebooks. @@ -404,7 +404,7 @@ Updates to the ODBC classes (George Tasker). Build-fixes for various platforms and compilers. -*** 6th January '2000: wxWindows 2.1.12 released *** +*** 6th January '2000: wxWidgets 2.1.12 released *** Who has a BigEndian computer (e.g. Sparc or PowerPC) that runs a 15 and/or 16 bit colour mode? I need this for testing purposes, i.e. this @@ -515,7 +515,7 @@ More minor changes and fixes. Began work on a new dialog and resource editor (wxDesigner). -*** 7st November '99: wxWindows 2.1.11 released *** +*** 7st November '99: wxWidgets 2.1.11 released *** There is still an unresolved problem with bitmap to image conversion on big-endian architectures (such as Solaris), @@ -524,14 +524,14 @@ one as I have no BE computer. Enlightenment has struck the majority of the developers and they have chosen to use the Linux kernel numbering scheme -for wxWindows from now on. This means that the next stable -release will be called wxWindows 2.2.X, development snapshots +for wxWidgets from now on. This means that the next stable +release will be called wxWidgets 2.2.X, development snapshots will be called 2.1.X. A lot of discussion has been wasted on how to maintain a once released stable version. It was almost universally agreed that only a commercial entity will have the motivation -($$$) to do that - so far there is no wxWindows Inc. +($$$) to do that - so far there is no wxWidgets Inc. Support for GTK 1.0 has been dropped. This version has been tested with GTK 1.2.3 and GTK 1.2.6 - it might @@ -553,7 +553,7 @@ try again, poor AIX, HP-UX and *BSD users, but don't reckon with immediate success. Actually, when using GNU compilers, your chances are quite good. -My rewrite of the wxWindows underlying GTK widget +My rewrite of the wxWidgets underlying GTK widget has turned scrolling including subwindows from barely functional to pretty and fast. I also added scrolling of foreign windows to wxScrolledWindow. @@ -573,7 +573,7 @@ can now use wxODBC from wxMSW and wxGTK. Several printing things fixed. More work needs to be done here.. -HTML widget and the wxWindows' help system based upon +HTML widget and the wxWidgets' help system based upon it have been reorganized and improved for easier use from Python and C++. Also HTML printing has been added. @@ -588,14 +588,14 @@ without shadow affect). Michael is writing a complete rewrite of the antiquated wxGrid. This is still work-in-progress and might not make -it into wxWindows 2.2, we'll see. Help would be welcome +it into wxWidgets 2.2, we'll see. Help would be welcome to make that happen. Made wxMenu code lose less memory, also added wxMenu::Delete(). Added code to send wxActivateEvent to MDI windows. -Vadim added configure things to compile wxWindows without any +Vadim added configure things to compile wxWidgets without any GUI library. This is probably work in progress. He'll also add a wxFontEnumerator class and has enhanced wxFont to make use of char-encodings. @@ -823,7 +823,7 @@ Implemented global cursors and wxBusyCursor etc. Also removed another cursor misbehaviour. Updated many parts of the documentation to reflect changes -in wxWindows 2.1, wxPython and more exact description of +in wxWidgets 2.1, wxPython and more exact description of cross-platform issues as well as platform differences. Many other fixes, mainly by others... @@ -935,7 +935,7 @@ Note that the next release might bring about changes to keyboard handling and scroll event intercepting from wxScrolledWindow. By and large much of the code has stabilized and won't be much -*** different in the final wxWindows 2.1 release. Please test as *** +*** different in the final wxWidgets 2.1 release. Please test as *** much as you can. The next release will have a new build system. @@ -981,7 +981,7 @@ This no longer forces wxGTK applications to sleep (by having to call usleep()) in idle time - giving more CPU slices to the application if desired. -wxGLCanvas (the OpenGl for wxWindows) now accepts keyboard input. +wxGLCanvas (the OpenGl for wxWidgets) now accepts keyboard input. The usual number of compile and bug fixes from all involved. @@ -1026,7 +1026,7 @@ wxPython still doesn't compile, I think. 12th April '99: First wxGTK 2.1 snapshot released -This is the first developers' version of wxWindows 2.1 for GTK. It's main +This is the first developers' version of wxWidgets 2.1 for GTK. It's main new feature is that it supports GTK 1.2 (as opposed to GTK 1.0) which will make development within the GNOME environment a lot easier. @@ -1062,16 +1062,16 @@ goodies, possibly world domination. -*** 5th March '99: wxWindows 2.0 released *** +*** 5th March '99: wxWidgets 2.0 released *** -This is the final version of wxWindows 2.0 for GTK. The versions for +This is the final version of wxWidgets 2.0 for GTK. The versions for Windows and Motif (and also this version) are available form Julian Smart's site. The Mac version is still under development. -*** 19th February '99: wxWindows 2.0 beta 5 *** +*** 19th February '99: wxWidgets 2.0 beta 5 *** This is the fifth beta release and it contains mostly bug fixes and @@ -1081,7 +1081,7 @@ Applied compile fixes for Solaris (different flavours and compilers). -*** 12th February '99: wxWindows 2.0 beta 4 *** +*** 12th February '99: wxWidgets 2.0 beta 4 *** This is the fourth beta release and it contains mostly bug fixes and @@ -1100,7 +1100,7 @@ Fixed many bugs. You guessed it. -*** 29th January '99: wxWindows 2.0 beta 3 *** +*** 29th January '99: wxWidgets 2.0 beta 3 *** This is the third beta release and it contains mostly bug fixes. @@ -1109,7 +1109,7 @@ There is one field where we haven't been able to fix the API yet, and that it Drag'n'Drop. This is mostly due to the fact that DnD in GTK 1.0 is hardly usable and much different from GTK 1.2 which means that we have to design a common API for Windows, GTK 1.0 and GTK 1.2. Although -we are trying to prevent that, it is possible that wxWindows 2.0 (being +we are trying to prevent that, it is possible that wxWidgets 2.0 (being based on GTK 1.0) will not have proper DnD support. The major changes are that tool tips have been added, threads have been completely @@ -1141,7 +1141,7 @@ SuSE 6.0 as SuSE decided to ship 6.0 with a broken GTK+ package. -*** 6th January '99: wxWindows 2.0 beta 2 *** +*** 6th January '99: wxWidgets 2.0 beta 2 *** This is the second beta release and contains it mostly build and @@ -1150,7 +1150,7 @@ commercial Unices and Windows. -*** 20th December '98: wxWindows 2.0 beta 1 *** +*** 20th December '98: wxWidgets 2.0 beta 1 *** This is the first beta release and we have used the time before @@ -1164,7 +1164,7 @@ program statically with wxGTK. We changed the name of the shared library to include the version of the GTK used so that no conflicts emerge with simultaneous -versions of wxWindows for GTK 1.0 and for GTK 1.2 and so on. +versions of wxWidgets for GTK 1.0 and for GTK 1.2 and so on. As you can see, we have not moved to GTK 1.1.X as the different development versions are too different and buggy to be useful. We'll @@ -1175,7 +1175,7 @@ wxGTK now compiles without problems on anything between gcc 2.7.2 on Linux-x86 and egcs 1.1 on Linux-Alpha and egcs 1.0 on Sparc. This isn't as easy as it sounds... -Available form this site are the Python bindings of wxWindows. +Available form this site are the Python bindings of wxWidgets. Thanks to Robin Dunn for this tremendous contribution. Tkinter is dead, Java is dead, wxPython rules! That's all there is to say. @@ -1217,9 +1217,9 @@ resulting in unexpected behaviour so it was decided to remove these constructors. As the number of users and the number of test programs and samples -is steadily rising the core classes of wxWindows for MSW and GTK 1.0 +is steadily rising the core classes of wxWidgets for MSW and GTK 1.0 can be considered to be very stable if not outright bug-free. I haven't -seen a crash for weeks now and wxWindows' internal debug features also +seen a crash for weeks now and wxWidgets' internal debug features also have improved every week, making stepping-through with a debugger almost completely unnecessary as the library reports possible errors itself (when in debug mode). diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index e1b3b17e49..e1d1201655 100644 --- a/docs/gtk/install.txt +++ b/docs/gtk/install.txt @@ -1,4 +1,4 @@ -wxWindows 2.4 for GTK installation +wxWidgets 2.4 for GTK installation ---------------------------------- IMPORTANT NOTE: @@ -9,14 +9,14 @@ IMPORTANT NOTE: mailing wxwin-users or the author. Preferably, try to fix the problem first and then send a patch to the author. - When sending bug reports tell us what version of wxWindows you are + When sending bug reports tell us what version of wxWidgets you are using (including the beta) and what compiler on what system. One example: wxGTK 2.4.0, gcc 2.95.4, Redhat 6.2 * The simplest case ------------------- -If you compile wxWindows on Linux for the first time and don't like to read +If you compile wxWidgets on Linux for the first time and don't like to read install instructions just do (in the base dir): > ./configure --with-gtk @@ -34,7 +34,7 @@ Afterwards you can continue with > ldconfig > exit -If you want to remove wxWindows on Unix you can do this: +If you want to remove wxWidgets on Unix you can do this: > su > make uninstall @@ -44,7 +44,7 @@ If you want to remove wxWindows on Unix you can do this: * The GTK+ 2 case ----------------- -wxGTK 2.4.2 has support for the new version 2.0.X of GTK+. This means +wxGTK 2.4.3 has support for the new version 2.0.X of GTK+. This means that wxGTK apps can now make use Unicode as the underlying encoding for all text operations. This is a very fundamental change and will need time to stabilize, so be careful. Anyways, after installing a @@ -68,10 +68,10 @@ Expect problems. * The expert case ----------------- -If you want to do some more serious cross-platform programming with wxWindows, +If you want to do some more serious cross-platform programming with wxWidgets, such as for GTK and Motif, you can now build two complete libraries and use them concurrently. For this end, you have to create a directory for each build -of wxWindows - you may also want to create different versions of wxWindows +of wxWidgets - you may also want to create different versions of wxWidgets and test them concurrently. Most typically, this would be a version configured with --enable-debug and one without. Note, that only one build can currently be installed, so you'd have to use local version of the library for @@ -114,7 +114,7 @@ LD_LIBRARY_PATH or equivalent variable contains the path to GTK+ libraries if they were installed in a non default location. You get errors from make: please use GNU make instead of the native make -program. Currently wxWindows can be built only with GNU make, BSD make and +program. Currently wxWidgets can be built only with GNU make, BSD make and Solaris make. Other versions might work or not (any which don't have VPATH support definitely won't). @@ -142,7 +142,7 @@ g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo * General --------- -The Unix variants of wxWindows use GNU configure. If you have problems with +The Unix variants of wxWidgets use GNU configure. If you have problems with your make use GNU make instead. If you have general problems with installation, read my homepage at @@ -158,7 +158,7 @@ but I tried... * GUI libraries --------------- -wxWindows/GTK requires the GTK+ library to be installed on your system. It has +wxWidgets/GTK requires the GTK+ library to be installed on your system. It has to be a stable version, preferably version 1.2.10 (at least 1.2.3 is required, 1.2.7 is strongly recommended). @@ -172,7 +172,7 @@ at my homepage. * Additional libraries ---------------------- -wxWindows/Gtk requires a thread library and X libraries known to work with +wxWidgets/Gtk requires a thread library and X libraries known to work with threads. This is the case on all commercial Unix-Variants and all Linux-Versions that are based on glibc 2 except RedHat 5.0 which is broken in many aspects. As of writing this, these Linux distributions have correct glibc @@ -198,7 +198,7 @@ exit Please send comments and question about the OS/2 installation to Stefan Neis and patches to -the wxWindows mailing list. +the wxWidgets mailing list. In the following list, the version numbers indicate the configuration that was actually used by myself, newer version should cause no problems and @@ -271,8 +271,8 @@ to see all the options please use: ./configure --help -It is recommended to build wxWindows in another directory (maybe a -subdirectory of your wxWindows installation) as this allows you to +It is recommended to build wxWidgets in another directory (maybe a +subdirectory of your wxWidgets installation) as this allows you to have multiple configurations (for example, debug and release or GTK and Motif) simultaneously. @@ -339,7 +339,7 @@ The following options handle the kind of library you want to build. such as gdb (or its many frontends). --enable-debug_flag Define __DEBUG__ and __WXDEBUG__ when - compiling. This enable wxWindows' very + compiling. This enable wxWidgets' very useful internal debugging tricks (such as automatically reporting illegal calls) to work. Note that program and library @@ -357,14 +357,14 @@ The following options handle the kind of library you want to build. When producing an executable that is linked statically with wxGTK you'll be surprised at its immense size. This can sometimes be -drastically reduced by removing features from wxWindows that +drastically reduced by removing features from wxWidgets that are not used in your program. The most relevant such features are --with-odbc Enables ODBC code. This is disabled by default because iODBC is under the L-GPL license which is less liberal than - wxWindows license. + wxWidgets license. --without-libpng Disables PNG image format code. @@ -433,7 +433,7 @@ password) and type make install -You can remove any traces of wxWindows by typing +You can remove any traces of wxWidgets by typing make uninstall @@ -470,7 +470,7 @@ This is certain to become the standard way unless we decide to stick to tmake. 2) The other way creates a project within the source code -directories of wxWindows. For this endeavour, you'll need +directories of wxWidgets. For this endeavour, you'll need GNU autoconf version 2.14 and add an entry to your Makefile.in to the bottom of the configure.in script and run autoconf and configure before you can type make. diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt index c110682f77..0b97efc6a8 100644 --- a/docs/gtk/readme.txt +++ b/docs/gtk/readme.txt @@ -1,20 +1,20 @@ - Welcome to wxWindows/Gtk 2.4 + Welcome to wxWidgets/Gtk 2.4 you have downloaded version 2.4 of the GTK port of the -wxWindows GUI library. +wxWidgets GUI library. -wxWindows no longer supports GTK 1.0 (as did some early +wxWidgets no longer supports GTK 1.0 (as did some early snapshots) so that you will need GTK 1.2 when using it. GTK 1.2.6 or above is recommended although some programs will work with GTK 1.2.3 onwards. There is now support for GTK 2.0. -More info about the wxWindows project (and the Windows +More info about the wxWidgets project (and the Windows and Motif ports in particular) can be found at Julian's homepage at: - http://www.wxwindows.org + http://www.wxwidgets.org Information on how to install can be found in the file INSTALL.txt, but if you cannot wait, this should work on @@ -45,17 +45,17 @@ WAS REPORTED. I know this has no effect, but I tried... The library produced by the install process will be called libwx_gtk.a (static) and libwx_gtk-2.2.so.0.0.0 (shared) so -that once a binary incompatible version of wxWindows/Gtk comes +that once a binary incompatible version of wxWidgets/Gtk comes out we'll augment the library version number to avoid linking problems. Please send problems concerning installation, feature requests, -bug reports or comments to the wxWindows users list. Information +bug reports or comments to the wxWidgets users list. Information on how to subscribe is available from my homepage. Do NOT send any comments directly to me. -wxWindows/Gtk doesn't come with any guarantee whatsoever. It +wxWidgets/Gtk doesn't come with any guarantee whatsoever. It might crash your harddisk or destroy your monitor. It doesn't claim to be suitable for any special or general purpose. diff --git a/docs/html/faq.htm b/docs/html/faq.htm index d9dddfef27..f3e82b883c 100644 --- a/docs/html/faq.htm +++ b/docs/html/faq.htm @@ -36,8 +36,8 @@ Welcome to the wxWidgets FAQ. Please select a category:

For further information, please see the -wxWidgets Web site, -wxWiki +wxWidgets Web site, +wxWiki and install.txt (per port), todo.txt (per port), and bugs.txt (all ports) files in your wxWidgets installation.

diff --git a/docs/html/faqgen.htm b/docs/html/faqgen.htm index 43d44423d5..b8ff200f3c 100644 --- a/docs/html/faqgen.htm +++ b/docs/html/faqgen.htm @@ -309,7 +309,7 @@ Update: a wx.NET project

How can I help the project?

-Please check out the Community pages, +Please check out the Community pages, in particular the suggested projects, and mail the developers' mailing list with your own suggestions.

diff --git a/docs/html/faqmsw.htm b/docs/html/faqmsw.htm index 2886be5533..4181e431c8 100644 --- a/docs/html/faqmsw.htm +++ b/docs/html/faqmsw.htm @@ -254,7 +254,7 @@ lib/mswd

or if building the static Release library, lib/msw.

-See also the wxWiki Contents +See also the wxWiki Contents for more information.

@@ -501,7 +501,7 @@ bool myGlobalConfig::Write (const wxString& key, const wxString& value)

Is MS Active Accessibility supported?

-This is being worked on. Please see this page +This is being worked on. Please see this page for the current status.

diff --git a/docs/html/i18n.htm b/docs/html/i18n.htm index 076811cb1b..1db866e0cb 100644 --- a/docs/html/i18n.htm +++ b/docs/html/i18n.htm @@ -187,7 +187,7 @@ translations as of wxWidgets 2.3. Russian Ok Roman Rolinsky, - Vadim Zeitlin + Vadim Zeitlin Andrew V. Samoilov @@ -245,7 +245,7 @@ translations. Here are the the steps you should follow: or the daily snapshots, you should already have it. Otherwise you can always retrieve it directly from the cvs repository via the Web interface - here. + here.

  • Rename it to XY.po where "XY" is the 2 letter ISO 639-1 language code @@ -263,13 +263,13 @@ translations. Here are the the steps you should follow: accept the default values for them.
  • Send the finished translation to - Vadim Zeitlin and it will be + Vadim Zeitlin and it will be added to the next wxWidgets release or snapshot.

    In addition, please consider subscribing to the very low volume - + wxWidgets translators mailing list on which the news especially important for the translators are announced. @@ -277,7 +277,7 @@ for the translators are announced. Thank you in advance for your help!

    -Please contact me with +Please contact me with any comments/suggestions. diff --git a/docs/html/index.htm b/docs/html/index.htm index 1e9679d0bb..74bcdbf3e8 100644 --- a/docs/html/index.htm +++ b/docs/html/index.htm @@ -17,7 +17,7 @@ This is an index of the plain text, HTML, Windows Help and Acrobat documentation: availability depends on what you've -downloaded from the wxWidgets Web site.

    +downloaded from the wxWidgets Web site.

    diff --git a/docs/html/news.htm b/docs/html/news.htm index 13e2114a77..6043980dad 100644 --- a/docs/html/news.htm +++ b/docs/html/news.htm @@ -22,7 +22,7 @@ News
    • Vaclav Slavik has recently written an -article about wxWindows for a Czech ezine. +article about wxWidgets for a Czech ezine.
    • Hurray! There is a lot of traffic on the wxStudio mailing list, and Gerd Mueller has offered to make the WipeOut IDE open source and merge it with wxStudio. @@ -31,21 +31,21 @@ open source and merge it with wxStudio.

      July 9th, 2000

      June 4th, 2000

        -
      • wxWindows 2.1.16 contains fixes +
      • wxWidgets 2.1.16 contains fixes for wxGTK, wxMSW and wxMotif. It is hoped that this is the last release before the stable 2.2 version.

      March 28th, 2000

        -
      • wxWindows 2.1.15 contains a few fixes +
      • wxWidgets 2.1.15 contains a few fixes for wxGTK and wxMSW. wxMSW and wxMotif users who already have 2.1.14 do not need to rush to download this version! The fixes in the patch file (see main download page) contain the major differences between 2.1.14 and 2.1.15. @@ -54,12 +54,12 @@ major differences between 2.1.14 and 2.1.15.

        March 21st, 2000

          -
        • wxWindows 2.1.14 is now available for Windows, Motif and GTK. +
        • wxWidgets 2.1.14 is now available for Windows, Motif and GTK. Again, great strides have been made since the previous official version (2.1.11), and 2.2 will be the next official stable version. Many things have been fixed and added but here are some highlights.
        • Robin Dunn is contributing a wxStyledTextCtrl, a wrapper around the Scintilla styled text edit control. It can be used to provide syntax highlighting for various languages, and other applications. -A snapshot of this work in progress, stc.zip, is provided on the ftp site alongside the latest wxWindows release. +A snapshot of this work in progress, stc.zip, is provided on the ftp site alongside the latest wxWidgets release.
        • Guilhem Lavaux has reworked his MMedia sound and video class library and started its documentation; it too is available alongside the latest release as mmedia.zip.
        @@ -67,8 +67,8 @@ it too is available alongside the latest release as mmedia.zip.

        January 14th, 2000

          -
        • Mumit Khan of Mingw32 fame has been testing wxWindows against Mingw32, -to eliminate some bugs in both products and get wxWindows compilation as a DLL working +
        • Mumit Khan of Mingw32 fame has been testing wxWidgets against Mingw32, +to eliminate some bugs in both products and get wxWidgets compilation as a DLL working for Mingw32.
        • Vadim has added his wxDateTime and wxCalendarCtrl classes and samples to the CVS archive.
        • TIFF support has been added, and wxImage speeded up. @@ -76,14 +76,14 @@ for Mingw32.
        • The DDE sample now works in socket mode, at last.
        • Vadim has got clipboard copy and paste working for metafiles, by adding an enhanced metafile class. -
        • The wxWindows web site is now hosted on SourceGear's server, with a bug tracker and +
        • The wxWidgets web site is now hosted on SourceGear's server, with a bug tracker and other facilities to follow shortly.

        November 9th, 1999

        -wxWindows 2.1.11 is now available for Windows, Motif and GTK. +wxWidgets 2.1.11 is now available for Windows, Motif and GTK. The final 2.2 public release will have further bug fixes, but 2.1.11 is pretty stable - a big improvement on 2.0.1 and better than previous snapshots. Here are a few of the features that make it well worth the upgrade:

        @@ -94,7 +94,7 @@ on 2.0.1 and better than previous snapshots. Here are a few of the features that maintenance.

      • Ability to compile library in console (non-GUI) mode.
      • Integration of wxHTML widget and help controller into - wxWindows. wxHTML allows HTML viewing and printing (wxGTK + wxWidgets. wxHTML allows HTML viewing and printing (wxGTK and wxMSW, partial support in wxMotif).
      • New classes wxChrono, wxDialUpManager, wxFontEnumerator, wxWizard, wxStaticLine, etc. @@ -142,18 +142,18 @@ API and features.

        July 31st, 1999

        -We are glad to announce the start of the work on the new wxWindows port - wxBeOS -which will implement wxWindows 2 API for BeOS. -Thanks to Be for donating licenses to wxWindows project to make it possible. +We are glad to announce the start of the work on the new wxWidgets port - wxBeOS +which will implement wxWidgets 2 API for BeOS. +Thanks to Be for donating licenses to wxWidgets project to make it possible.

        -If you're interested in helping with this new port, please write to wxWindows +If you're interested in helping with this new port, please write to wxWidgets developers mailing list!

        May 27th, 1999

          -
        • Beta 1 of wxWindows 2 for Mac has been released, thanks to Stefan Csomor's amazing efforts. -
        • Work continues on the development branch of wxWindows 2 for MSW, GTK and Motif. Vadim has been reworking the +
        • Beta 1 of wxWidgets 2 for Mac has been released, thanks to Stefan Csomor's amazing efforts. +
        • Work continues on the development branch of wxWidgets 2 for MSW, GTK and Motif. Vadim has been reworking the MSW implementation to solve some internal design problems, as well as factoring out base classes to make development easier.
        • Work on consistent drag and drop support in GTK and MSW continues. @@ -161,27 +161,27 @@ development easier.

          March 1st, 1999

          -wxWindows 2 launch day!

          +wxWidgets 2 launch day!

            -
          • wxWindows 2 officially launched, after more than two years' development of +
          • wxWidgets 2 officially launched, after more than two years' development of the API and ports to Windows, GTK and Motif (Mac to follow). -Download wxWindows 2. +Download wxWidgets 2.

          November 26th 1998

            -
          • wxWindows 1.68E contains minor bug fixes and now compiles with MS VC++ 6.0, and +
          • wxWidgets 1.68E contains minor bug fixes and now compiles with MS VC++ 6.0, and (hopefully) BC++ 5.0, as well as Cygwin b20. -
          • The latest wxWindows 2.0 alpha shows good progress +
          • The latest wxWidgets 2.0 alpha shows good progress on the Motif port, with a tabbed MDI implementation, a nice wxToolBar class and most -major classes working. wxWindows 2.0 for Windows now works with VC++ 6.0, BC++ 5.0 and +major classes working. wxWidgets 2.0 for Windows now works with VC++ 6.0, BC++ 5.0 and Cygwin b20. There's a problem linking with Mingw32, I don't know why this is, perhaps something to do with differences in the way pragmas are handled.
          • There is also good progress with Stefan Csomor's wxMac 2.0: watch this space. A preview is available here. -
          • Work is finally underway on a wxWindows IDE! +
          • Work is finally underway on a wxWidgets IDE!
          • Aleksandras Gluchovas is working on a docking window implementation and the results are pretty impressive so far. Here's a screenshot; source code is here and a WIN32 executable @@ -207,9 +207,9 @@ and most of the samples now compile under both ports.

            April 28th 1998

              -
            • wxWindows 1.68C has been released. This mainly provides compatibility with Gnu-Win32 b19 +
            • wxWidgets 1.68C has been released. This mainly provides compatibility with Gnu-Win32 b19 and Mingw32. -
            • wxWindows 2.0 beta 9 has been released. Again, this provides Gnu-Win32 b19/Mingw32 compatibility +
            • wxWidgets 2.0 beta 9 has been released. Again, this provides Gnu-Win32 b19/Mingw32 compatibility plus a few small bug fixes.
            @@ -224,16 +224,16 @@ for details. You may need to re-subscribe if you subscribed since February 1998.
            • Happy New Year! -
            • wxWindows 1.68B is available. -
            • wxWindows 2.0 has another port in progress - wxGTK, +
            • wxWidgets 1.68B is available. +
            • wxWidgets 2.0 has another port in progress - wxGTK, by Robert Roebling (see also the information on the same page about Robert's FADE desktop environment project).
            • The Windows and Xt/Motif ports to 2.0 are progressing well. A large proportion of the documentation has been done. One of the main things to resolve is how transformations (such as scaling and translation) will be done in 2.0, but we're heading towards agreement. -
            • There is a new wxWindows Developers Site in preparation, for people developing ports of -wxWindows. There are newsgroups and a wxwin-developers mailing list. -
            • 40 wxWindows CD-ROMs have been sold, mostly outside the U.K. +
            • There is a new wxWidgets Developers Site in preparation, for people developing ports of +wxWidgets. There are newsgroups and a wxwin-developers mailing list. +
            • 40 wxWidgets CD-ROMs have been sold, mostly outside the U.K.
            • Antonia Charlotte Smart was born on November 1st 1997. Naturally, she's as cute as her parents.
            @@ -241,20 +241,20 @@ wxWindows. There are newsgroups and a wxwin-developers mailing list.
            • Added Getting Started page for new users. -
            • There's a good review of wxWindows by Oliver Niedung and Stefan Gunther in +
            • There's a good review of wxWidgets by Oliver Niedung and Stefan Gunther in iX, a German computer magazine.

            July 24th 1997

            July 22nd 1997

              -
            • wxWindows 1.67 is nearly there... +
            • wxWidgets 1.67 is nearly there...
            • Check out Forty Thieves, a great card game by Chris Breeze of Hitachi Europe Limited.
            @@ -262,11 +262,11 @@ by Chris Breeze of Hitachi Europe Limited.

            July 16th 1997

              -
            • Jobst Schmalenbach has set up Australian mirrors of the wxWindows ftp and Web sites: +
            • Jobst Schmalenbach has set up Australian mirrors of the wxWidgets ftp and Web sites: please see the Mirrors page. -
            • Arthur Tetzlaff-Deas is starting to look afresh at a port of wxWindows 2.0 to +
            • Arthur Tetzlaff-Deas is starting to look afresh at a port of wxWidgets 2.0 to NeXTStep. This is more relevant now that the NeXT OS will be essential to the Apple Mac's future. -
            • The next release of wxWindows for Motif/XView/Windows should be within the next two weeks or so. I have abandoned +
            • The next release of wxWidgets for Motif/XView/Windows should be within the next two weeks or so. I have abandoned documentation in wxHelp form in favour of the much better quality HTML format, which I will be including with the distribution from now on.
            @@ -274,18 +274,18 @@ will be including with the distribution from now on.

            July 7th 1997

              -
            • For news on wxWindows 2.0 development, please see What's coming next? +
            • For news on wxWidgets 2.0 development, please see What's coming next? - developments include DLL and experimental Netscape Plugin support. The estimate for a release date has been put back to October 1997 - to be out of the way before Smart Jr. arrives in November... -
            • Negotiations with a U.S. company about development of wxWindows into a commercial product +
            • Negotiations with a U.S. company about development of wxWidgets into a commercial product fell through, since it was not possible to agree about the continuation of a version -of wxWindows that maintains the free, collaborative spirit that currently exists. +of wxWidgets that maintains the free, collaborative spirit that currently exists.

            May 18th 1997

              -
            • wxWindows 2.0 development (mostly for the Windows platform) is on track thanks to funding for wxWin-related consultancy +
            • wxWidgets 2.0 development (mostly for the Windows platform) is on track thanks to funding for wxWin-related consultancy - thank you to those concerned! This work is still on the free version of 2.0, although an additional commercial version may be developed sometime in the future. Markus Holzem continues to generously donate his spare time for Motif/Xt developments, and Greg Whitehead is looking into the Mac version of 2.0. @@ -293,7 +293,7 @@ his spare time for Motif/Xt developments, and Greg Whitehead is looking into the wxSocket, a set of classes for network programming based on work by Andrew Davison. Currently this works on Motif/Xt and is coded but not yet tested for Windows. The wxIPC classes on the UNIX side have been rewritten to take advantage of the new -classes. wxSocket is a great contribution that will be a part of wxWindows 2.0. Meanwhile, do check +classes. wxSocket is a great contribution that will be a part of wxWidgets 2.0. Meanwhile, do check it out and help Guilhem debug and develop it further.
            • Other noteworthy contributions in recent weeks include a patch for using bitmap masks on X for transparency @@ -311,13 +311,13 @@ Check out the Contributions page for more.

              May 8th 1997

                -
              • Hitachi Europe Limited have used wxWindows both to implement and to illustrate +
              • Hitachi Europe Limited have used wxWidgets both to implement and to illustrate their WebReuser tool - a link to their pages has been added to the Applications page.
              • Another interesting link in the Applications page is WipeOut, a C++ integrated development environment for Linux. -
              • Fixes to make wxWindows 1.66F work with VC++ 5.0 are in the +
              • Fixes to make wxWidgets 1.66F work with VC++ 5.0 are in the ports/msvc50 directory.
              @@ -327,14 +327,14 @@ directory.

              April 20th 1997

                -
              • wxWindows is listed in the Scientific Applications on Linux index, +
              • wxWidgets is listed in the Scientific Applications on Linux index, here.
              • There is a new page for issues with the current release which I would encourage you to read. -
              • The wxWindows Web pages can be switched to non-frames mode, for those who find frames irritating +
              • The wxWidgets Web pages can be switched to non-frames mode, for those who find frames irritating (and who use browsers that don't implement Back properly :-)).
              • The Contrib page has some new entries. -
              • wxWindows 2.0 progress is steady. +
              • wxWidgets 2.0 progress is steady.
              • Greg Whitehead is taking a look at what's involved for a Mac port of 2.0, possibly using MetroWerks' PowerPlant classes to speed up development.
              @@ -343,9 +343,9 @@ classes to speed up development.

              March 13th 1997

                -
              • Check out C-LAB's Lean Integration Platform written in wxWindows/wxLisp: it's +
              • Check out C-LAB's Lean Integration Platform written in wxWidgets/wxLisp: it's a multi-platform workflow tool. Nice Web pages! -
              • I've written some tips to help you code for easy porting to wxWindows 2.0. +
              • I've written some tips to help you code for easy porting to wxWidgets 2.0.
              • wxWin 2.0 progress: I've eliminated the need for the dreaded CTL3D library for Windows 95 applications. New MDI classes are working, plus wxStatusBar, wxScrolledWindow. Markus is starting work on the Motif port, with wxXt 2.0 as a second priority. But financial help to keep @@ -357,9 +357,9 @@ the momentum going is needed!

                February 25th 1997

                  -
                • Yura Bidus (yari_b@automedi.com) has successfully adapted wxWindows 1.66B to compile as a DLL under +
                • Yura Bidus (yari_b@automedi.com) has successfully adapted wxWidgets 1.66B to compile as a DLL under Borland C++. He will be patching 1.66F and investigating using VC++ for building the DLL. -
                • Early experiments indicate that application files using wxWindows 2.0 +
                • Early experiments indicate that application files using wxWidgets 2.0 and GNU-WIN32 will be at least twice as fast to compile as 1.66, due to elimination of base classes and restructuring to avoid including windows.h.
                @@ -369,11 +369,11 @@ and restructuring to avoid including windows.h.

                January 29th 1997

                  -
                • wxWindows 1.66F has been semi-released +
                • wxWidgets 1.66F has been semi-released for people to test before the official release. It works with GNU-WIN32, and contains miscellaneous bug fixes.
                • ITA, Inc. have sent a debugged and enhanced Mac port (building on 1.61). -
                • Markus Holzem and Julian Smart are designing wxWindows 2.0, which should make wxWindows into a force +
                • Markus Holzem and Julian Smart are designing wxWidgets 2.0, which should make wxWidgets into a force to be reckoned with against other free and commercial libraries. The What's coming next? page will shortly contain more details.
                • The mailing lists are up and running again, with new subscription and discussion diff --git a/docs/html/platform.htm b/docs/html/platform.htm index f312ae8078..e1fb904f40 100644 --- a/docs/html/platform.htm +++ b/docs/html/platform.htm @@ -1,6 +1,6 @@ - Platforms supported by wxWindows 2.4 + Platforms supported by wxWidgets 2.4 @@ -21,32 +21,32 @@

                  You will find below the list of all supported platforms for different ports of -wxWindows 2.x (wxMSW/wxGTK/wxMotif ports only). The cross icon in the third +wxWidgets 2.x (wxMSW/wxGTK/wxMotif ports only). The cross icon in the third column doesn't mean that the platform is not supported, but just that -wxWindows hasn't been tested on it recently (the table is being updated for -wxWindows 2.4.0 currently). +wxWidgets hasn't been tested on it recently (the table is being updated for +wxWidgets 2.4.0 currently).

                  See also:

                  -If you have tested wxWindows on a platform not mentioned here, please tell us about your experience on our mailing list! +If you have tested wxWidgets on a platform not mentioned here, please tell us about your experience on our mailing list! We would especially like to have information about compiling wxGTK on other Unix variants, such as IRIX, DG-UX, other flavours of BSD, ... Please note that you will generally need GNU make -(also known as gmake) to compile wxWindows, native make programs +(also known as gmake) to compile wxWidgets, native make programs often don't work.

                  - + @@ -75,7 +75,7 @@ often don't work. + Borland C++ can't cope with ODBC, resources and new wxGrid class. Last tested in wxWidgets 2.2.7. @@ -133,7 +133,7 @@ often don't work. diff --git a/docs/html/wxbook.htm b/docs/html/wxbook.htm deleted file mode 100644 index fa091b3a94..0000000000 --- a/docs/html/wxbook.htm +++ /dev/null @@ -1,315 +0,0 @@ - - - -wxWindows Book - - - - - - -
                  wxWindows 2 Platforms wxWidgets 2 Platforms
                  Win16
                  (Windows 3.1)                  		 Visual C++ 1.52Ok
                  		 Some features are missing (OLE related classes, threads, ...)
                  - Borland C++ can't cope with ODBC, resources and new wxGrid class. Last tested in wxWindows 2.2.7.
                  Borland C++ 4.0/5.0OkJS
                  IRIX
                  Note that all entries use MIPSPro 7.3 compiler on IRIX 6.5.9 with -mips3 -n32 flags if not mentioned otherwise. - Also note that you need to set LD_LIBRARYN32_PATH under IRIX to run wxWindows programs. + Also note that you need to set LD_LIBRARYN32_PATH under IRIX to run wxWidgets programs.
                  wxGTK 2.2OkIanYou may need to use --disable-catch_segvs if you get compiler error in utilsunx.cpp
                  wxGTK 2.3OkCarl Godkin
                  - - - -
                  - -wxWindows Book - -
                  - -

                  - -

                  -About | -Participants | -Publication | - -Format | -Style guide | -Titles | -Contents -
                  - -

                  -

                  -

                  - -

                  About the wxWindows book

                  - -August 2000: the 'wxBook' project is getting going again, -with a good response from potential contributors.

                  - -Robin Dunn has set up a wxBook mailing list.

                  - -The book will comprise 30 or so chapters dealing with progressively -more advanced areas of wxWindows; each chapter will be as stand-alone as -possible. The book will -not include the API reference, though this could be a -separate project. The book will be accompanied by a CD-ROM with -wxWindows and its documentation. It will initially be -available on-line, and when enough is done we will look for a -publisher.

                  - -There will also be a separate small booklet which can easily be printed -out and which gives an overview of wxWindows facilities by taking -the reader through a single worked example. Guillermo Rodriguez -Garcia has volunteered to write this, and will use his Life! -demo to illustrate it.

                  - -Goals for the book:

                  - -

                    -
                  1. to allow users to become accomplished wxWindows developers rapidly; -
                  2. to be useful over a longer period than just the first few weeks, since -there are a lot of complex areas to address and not all features will be -used up-front in a project; -
                  3. to promote wxWindows to a wider audience; -
                  4. to make at least some money for the authors. -
                  - -

                  - -Audience: beginners + experienced wxWindows users, but with reasonable C++ -knowledge.

                  - -It is suggested that any financial return from the book be allocated on a points system, -with a predefined number of points for chapters, indexing, editing, proof-reading etc.

                  - -

                  -

                  -

                  - -

                  Participants

                  - -So far, the following people are interested in taking part in this project:

                  - -

                  - -

                  -Others welcome! Please contact Julian Smart -if you would like to contribute. - -

                  -

                  -

                  - -

                  Publication

                  - -We will investigate publishers, especially O'Reilly. We will have to get together -several sample chapters to convince a publisher that the many-author approach will -work.

                  - - - -

                  -

                  -

                  - - - -

                  File format

                  - -Possible formats: - -
                    -
                  • Word -
                  • Abiword: possibly not developed enough yet, but -it can output Latex which would make conversion to Tex2RTF format quite simple -
                  • Latex: favoured format so far. The LyX near-WYSIWYG word processor (Unix only) can output Latex. -See also NTTex -which uses EMACS as an editor. For an introduction to Latex, see here. -A free TeX for Windows: see MikTex. More TeX info: TUG. -
                  • XML: hard to read/write -
                  • SGML: ditto -
                  • DocBook: don't have any information about this, but Linux Admin Made Easy -uses it. -
                  • Structured text - -plain text with indentation and other elements to provide structure. The tools seem under-developed and there -doesn't seem to be a simple way of getting them without using the CVS Zope archive. -
                  • troff - favoured by O'Reilly -
                  - -

                  -

                  -

                  - -

                  Style guide

                  - -We should write a style and formatting guide.

                  - -

                  -

                  -

                  - -

                  Book Titles

                  - -It would be good to include certain buzzwords such as Linux and open source, to get -a publisher's (and the potential reader's) attention. The trick is to do that and -not narrow the scope unduly.

                  - -Suggestions for the main book:

                  - -

                    -
                  • Multiplatform GUI development with wxWindows -
                  • wxWindows: an open source multiplatform toolkit -
                  • wxWindows: GUI development for Linux and other platforms -
                  - -

                  -Other book titles that a publisher might be interested (but would be distinct projects):

                  - -

                    -
                  • Writing GTK+ Application Using wxWindows -
                  • Migrating MFC Apps to Linux Using wxWindows -
                  - -

                  -

                  -

                  - -

                  Contents

                  - -The following is open to discussion.

                  - -

                    -
                  • Chapter 01: Introduction to wxWindows: history, advocacy, future developments -
                  • Chapter 02: Installing wxWindows (and what tools to use) -
                  • Chapter 03: C++ and wxWindows. Summarises the sorts of constructs used/not used, plus wxString class, -some conventions. Vadim suggests putting it in 1st chapter but I think it deserves a chapter of its own. -
                  • Chapter 04: Getting started: Hello World. Introduces app class, frames, menus, status bar, message box -
                  • Chapter 05: Basic event handling -
                  • Chapter 06: Frames and menubars. The components of a frame, menubars. -
                  • Chapter 07: Toolbars and status bars -
                  • Chapter 08: Basic controls -
                  • Chapter 09: Common dialogs -
                  • Chapter 10: Custom dialogs and resources (XML + WXR) -
                  • Chapter 11: Drawing on device contexts -
                  • Chapter 12: Handling input (mouse, keyboard, joystick) -
                  • Chapter 14: Sizers -
                  • Chapter 15: Images and bitmaps -
                  • Chapter 16: Clipboard and drag and drop -
                  • Chapter 17: Advanced controls (list,tree,notebook,splitter,wxWizard,wxCalCtrl...) -
                  • Chapter 18: Document/view classes -
                  • Chapter 19: Scrolling -
                  • Chapter 20: MDI -
                  • Chapter 21: Printing -
                  • Chapter 22: Providing help in your applications -
                  • Chapter 23: Strings and internationalization -
                  • Chapter 24: Collection and container classes -
                  • Chapter 25: Memory management and debugging (including wxLog) -
                  • Chapter 26: Run-time class information -
                  • Chapter 27: Advanced event handling (user-defined events, ...) -
                  • Chapter 28: Communication classes, including wxSocket -
                  • Chapter 29: Database classes -
                  • Chapter 30: File and stream classes -
                  • Chapter 31: Configuration classes -
                  • Chapter 32: Time, timers and idle processing -
                  • Chapter 33: Writing multithreading applications -
                  • Chapter 34: Perfecting your UI (Adapting to system settings, accelerators, ...) -
                  • Chapter 35: Platform-specific programming (metafiles, OLE automation, taskbar, ...) -
                  • Chapter 36: Using wxHTML -
                  • Chapter 37: Using wxPython -
                  • Chapter 38: wxBase? -
                  • Appendix: Comparison with other toolkits: MFC, Qt etc. -
                  - -                   - - - - diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex index b58e7f4f97..6ded0d5926 100644 --- a/docs/latex/wx/manual.tex +++ b/docs/latex/wx/manual.tex @@ -26,13 +26,13 @@ %\special{!/@scaleunit 1 def} \parskip=10pt \parindent=0pt -\title{wxWidgets 2.4.2: A portable C++ and Python GUI toolkit} +\title{wxWidgets 2.4.3: A portable C++ and Python GUI toolkit} \winhelponly{\author{by Julian Smart et al %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$} }} \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin, Robin Dunn, et al} -\date{September 2003} +\date{May 2005} } \makeindex \begin{document} @@ -87,9 +87,8 @@ Robin Dunn, et al} \setfooter{\thepage}{}{}{}{}{\thepage}% \begin{center} -Copyright (c) 1992-2002 Julian Smart, Robert Roebling, Vadim Zeitlin and other -members of the wxWidgets team\\ -Portions (c) 1996 Artificial Intelligence Applications Institute\\ +Copyright (c) 1992-2005 Julian Smart, Robert Roebling, Vadim Zeitlin and other +members of the wxWidgets team \end{center} Please also see the wxWidgets license files (preamble.txt, lgpl.txt, gpl.txt, license.txt, diff --git a/docs/mac/install.txt b/docs/mac/install.txt index 3ce9533a50..45ef4c6895 100644 --- a/docs/mac/install.txt +++ b/docs/mac/install.txt @@ -4,7 +4,7 @@ Installing and compiling wxMac On MacOS X, you can download Apple's free developer tools (gcc and associated headers and libraries, such as the Carbon API). You can then use configure in a similar way to compiling -wxWindows on Linux, (or on Windows using MinGW or Cygwin). See +wxWidgets on Linux, (or on Windows using MinGW or Cygwin). See 'Apple Developers Tools' below for more details on using configure. diff --git a/docs/mac/readme.txt b/docs/mac/readme.txt index 8ec6507fc0..0e9833192e 100644 --- a/docs/mac/readme.txt +++ b/docs/mac/readme.txt @@ -1,20 +1,20 @@ -Welcome to wxWindows/Mac 2 +Welcome to wxWidgets/Mac 2 -More Information is available from the wxWindows project home page at +More Information is available from the wxWidgets project home page at -http://www.wxwindows.org +http://www.wxwidgets.org For more information, please see install.txt, todo.txt, and the manuals. Please send problems concerning installation, feature requests, -bug reports or comments to the wxWindows users list. Information -on how to subscribe is available from the wxWindows.org homepage. +bug reports or comments to the wxWidgets users list. Information +on how to subscribe is available from the wxWidgets.org homepage. Questions/Problems related directly to the mac port can be sent directly csomor@advancedconcepts.ch. -wxWindows/Mac doesn't come with any guarantee whatsoever. It +wxWidgets/Mac doesn't come with any guarantee whatsoever. It might crash your harddisk or destroy your monitor. It doesn't claim to be suitable for any special or general purpose. diff --git a/docs/mgl/install.txt b/docs/mgl/install.txt index af506a85f7..4d07a7e33b 100644 --- a/docs/mgl/install.txt +++ b/docs/mgl/install.txt @@ -1,4 +1,4 @@ -wxWindows 2.4 for MGL installation +wxWidgets 2.4 for MGL installation ------------------------------------ IMPORTANT NOTE: @@ -9,9 +9,9 @@ IMPORTANT NOTE: mailing wxwin-users or the author. Preferably, try to fix the problem first and then send a patch to the author. - When sending bug reports tell us what version of wxWindows you are + When sending bug reports tell us what version of wxWidgets you are using (including the beta) and what compiler on what system. One - example: wxMGL 2.4.2, gcc 2.95.3, Redhat 7.0 + example: wxMGL 2.4.3, gcc 2.95.3, Redhat 7.0 First steps ----------- @@ -32,7 +32,7 @@ First steps - Download wxMGL-x.y.z.tgz, where x.y.z is the version number. Download documentation in a preferred format, such as - wxWindows-HTML.zip or wxWindows-PDF.zip. + wxWidgets-HTML.zip or wxWidgets-PDF.zip. - Make a directory such as ~/wx and unarchive the files into this directory. @@ -40,7 +40,7 @@ First steps - It is recommended that you install bison and flex; using yacc and lex may require tweaking of the makefiles. -- You can now use configure or makefiles to build wxWindows and the samples. +- You can now use configure or makefiles to build wxWidgets and the samples. In case of problems, please use GNU make. @@ -58,7 +58,7 @@ Following systems are supported by wxMGL so far: These instructions apply to installation on a Unix system (such as Linux). Please see bellow for information on using configure on non-Unix platforms. -If you compile wxWindows on Linux for the first time and don't like to read +If you compile wxWidgets on Linux for the first time and don't like to read install instructions just do (in the base dir): > ./configure --with-mgl @@ -76,7 +76,7 @@ Afterwards you can continue with > ldconfig > exit -If you want to remove wxWindows on Unix you can do this: +If you want to remove wxWidgets on Unix you can do this: > su > make uninstall @@ -96,7 +96,7 @@ and you will get a list of supported options. 'make install' will install wx-config script that can (and should) be used to get compiler flags that are needed to build your program. wx-config --cxxflags will output necessary C++ compiler flags and wx-config --libs will list all -needed libraries. See an example of wxWindows application makefile: +needed libraries. See an example of wxWidgets application makefile: minimal: minimal.o $(CC) -o minimal minimal.o `wx-config --libs` @@ -129,7 +129,7 @@ you have Cygwin utilities and DJGPP compiler in your PATH, run bash.exe and type > ./configure --with-mgl > make -in wxWindows top directory. You can build wxMGL in MS-DOS with configure, sorry. +in wxWidgets top directory. You can build wxMGL in MS-DOS with configure, sorry. * Building wxMGL for MS-DOS using Watcom C/C++ @@ -161,6 +161,6 @@ Bug reports Please send bug reports with a description of your environment, compiler and the error message(s) to the wxwin-developers mailing list at: - wx-dev@lists.wxwindows.org + wx-dev@lists.wxwidgets.org Vaclav Slavik, Julian Smart, Robert Roebling and Vadim Zeitlin, February 2002. diff --git a/docs/mgl/readme.txt b/docs/mgl/readme.txt index 58d45c8155..8bb87072b2 100644 --- a/docs/mgl/readme.txt +++ b/docs/mgl/readme.txt @@ -1,15 +1,15 @@ - Welcome to wxWindows/MGL 2.4 + Welcome to wxWidgets/MGL 2.4 You have downloaded version 2.4 of the MGL port of -the wxWindows GUI library. This runs on top of SciTech MGL library +the wxWidgets GUI library. This runs on top of SciTech MGL library (http://www.scitechsoft.com) that is available for variety of operating systems and comes with support for embedded devices. -More information about the wxWindows project as a whole +More information about the wxWidgets project as a whole can be found at: - http://www.wxwindows.org + http://www.wxwidgets.org Information on how to install can be found in the file install.txt @@ -17,5 +17,5 @@ install.txt Regards, - The wxWindows team + The wxWidgets team diff --git a/docs/microwin/readme.txt b/docs/microwin/readme.txt index 05978742be..2bc10af53d 100644 --- a/docs/microwin/readme.txt +++ b/docs/microwin/readme.txt @@ -3,7 +3,7 @@ wxMicroWindows port Julian Smart 2001-12-08 -This is a port of wxWindows to MicroWindows, under Linux. +This is a port of wxWidgets to MicroWindows, under Linux. Widgets are supplied by the wxUniversal project, while the underlying port uses the Windows ports with small modifications for the MicroWindows API. @@ -45,7 +45,7 @@ MicroWindows: Note: these are already applied by the patch below. -- apply microwindows.patches (from wxWindows: +- apply microwindows.patches (from wxWidgets: docs/microwin/microwindows.patches) to fix PeekMessage and other issues. If the patch doesn't apply automatically, you may need to apply it by hand, and the relevant changed @@ -156,7 +156,7 @@ XPMs etc. Unfortunately the XPM routines are also #ifdefed for FILE_IO, even though for inline XPMs we don't need file I/O. (Embedded systems tend not to have file I/O, anyway.) -Now, wxWindows has its own XPM decoder, src/common/xpmdecod.cpp, +Now, wxWidgets has its own XPM decoder, src/common/xpmdecod.cpp, so in theory we don't need to use MicroWindows' code there. wxImage can load an inline XPM, _but_ we need to convert to a wxBitmap since this is what the widgets need. diff --git a/docs/motif/aix.txt b/docs/motif/aix.txt index 50acc4237e..33ee280caa 100644 --- a/docs/motif/aix.txt +++ b/docs/motif/aix.txt @@ -1,7 +1,7 @@ -Notes for wxWindows compilation on AIX +Notes for wxWidgets compilation on AIX -------------------------------------- -wxWindows 2.0 has been compiled under AIX with the C set ++ 3.1. +wxWidgets 2.0 has been compiled under AIX with the C set ++ 3.1. The environment variables CC and CXX should be set accordingly before running configure for the first time: diff --git a/docs/motif/install.txt b/docs/motif/install.txt index 38fafdc6c2..fe6350e765 100644 --- a/docs/motif/install.txt +++ b/docs/motif/install.txt @@ -1,4 +1,4 @@ -wxWindows 2.4 for Motif installation +wxWidgets 2.4 for Motif installation ------------------------------------ IMPORTANT NOTE: @@ -9,9 +9,9 @@ IMPORTANT NOTE: mailing wxwin-users or the author. Preferably, try to fix the problem first and then send a patch to the author. - When sending bug reports tell us what version of wxWindows you are + When sending bug reports tell us what version of wxWidgets you are using (including the beta) and what compiler on what system. One - example: wxMotif 2.4.2, gcc 2.95.4, Redhat 6.1 + example: wxMotif 2.4.3, gcc 2.95.4, Redhat 6.1 First steps ----------- @@ -21,7 +21,7 @@ First steps - Download wxMotif-x.y.z.tgz, where x.y.z is the version number. Download documentation in a preferred format, such as - wxWindows-HTML.zip or wxWindows-PDF.zip. + wxWidgets-HTML.zip or wxWidgets-PDF.zip. - Make a directory such as ~/wx and unarchive the files into this directory. @@ -29,14 +29,14 @@ First steps - It is recommended that you install bison and flex; using yacc and lex may require tweaking of the makefiles. You also need libXpm (see comments in the Notes section below) if you want to have - XPM support in wxWindows (recommended). + XPM support in wxWidgets (recommended). -- You can now use configure to build wxWindows and the samples. +- You can now use configure to build wxWidgets and the samples. Using configure is the recommended way to build the library. If it doesn't work for you for whatever reason, please report it (together with detailed information about your platform and the (relevant part of) contents of - config.log file) to wx-dev@lists.wxwindows.org. + config.log file) to wx-dev@lists.wxwidgets.org. COMPILING USING CONFIGURE @@ -45,7 +45,7 @@ COMPILING USING CONFIGURE * The simplest case ------------------- -If you compile wxWindows on Linux for the first time and don't like to read +If you compile wxWidgets on Linux for the first time and don't like to read install instructions just do (in the base dir): > ./configure --with-motif @@ -63,7 +63,7 @@ Afterwards you can continue with > ldconfig > exit -If you want to remove wxWindows on Unix you can do this: +If you want to remove wxWidgets on Unix you can do this: > su > make uninstall @@ -73,10 +73,10 @@ If you want to remove wxWindows on Unix you can do this: * The expert case ----------------- -If you want to do some more serious cross-platform programming with wxWindows, +If you want to do some more serious cross-platform programming with wxWidgets, such as for GTK and Motif, you can now build two complete libraries and use them concurrently. For this end, you have to create a directory for each build -of wxWindows - you may also want to create different versions of wxWindows +of wxWidgets - you may also want to create different versions of wxWidgets and test them concurrently. Most typically, this would be a version configured with --enable-debug_flag and one without. Note, that only one build can currently be installed, so you'd have to use local version of the library for @@ -125,12 +125,12 @@ g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo * General --------- -The Unix variants of wxWindows use GNU configure. If you have problems with +The Unix variants of wxWidgets use GNU configure. If you have problems with your make use GNU make instead. -If you have general problems with installation, see the wxWindows website at +If you have general problems with installation, see the wxWidgets website at - http://www.wxwindows.org/ + http://www.wxwidgets.org/ for newest information. If you still don't have any success, please send a bug report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF @@ -141,7 +141,7 @@ but I tried... * GUI libraries --------------- -wxWindows/Motif requires the Motif library to be installed on your system. As +wxWidgets/Motif requires the Motif library to be installed on your system. As an alternative, you may also use the free library "lesstif" which implements most of the Motif API without the licence restrictions of Motif. @@ -152,7 +152,7 @@ You can get the newest version of the Lesstif from the lesstif homepage at: * Additional libraries ---------------------- -wxWindows/Motif requires a thread library and X libraries known to work with +wxWidgets/Motif requires a thread library and X libraries known to work with threads. This is the case on all commercial Unix-Variants and all Linux-Versions that are based on glibc 2 except RedHat 5.0 which is broken in many aspects. As of writing this, these Linux distributions have correct glibc @@ -178,7 +178,7 @@ exit Please send comments and question about the OS/2 installation to Stefan Neis and patches to -the wxWindows mailing list. +the wxWidgets mailing list. In the following list, the version numbers indicate the configuration that was actually used by myself, newer version should cause no problems and @@ -278,7 +278,7 @@ i.e. if it says "--disable-threads" it means that threads are enabled by default. Many of the configure options have been thoroughly tested -in wxWindows snapshot 6, but not yet all (ODBC not). +in wxWidgets snapshot 6, but not yet all (ODBC not). You have to add --with-motif on platforms, where Motif is not the default (on Linux, configure will default to GTK). @@ -332,7 +332,7 @@ The following options handle the kind of library you want to build. such as gdb (or its many frontends). --enable-debug_flag Define __DEBUG__ and __WXDEBUG__ when - compiling. This enable wxWindows' very + compiling. This enable wxWidgets' very useful internal debugging tricks (such as automatically reporting illegal calls) to work. Note that program and library @@ -343,11 +343,11 @@ The following options handle the kind of library you want to build. ----------------- Many of the configure options have been thoroughly tested -in wxWindows snapshot 6, but not yet all (ODBC not). +in wxWidgets snapshot 6, but not yet all (ODBC not). When producing an executable that is linked statically with wxGTK you'll be surprised at its immense size. This can sometimes be -drastically reduced by removing features from wxWindows that +drastically reduced by removing features from wxWidgets that are not used in your program. The most relevant such features are @@ -412,7 +412,7 @@ password) and type make install -You can remove any traces of wxWindows by typing +You can remove any traces of wxWidgets by typing make uninstall @@ -449,7 +449,7 @@ This is certain to become the standard way unless we decide to stick to tmake. 2) The other way creates a project within the source code -directories of wxWindows. For this endeavour, you'll need +directories of wxWidgets. For this endeavour, you'll need GNU autoconf version 2.14 and add an entry to your Makefile.in to the bottom of the configure.in script and run autoconf and configure before you can type make. @@ -466,7 +466,7 @@ and configure before you can type make. # makewxmotif # Sets permissions (in case we extracted wxMotif from zip files) # and makes wxMotif. - # Call from top-level wxWindows directory. + # Call from top-level wxWidgets directory. # Note that this uses standard (but commonly-used) configure options; # if you're feeling brave, you may wish to compile with threads: # if they're not supported by the target platform, they will be disabled @@ -478,7 +478,7 @@ and configure before you can type make. -------:x-----Cut here-----:x----- This script will build wxMotif using shared libraries. If you want to build - a static wxWindows library, use --disable-shared. + a static wxWidgets library, use --disable-shared. Troubleshooting --------------- @@ -522,7 +522,7 @@ Bug reports Please send bug reports with a description of your environment, compiler and the error message(s) to the wxwin-developers mailing list at: - wx-dev@lists.wxwindows.org + wx-dev@lists.wxwidgets.org Julian Smart, Robert Roebling and Vadim Zeitlin, November 1999. diff --git a/docs/motif/readme.txt b/docs/motif/readme.txt index 6d84381037..7033c82f08 100644 --- a/docs/motif/readme.txt +++ b/docs/motif/readme.txt @@ -1,13 +1,13 @@ - Welcome to wxWindows/Motif 2.4.2 + Welcome to wxWidgets/Motif 2.4.3 -You have downloaded version 2.4.2 of the Motif port of -the wxWindows GUI library. +You have downloaded version 2.4.3 of the Motif port of +the wxWidgets GUI library. -More information about the wxWindows project as a whole +More information about the wxWidgets project as a whole can be found at: - http://www.wxwindows.org + http://www.wxwidgets.org Information on how to install can be found in the file install.txt, but if you cannot wait, this should work on @@ -26,26 +26,26 @@ be found in this directory. When you run into problems, please read the install.txt and follow those instructions. If you still don't have any success, please send a bug report to one of our mailing lists (see -the wxWindows homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND +the wxWidgets homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF MOTIF, WXMOTIF, WHAT DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. Alternatively, you may also use the bug reporting system -linked from the wxWindows web page. +linked from the wxWidgets web page. The library produced by the install process will be called libwx_motif.a (static) and libwx_motif-2.3.so.0.0.0 (shared) so that -once a binary incompatible version of wxWindows/Motif comes out +once a binary incompatible version of wxWidgets/Motif comes out we'll augment the library version number to avoid linking problems. Please send problems concerning installation, feature requests, -bug reports or comments to the wxWindows users list. Information -on how to subscribe is available from www.wxwindows.org. +bug reports or comments to the wxWidgets users list. Information +on how to subscribe is available from www.wxwidgets.org. -wxWindows/Motif doesn't come with any guarantee whatsoever. It might +wxWidgets/Motif doesn't come with any guarantee whatsoever. It might crash your hard disk or destroy your monitor. It doesn't claim to be suitable for any special or general purpose. Regards, - The wxWindows team + The wxWidgets team diff --git a/docs/msw/install.txt b/docs/msw/install.txt index 22ea5d36ee..91a6078696 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -1,8 +1,8 @@ -Installing wxWindows 2.4.2 +Installing wxWidgets 2.4.3 -------------------------- -This is wxWindows 2.4.2 for Microsoft Windows 9x/ME, Windows NT, +This is wxWidgets 2.4.3 for Microsoft Windows 9x/ME, Windows NT, Windows 2000 and Windows XP. This is an official release. Please note that the library naming conventions for VC++ @@ -28,14 +28,14 @@ Unarchiving A setup program is provided (setup.exe) to automatically copy files to a directory on your hard disk. Do not install into a path that contains spaces. To avoid confusion with other -wxWindows installations that might be on your machine, the +wxWidgets installations that might be on your machine, the installation program does not se the WXWIN environment variable; please set this by hand via the System applet if you wish to make it permanent. The setup program contains the following: -- All common, generic and MSW-specific wxWindows source; +- All common, generic and MSW-specific wxWidgets source; - samples; - documentation in Windows Help format; - makefiles for most Windows compilers, plus CodeWarrior, @@ -51,7 +51,7 @@ wxMSW-x.y.z.zip where x.y.z is the version number. Unarchive the required files plus any optional documentation files into a suitable directory such as c:\wx. -Other add-on packages are available from the wxWindows Web site, such as: +Other add-on packages are available from the wxWidgets Web site, such as: - mmedia.zip. Audio, CD, video access for Windows and Linux. - ogl3.zip. Object Graphics Library: build network diagrams, CASE tools etc. @@ -62,17 +62,17 @@ General installation notes -------------------------- Alter your WXWIN environment variable to point to the root directory of the -wxWindows installation. For Cygwin or MinGW compilation, make sure WXWIN +wxWidgets installation. For Cygwin or MinGW compilation, make sure WXWIN contains only forward slashes. If installing from the CVS server, copy include/wx/msw/setup0.h to include/wx/msw/setup.h and edit the resulting file to choose -the features you would like to compile wxWindows with[out]. +the features you would like to compile wxWidgets with[out]. Compilation ----------- -The following sections explain how to compile wxWindows with each supported +The following sections explain how to compile wxWidgets with each supported compiler. Visual C++ 6.0 compilation @@ -80,7 +80,7 @@ Visual C++ 6.0 compilation Please note that the VC++ 6.0 project files will work for VC++ .NET also, but you must open the .dsp files and not the .dsw files and in this case you will -need to manually build the other .dsp on which wxWindows.dsp depends: jpeg, +need to manually build the other .dsp on which wxWidgets.dsp depends: jpeg, png, regex, tiff and zlib. Also note that you can make the project files work with VC++ 5.0 but you'll @@ -89,13 +89,13 @@ the .dsp file header from 6.0 to 5.0). Using project files (VC++ 6.0 and later): -1. Unarchive wxWindows-x.y.z-vc.zip, the VC++ 6 project +1. Unarchive wxWidgets-x.y.z-vc.zip, the VC++ 6 project makefiles (already included in wxMSW-x.y.z.zip and the setup version). -2. Open src/wxWindows.dsp, which has configurations for static +2. Open src/wxWidgets.dsp, which has configurations for static compilation or DLL compilation, and each of these available in Unicode/ANSI and Debug/Release variations. Normally you'll use a static linking ANSI configuration. Choose the Win32 Debug or - Win32 Release configuration for the wxWindows project, and compile. + Win32 Release configuration for the wxWidgets project, and compile. Alternatively, use Batch Build to build more than one configuration. The following libraries will be produced depending on chosen @@ -128,13 +128,13 @@ Using makefiles: 'nmake -f makefile.vc' - to make the wxWindows core library with debug information + to make the wxWidgets core library with debug information (wx\lib\wxd.lib), then 'nmake -f makefile.vc cleanall FINAL=1' 'nmake -f makefile.vc FINAL=1' - to make the wxWindows core library without debug information. + to make the wxWidgets core library without debug information. 4. Change directory to wx\samples and type 'nmake -f makefile.vc' to make all the samples. You can also make them individually. @@ -150,7 +150,7 @@ Makefile notes: object files used to build the previous configuration may be used accidentally for the current configuration. You might see this manifested in unexpected link errors or warnings. This problem - doesn't occur when using project files to build wxWindows. + doesn't occur when using project files to build wxWidgets. To build Unicode versions of the libraries, add UNICODE=1 to the nmake invocation (default is UNICODE=0). If you want to @@ -164,7 +164,7 @@ Makefile notes: require 300+ MB Platform SDK update. Add MSLU=1 to the nmake invocation to enable MSLU. - Note that the wxWindows core library allows you to have debug + Note that the wxWidgets core library allows you to have debug and release libraries available simultaneously, by compiling the objects in different subdirectories, whereas samples must be cleaned and re-made to build a different configuration. @@ -185,7 +185,7 @@ Without this, the redefinition of 'new' will cause problems in the headers. Alternatively, #undef new before including template headers. You will also need to set wxUSE_IOSTREAMH to 0 if you will be using templates, to avoid the non-template stream files being included -within wxWindows. +within wxWidgets. Note (2): libraries and applications generated with makefiles and project files are now (hopefully) compatible where static libraries @@ -198,7 +198,7 @@ deleting an object Dialog Editor, in Release mode with optimizations on. If in doubt, switch off optimisations, although this will result in much larger executables. It seems possible that the library can be created with strong optimization, so long as the application is not strongly -optimized. For example, in wxWindows project, set to 'Minimum +optimized. For example, in wxWidgets project, set to 'Minimum Size'. In Dialog Editor project, set to 'Customize: Favor Small Code' (and no others). This will then work. @@ -210,10 +210,10 @@ symbols, struct packing, etc. are exactly the same for all items in the project. After this, delete everything (including PCH) and recompile. Note (5): to create your own IDE files, see the technical note on the -wxWindows web site or CD-ROM, entitled "Compiling wxWindows +wxWidgets web site or CD-ROM, entitled "Compiling wxWidgets applications in the VC++ IDE" (technical note docs/tech/tn0010.htm in the -wxWindows distribution). You can also copy .dsp and .dsw -files from an existing wxWindows sample and adapt them. +wxWidgets distribution). You can also copy .dsp and .dsw +files from an existing wxWidgets sample and adapt them. Visual C++ 1.5 compilation (16-bit) ----------------------------------- @@ -224,7 +224,7 @@ work. 1. Make sure your WXWIN variable is set, and uses the FAT (short name) form. 2. Change directory to wx\src\msw. Type 'nmake -f makefile.dos' to - make the wxWindows core library. + make the wxWidgets core library. 3. Change directory to a sample, such as wx\samples\minimal, and type 'nmake -f makefile.dos'. @@ -245,12 +245,12 @@ Compiling using the makefiles (updated 24 Sept 02): You may like to use the short form as shown by a DOS directory listing. Reboot if needed for the changes to autoexec.bat to take effect. 2. Change directory to src\msw. Type 'make -f makefile.b32' to - make the wxWindows core library. Ignore the compiler warnings. + make the wxWidgets core library. Ignore the compiler warnings. This produces a library in the wxwindows\lib directory called wx32ds_bcc.lib 3. Change directory to a sample or demo such as samples\minimal, and type 'make -f makefile.b32'. This produces a windows exe file -4. For release versions, recompile wxWindows and samples using +4. For release versions, recompile wxWidgets and samples using 'make -f makefile.b32 clean' 'make -f makefile.b32 FINAL=1' for the library and samples. This produces a library wx32s_bcc.lib eliminating @@ -258,7 +258,7 @@ Compiling using the makefiles (updated 24 Sept 02): 'make -f makefile.b32 clean' 'make -f makefile.b32 FINAL=hybrid' -5. To make and use wxWindows as a DLL, type +5. To make and use wxWidgets as a DLL, type 'make -f makefile.b32 clean' 'make -f makefile.b32 DLL=1' which generates a DLL (wx32d.dll) and import library (wx32d.lib), @@ -286,7 +286,7 @@ Compiling using the makefiles (updated 24 Sept 02): and do final releases by combinations of commandline parameters. At the time of writing, (Oct 02) not all the wxDialogs are working -7. To make console mode applications with wxWindows functions go +7. To make console mode applications with wxWidgets functions go to the src\msw directory 'make -f makebase.b32 clean' 'make -f makebase.b32' @@ -305,15 +305,15 @@ in the autoexec.bat file; like this: name) form with no spaces. -Note (2): the wxWindows library and (some) samples compile in 16-bit mode -using makefile.bcc, but at present the wxWindows resource system is switched +Note (2): the wxWidgets library and (some) samples compile in 16-bit mode +using makefile.bcc, but at present the wxWidgets resource system is switched off in this mode. See issues.txt for details. Note (3): unfortunately most samples won't link in 16-bit mode, because the automatic data segment exceeds 64K. The minimal sample links and runs, however. -Note (4): the wxWindows makefiles assume byte structure alignment. Please +Note (4): the wxWidgets makefiles assume byte structure alignment. Please make sure that your own project or makefile settings use the same alignment, or you could experience mysterious crashes. To change the alignment, add a suitable option to the $(CFG) target code @@ -322,7 +322,7 @@ in src/msw/makefile.b32. Note (5): if you get undefined _SQL... symbols at link time, either install odbc32.lib from the BC++ CD-ROM into your BC++ lib directory, or set wxUSE_ODBC to 0 in include\wx\msw\setup.h and -recompile wxWindows. The same applies if compiling using the IDE. +recompile wxWidgets. The same applies if compiling using the IDE. Note (6): BC++ 4.5 (not 5.0) trips up over jdmerge.c in the JPEG folder; you will therefore need to set wxUSE_LIBJPEG to 0 in setup.h and remove @@ -339,7 +339,7 @@ Compiling using the IDE files: [Borland C++ 5.0, not Cbuilder] 1. Load src\bc32.ide (Release settings) 2. Go to Options|Project... and specify the correct BC++ include and lib path for your file structure. -3. Press F9 to compile the wxWindows library. +3. Press F9 to compile the wxWidgets library. 4. Load samples\bc32.ide. 5. Go to Options|Project... and specify the correct BC++ include and lib path for your file structure. @@ -357,7 +357,7 @@ have any BC++ project files yet. Note (2): to make the png, zlib, jpeg and tiff libraries (needed for some samples) you need to compile them with bc32.ide. -Note (3): the debug version of the wxWindows library is about 40 MB, and the +Note (3): the debug version of the wxWidgets library is about 40 MB, and the release version is around 5 MB. See also the file docs/tech/tn0007.txt for further instructions and details @@ -365,7 +365,7 @@ of how to create your own project files. ** REMEMBER ** -In all of your wxWindows applications, your source code should include +In all of your wxWidgets applications, your source code should include the following preprocessor directive: #ifdef __BORLANDC__ @@ -378,7 +378,7 @@ more details) Borland C++Builder IDE compilation ------------------------------ -1. Build the wxWindows libraries using the Borland make utility as +1. Build the wxWidgets libraries using the Borland make utility as specified in the section called "Borland C++ 4.5/5.0 compilation" above. (C++ Builder includes a stand-alone C++ compiler. For example, C++ Builder 4.0 comes with C++ 5.4.) @@ -397,7 +397,7 @@ Watcom C++ 10.6/11 and OpenWatcom compilation 1. Make sure your WXWIN variable is set, and uses the DOS short name form. 2. Change directory to wx\src\msw. Type 'wmake -f makefile.wat' to - make the wxWindows core library. + make the wxWidgets core library. 3. Change directory to wx\samples\minimal and type 'wmake -f makefile.wat' to make this sample. The exe will be placed in a watcom subdirectory. Repeat for other samples of interest. @@ -410,7 +410,7 @@ There are several makefile variables which may be modified: optimizations enabled - WATCOM_SUFFIX is appended to the names of all libraries produced by the - makefile -- this allows to use several compilers in the same wxWindows + makefile -- this allows to use several compilers in the same wxWidgets source tree. If you only use Watcom compiler, set WATCOM_SUFFIX to nothing. - OUTPUTDIR may be set to the name of the directory where you want all the @@ -439,7 +439,7 @@ Metrowerks CodeWarrior compilation ---------------------------------- 1. CodeWarrior Pro7 project files in XML format are already - included in wxMSW-2.4.2.zip and the setup version. + included in wxMSW-2.4.3.zip and the setup version. 2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are working from the CVS version) to make sure the settings reflect what you want. If you aren't sure, leave it alone and go with the @@ -448,7 +448,7 @@ Metrowerks CodeWarrior compilation - wxUSE_GLOBAL_MEMORY_OPERATORS works, but memory leak reports will be rather confusing due to interactions with the MSL ANSI and runtime libs. -3. The project file to build the Win32 wxWindows libraries relies on the +3. The project file to build the Win32 wxWidgets libraries relies on the Batch File Runner plug-in. This plug-in is not installed as part of a normal CW7 installation. However, you can find this plug-in on the CodeWarrior Reference CD, in the Thrill Seekers folder; it's call the @@ -461,7 +461,7 @@ Metrowerks CodeWarrior compilation (2) Create the directories lib\cw7mswd\include\wx and copy the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are working from the CVS version) to lib\cw7mswd\include\wx\setup.h -5. Import src\wxWindowsW7.xml to create the project file wxWindowsW7.mcp. +5. Import src\wxWidgetsW7.xml to create the project file wxWidgetsW7.mcp. Store this project file in directory src. You may get warnings about not being able to find certain project paths; ignore these warnings, the appropriate paths will be created during the build by the Batch File Runner. @@ -493,7 +493,7 @@ Metrowerks CodeWarrior compilation Cygwin/MinGW compilation ---------------------------------- -wxWindows 2 supports Cygwin (formerly GnuWin32) betas and +wxWidgets 2 supports Cygwin (formerly GnuWin32) betas and releases, and MinGW. Cygwin can be downloaded from: http://sources.redhat.com/cygwin/ @@ -509,23 +509,23 @@ NOTE: some notes specific to old Cygwin (< 1.1.x) and MinGW (< 1.0) are at the end of this section (see OLD VERSIONS) -There are two methods of compiling wxWindows, by using the +There are two methods of compiling wxWidgets, by using the makefiles provided or by using 'configure'. Retrieve and install the latest version of Cygwin, or MinGW, as per the instructions with either of these packages. If using MinGW, you can download the add-on MSYS package to -provide Unix-like tools that you'll need to build wxWindows. +provide Unix-like tools that you'll need to build wxWidgets. If you do not want to use MSYS, then you need to download extra utilities from -ports/mingw32 on the wxWindows ftp site or CD-ROM: +ports/mingw32 on the wxWidgets ftp site or CD-ROM: ftp://biolpc22.york.ac.uk/pub/ports/mingw32/extra.zip These should be extracted to a directory in your path. If you have already downloaded rm, cp, mv from elsewhere, or are using MSYS, you won't need all of these files. However if using MSYS -and configure to build wxWindows, you will need to unzip the +and configure to build wxWidgets, you will need to unzip the following files from extra.zip and place them in e.g. an extrabin directory which you then add to your path: @@ -551,7 +551,7 @@ NOTE: The makefile are for compilation under Cygwin, MSYS, or Here are the steps required using the provided makefiles: -- Set your WXWIN variable to where wxWindows is installed. +- Set your WXWIN variable to where wxWidgets is installed. *** IMPORTANT: For Cygwin/MinGW, use forward slashes in the path, not backslashes. @@ -560,8 +560,8 @@ Here are the steps required using the provided makefiles: Cygwin); also set the MINGW32VERSION variable appropriately for your GCC version. -- Use the makefile.g95 files for compiling wxWindows and samples, - e.g. to compile a debugging version of wxWindows: +- Use the makefile.g95 files for compiling wxWidgets and samples, + e.g. to compile a debugging version of wxWidgets: > cd c:\wx\src\msw > make -f makefile.g95 clean > make -f makefile.g95 @@ -616,7 +616,7 @@ Instead of using the makefiles, you can use the configure system to generate appropriate makefiles, as used on Unix and Mac OS X systems. -Change directory to the root of the wxWindows distribution, +Change directory to the root of the wxWidgets distribution, make a build directory, and run configure and make in this directory. For example: @@ -634,7 +634,7 @@ For example: Notes: 1. See also the Cygwin/MinGW on the web site or CD-ROM for - further information about using wxWindows with these compilers. + further information about using wxWidgets with these compilers. 2. libwx.a is 100 MB or more - but much less if compiled with no debug info (-g0) and level 4 optimization (-O4). @@ -684,7 +684,7 @@ Notes: as follows: /usr/local/lib - wxmswXYZd.dll.a and wxmswXYZd.dll - /usr/local/include/wx - wxWindows header files + /usr/local/include/wx - wxWidgets header files /usr/local/bin - wx-config You may need to do this if using wx-config with the @@ -692,9 +692,9 @@ Notes: OLD VERSIONS: -- If using MinGW 2.95 and below with wxWindows 2.1 or above, you +- If using MinGW 2.95 and below with wxWidgets 2.1 or above, you must hand-patch with Mingw32-gcc295.patches (located in the - top-level of the wxWindows 2 installation). MinGW 2.95.2 + top-level of the wxWidgets 2 installation). MinGW 2.95.2 and above contain the fixes already. - Modify the file wx/src/cygnus.bat (or mingw32.bat or mingegcs.bat) @@ -703,7 +703,7 @@ OLD VERSIONS: - For Cygwin, make sure there's a \tmp directory on your Windows drive or bison will crash (actually you don't need - bison for ordinary wxWindows compilation: a pre-generated .c file is + bison for ordinary wxWidgets compilation: a pre-generated .c file is supplied). - If using GnuWin32 b18, you will need to copy windres.exe @@ -716,7 +716,7 @@ Symantec C++ compilation name) form. 2. Edit setup.h and set wxUSE_DRAG_AND_DROP to 0. 3. Change directory to wx\src\msw. Type 'make -f makefile.sc' to - make the wxWindows core library. + make the wxWidgets core library. 4. Change directory to wx\samples\minimal and type 'make -f makefile.sc' to make this sample. @@ -733,10 +733,10 @@ General Notes - Debugging: under Windows 95, debugging output isn't output in the same way that it is under NT or Windows 3.1. Please see DebugView (bin/dbgview.exe in the distribution), also - available from http://www.sysinternals.com and on the wxWindows CD-ROM + available from http://www.sysinternals.com and on the wxWidgets CD-ROM under Packages. -- If you are installing wxWindows 2 from CVS, you may find that +- If you are installing wxWidgets 2 from CVS, you may find that include/wx/msw/setup.h is missing. This is deliberate, to avoid developers' different setup.h configurations getting confused. Please copy setup0.h to setup.h before compiling. Also, read diff --git a/docs/msw/issues.txt b/docs/msw/issues.txt index 2f245e467b..be643eac48 100644 --- a/docs/msw/issues.txt +++ b/docs/msw/issues.txt @@ -18,7 +18,7 @@ resourc2.cpp). Unfortunately we still get the error: The solution is probably to load wxResourceBitListTable dynamically using LoadString to load the names, and initialize the table -at wxWindows start-up. +at wxWidgets start-up. Meanwhile the work-around is to switch wxUSE_WX_RESOURCES to 0 (done in setup.h if BC++/16-bit mode is detected). diff --git a/docs/msw/readme.txt b/docs/msw/readme.txt index c6e11e4380..75c619c10b 100644 --- a/docs/msw/readme.txt +++ b/docs/msw/readme.txt @@ -1,8 +1,8 @@ -This is wxWindows for Windows (wxMSW) +This is wxWidgets for Windows (wxMSW) ------------------------------------- -For information on installing wxWindows, please see install.txt. +For information on installing wxWidgets, please see install.txt. For further information, please see docs/html/index.htm and the -wxWindows reference manual. +wxWidgets reference manual. diff --git a/docs/msw/winxp.txt b/docs/msw/winxp.txt index b584381ab5..2355b950ee 100644 --- a/docs/msw/winxp.txt +++ b/docs/msw/winxp.txt @@ -1,13 +1,13 @@ -Microsoft Windows XP Support from wxWindows 2.3.2 +Microsoft Windows XP Support from wxWidgets 2.3.2 ------------------------------------------------- Windows XP introduces the themes (called "visual styles" in the Microsoft -documentation) in Windows world. As wxWindows uses the standard Windows +documentation) in Windows world. As wxWidgets uses the standard Windows controls for most of its classes, it can take advantage of it without (almost) any effort from your part. The only thing you need to do if you want your program to honour the visual style setting of Windows XP is to add the manifest file to your program (this is not at all specific to -wxWindows programs but is required for all Windows applications). +wxWidgets programs but is required for all Windows applications). For your convenience, below is an example manifest. It should be put in a @@ -32,7 +32,7 @@ file to test theme support using the controls sample: name="Controls" type="win32" /> -Controls: wxWindows sample application +Controls: wxWidgets sample application Look out for reviews of wxWindows in the July editions of +==> Look out for reviews of wxWidgets in the July editions of Linux Journal and the UK's PC Plus magazine. Have fun! -The wxWindows team +The wxWidgets team ===== A small selection of the comments from the Feedback page: -"wxWindows 2.xx has been an absolute dream; putting together a +"wxWidgets 2.xx has been an absolute dream; putting together a nice interface has been quite easy, and I'm especially pleased that I can do most of our development on *nix with confidence that only minor issues will have to get cleaned up when we build on Windows." -"I use wxWindows as a GUI Toolkit for Python. Its stability, +"I use wxWidgets as a GUI Toolkit for Python. Its stability, flexibility and speed are the base of industrial strength cross-platform GUI application design with interpreted languages like Python. Porting is child's play. Thanks for this great @@ -96,5 +96,5 @@ piece of software!" learn and easy to port Java, X11 and Win32 code to." "Thanks heaps for the best piece of software I've ever come -across (wxWindows)." +across (wxWidgets)." diff --git a/docs/publicity/publicity-record.txt b/docs/publicity/publicity-record.txt index 3fe6055b91..90b86be1bc 100644 --- a/docs/publicity/publicity-record.txt +++ b/docs/publicity/publicity-record.txt @@ -8,7 +8,7 @@ PUBLICITY RECORD The 2.4.0 release has been publicised at the following places: -wx-users@lists.wxwindows.org +wx-users@lists.wxwidgets.org comp.os.ms-windows.programmer.misc comp.os.ms-windows.programmer.tools.mfc diff --git a/docs/readme.txt b/docs/readme.txt index ebc8469cc7..5c34a52789 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,4 +1,4 @@ -wxWidgets 2.4.2 +wxWidgets 2.4.3 --------------- Welcome to wxWidgets, a sophisticated cross-platform C++ @@ -200,5 +200,5 @@ web site. Have fun! -The wxWidgets Team, September 2003 +The wxWidgets Team, May 2005 diff --git a/docs/univ/readme.txt b/docs/univ/readme.txt index d3532b16cc..67b2bc12c0 100644 --- a/docs/univ/readme.txt +++ b/docs/univ/readme.txt @@ -10,10 +10,10 @@ Tom Ryan! 0. Introduction --------------- -wxUniversal is a port of wxWindows which implements the various GUI controls -by drawing them itself (using low level wxWindows classes). Please see +wxUniversal is a port of wxWidgets which implements the various GUI controls +by drawing them itself (using low level wxWidgets classes). Please see - http://www.wxwindows.org/wxuniv.htm + http://www.wxwidgets.org/wxuniv.htm for more details about it. @@ -23,17 +23,17 @@ native controls) and the theme support: the same program may be changed to look completely differently without changing a single line of its code but just changing the theme. -Another advantage is that it makes writing ports of wxWindows for other +Another advantage is that it makes writing ports of wxWidgets for other platforms (such as OS/2, BeOS or QNX) much simpler, so it is of special -interest to people interested in porting wxWindows to another platform. +interest to people interested in porting wxWidgets to another platform. However, wxUniversal doesn't have a 100% native look and feel unlike the -other wxWindows ports - this is the price to pay for the extra flexibility. +other wxWidgets ports - this is the price to pay for the extra flexibility. 1. Requirements and supported platforms --------------------------------------- -wxUniversal is used together with another wxWindows port which provides the +wxUniversal is used together with another wxWidgets port which provides the "low level classes" mentioned above. Currently it can be built with wxMSW, wxGTK or wxX11. In any case, you should download the sources for the appropriate toolkit in addition to wxUniversal - in fact, you should download @@ -104,22 +104,22 @@ at once by setting the environment variable WXTHEME to the theme name. 5. Documentation and support ---------------------------- - Please note that wxUniversal is not as mature as the other wxWindows ports + Please note that wxUniversal is not as mature as the other wxWidgets ports and is currently officially in alpha stage. In particular, it is not really intended for the end users but rather for developers at the current stage and this is why we don't provide any binaries for it. - There is no separate documentation for wxUniversal, please refer to wxWindows + There is no separate documentation for wxUniversal, please refer to wxWidgets documentation instead. - Support for wxUniversal is available from the same places as for wxWindows + Support for wxUniversal is available from the same places as for wxWidgets itself, namely: * Usenet newsgroup comp.soft-sys.wxwindows -* Mailing lists: see http://lists.wxwindows.org/ for more information +* Mailing lists: see http://lists.wxwidgets.org/ for more information -* WWW page: http://www.wxwindows.org/ +* WWW page: http://www.wxwidgets.org/ Hope you find wxUniversal useful! diff --git a/docs/wine/install.txt b/docs/wine/install.txt index 29fc50154b..00b253d9dc 100644 --- a/docs/wine/install.txt +++ b/docs/wine/install.txt @@ -1,5 +1,5 @@ - !!! When sending bug reports tell us what version of wxWindows you are + !!! When sending bug reports tell us what version of wxWidgets you are using (including the beta) and what compiler on what system. One example: wxWINE 2.1 snapshot 6, egcs 1.1.1, Redhat 5.0 !!! @@ -31,7 +31,7 @@ change disables the Windows native calling convention. * The most simple case ----------------------- -If you compile wxWindows on Linux for the first time and don't like to read +If you compile wxWidgets on Linux for the first time and don't like to read install instructions just do (in the base dir): > ./configure --with-wine @@ -66,7 +66,7 @@ Afterwards you can continue with > ldconfig > exit -If you want to remove wxWindows on Unix you can do this: +If you want to remove wxWidgets on Unix you can do this: > su > make uninstall @@ -76,10 +76,10 @@ If you want to remove wxWindows on Unix you can do this: * The expert case ----------------- -If you want to do some more serious cross-platform programming with wxWindows, +If you want to do some more serious cross-platform programming with wxWidgets, such as for GTK and Motif, you can now build two complete libraries and use them concurrently. For this end, you have to create a directory for each build -of wxWindows - you may also want to create different versions of wxWindows +of wxWidgets - you may also want to create different versions of wxWidgets and test them concurrently. Most typically, this would be a version configured with --enable-debug_flag and one without. Note, that only one build can currently be installed, so you'd have to use local version of the library for that purpose. @@ -131,7 +131,7 @@ g++ myfoo.cpp `wx-config --libs --cflags` -o myfoo * General ----------------------- -The Unix variants of wxWindows use GNU configure. If you have problems with your +The Unix variants of wxWidgets use GNU configure. If you have problems with your make use GNU make instead. If you have general problems with installation, read my homepage at @@ -146,7 +146,7 @@ YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried... * GUI libraries ----------------------- -wxWindows/WINE requires the WINE library to be installed on your system. +wxWidgets/WINE requires the WINE library to be installed on your system. You can get the newest version of the WINE from the WINE homepage at: @@ -191,7 +191,7 @@ i.e. if it says "--disable-threads" it means that threads are enabled by default. Many of the configure options have been thoroughly tested -in wxWindows snapshot 6, but not yet all (ODBC not). +in wxWidgets snapshot 6, but not yet all (ODBC not). You must do this by running configure with either of: @@ -235,7 +235,7 @@ The following options handle the kind of library you want to build. such as gdb (or its many frontends). --enable-debug_flag Define __DEBUG__ and __WXDEBUG__ when - compiling. This enable wxWindows' very + compiling. This enable wxWidgets' very useful internal debugging tricks (such as automatically reporting illegal calls) to work. Note that program and library @@ -246,11 +246,11 @@ The following options handle the kind of library you want to build. ------------------- Many of the configure options have been thoroughly tested -in wxWindows snapshot 6, but not yet all (ODBC not). +in wxWidgets snapshot 6, but not yet all (ODBC not). When producing an executable that is linked statically with wxGTK you'll be surprised at its immense size. This can sometimes be -drastically reduced by removing features from wxWindows that +drastically reduced by removing features from wxWidgets that are not used in your program. The most relevant such features are @@ -315,7 +315,7 @@ password) and type make install -You can remove any traces of wxWindows by typing +You can remove any traces of wxWidgets by typing make uninstall @@ -352,7 +352,7 @@ This is certain to become the standard way unless we decide to stick to tmake. 2) The other way creates a project within the source code -directories of wxWindows. For this endeavour, you'll need +directories of wxWidgets. For this endeavour, you'll need the usual number of GNU tools, at least GNU automake version 1.4 diff --git a/docs/wine/readme.txt b/docs/wine/readme.txt index f81cb30180..efd204e170 100644 --- a/docs/wine/readme.txt +++ b/docs/wine/readme.txt @@ -1,8 +1,8 @@ - Welcome to wxWindows/Wine 2.1 snapshot 7, + Welcome to wxWidgets/Wine 2.1 snapshot 7, you have downloaded version 2.1 of the WINE port of -the wxWindows GUI library. This is a developers release +the wxWidgets GUI library. This is a developers release and is it not suited for production development. Beware that major changes can happen before a final release. @@ -10,7 +10,7 @@ More information is available from my homepage at: http://wesley.informatik.uni-freiburg.de/~wxxt -and about the wxWindows project as a whole (and the +and about the wxWidgets project as a whole (and the Windows and Motif ports in particular) can be found at Julian Smart's homepage at: @@ -29,14 +29,14 @@ this has no effect, but I tried... The library produced by the install process will be called libwx_mse.a (static) and libwx_msw-2.1.so.0.0.0 (shared) so that -once a binary incompatible version of wxWindows/Gtk comes out +once a binary incompatible version of wxWidgets/Gtk comes out we'll augment the library version number to avoid linking problems. Please send problems concerning installation, feature requests, -bug reports or comments to the wxWindows users list. Information +bug reports or comments to the wxWidgets users list. Information on how to subscribe is available from my homepage. -wxWindows/Wine doesn't come with any guarantee whatsoever. It might +wxWidgets/Wine doesn't come with any guarantee whatsoever. It might crash your harddisk or destroy your monitor. It doesn't claim to be suitable for any special or general purpose. diff --git a/docs/x11/install.txt b/docs/x11/install.txt index f18fa70663..b7c28808c7 100644 --- a/docs/x11/install.txt +++ b/docs/x11/install.txt @@ -1,4 +1,4 @@ -wxWindows 2.4 for X11 installation +wxWidgets 2.4 for X11 installation ---------------------------------- IMPORTANT NOTE: @@ -9,30 +9,30 @@ IMPORTANT NOTE: mailing wxwin-users or the author. Preferably, try to fix the problem first and then send a patch to the author. - When sending bug reports tell us what version of wxWindows you are + When sending bug reports tell us what version of wxWidgets you are using (including the beta) and what compiler on what system. One - example: wxX11 2.4.2, gcc 2.95.4, Redhat 6.2 + example: wxX11 2.4.3, gcc 2.95.4, Redhat 6.2 First steps ----------- - Download wxX11-x.y.z.tgz, where x.y.z is the version number. Download documentation in a preferred format, such as - wxWindows-HTML.zip or wxWindows-PDF.zip. + wxWidgets-HTML.zip or wxWidgets-PDF.zip. - Make a directory such as ~/wx and unarchive the files into this directory. - It is recommended that you install bison and flex; using yacc and lex may require tweaking of the makefiles. You also need - libXpm if you want to have XPM support in wxWindows (recommended). + libXpm if you want to have XPM support in wxWidgets (recommended). -- You can now use configure to build wxWindows and the samples. +- You can now use configure to build wxWidgets and the samples. Using configure is the recommended way to build the library. If it doesn't work for you for whatever reason, please report it (together with detailed information about your platform and the (relevant part of) contents of - config.log file) to wx-dev@lists.wxwindows.org. + config.log file) to wx-dev@lists.wxwidgets.org. COMPILING USING CONFIGURE ========================= @@ -40,7 +40,7 @@ COMPILING USING CONFIGURE * The simplest case ------------------- -If you compile wxWindows on Linux for the first time and don't like to read +If you compile wxWidgets on Linux for the first time and don't like to read install instructions just do (in the base dir): > ./configure --with-x11 @@ -58,7 +58,7 @@ Afterwards you can continue with > ldconfig > exit -If you want to remove wxWindows on Unix you can do this: +If you want to remove wxWidgets on Unix you can do this: > su > make uninstall @@ -68,10 +68,10 @@ If you want to remove wxWindows on Unix you can do this: * The expert case ----------------- -If you want to do some more serious cross-platform programming with wxWindows, +If you want to do some more serious cross-platform programming with wxWidgets, such as for GTK and X11, you can now build two complete libraries and use them concurrently. For this end, you have to create a directory for each build -of wxWindows - you may also want to create different versions of wxWindows +of wxWidgets - you may also want to create different versions of wxWidgets and test them concurrently. Most typically, this would be a version configured with --enable-debug_flag and one without. Note, that only one build can currently be installed, so you'd have to use local version of the library for @@ -122,12 +122,12 @@ g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo * General --------- -The Unix variants of wxWindows use GNU configure. If you have problems with +The Unix variants of wxWidgets use GNU configure. If you have problems with your make use GNU make instead. -If you have general problems with installation, see the wxWindows website at +If you have general problems with installation, see the wxWidgets website at - http://www.wxwindows.org/ + http://www.wxwidgets.org/ for newest information. If you still don't have any success, please send a bug report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF @@ -137,13 +137,13 @@ YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried... * GUI libraries --------------- -wxWindows/X11 only requires the X11 system to be installed. TinyX +wxWidgets/X11 only requires the X11 system to be installed. TinyX will also suffice. * Additional libraries ---------------------- -wxWindows/X11 requires a thread library and X libraries known to work with +wxWidgets/X11 requires a thread library and X libraries known to work with threads. This is the case on all commercial Unix-Variants and all Linux-Versions that are based on glibc 2 except RedHat 5.0 which is broken in many aspects. As of writing this, these Linux distributions have correct glibc @@ -169,7 +169,7 @@ exit Please send comments and question about the OS/2 installation to Stefan Neis and patches to -the wxWindows mailing list. +the wxWidgets mailing list. In the following list, the version numbers indicate the configuration that was actually used by myself, newer version should cause no problems and @@ -318,7 +318,7 @@ The following options handle the kind of library you want to build. such as gdb (or its many frontends). --enable-debug_flag Define __DEBUG__ and __WXDEBUG__ when - compiling. This enable wxWindows' very + compiling. This enable wxWidgets' very useful internal debugging tricks (such as automatically reporting illegal calls) to work. Note that program and library @@ -329,11 +329,11 @@ The following options handle the kind of library you want to build. ----------------- Many of the configure options have been thoroughly tested -in wxWindows snapshot 6, but not yet all (ODBC not). +in wxWidgets snapshot 6, but not yet all (ODBC not). When producing an executable that is linked statically with wxX11 you'll be surprised at its immense size. This can sometimes be -drastically reduced by removing features from wxWindows that +drastically reduced by removing features from wxWidgets that are not used in your program. The most relevant such features are @@ -398,7 +398,7 @@ password) and type make install -You can remove any traces of wxWindows by typing +You can remove any traces of wxWidgets by typing make uninstall @@ -435,7 +435,7 @@ This is certain to become the standard way unless we decide to stick to tmake. 2) The other way creates a project within the source code -directories of wxWindows. For this endeavour, you'll need +directories of wxWidgets. For this endeavour, you'll need GNU autoconf version 2.14 and add an entry to your Makefile.in to the bottom of the configure.in script and run autoconf and configure before you can type make. @@ -452,7 +452,7 @@ and configure before you can type make. # makewxx11 # Sets permissions (in case we extracted wxX11 from zip files) # and makes wxX11. - # Call from top-level wxWindows directory. + # Call from top-level wxWidgets directory. # Note that this uses standard (but commonly-used) configure options; # if you're feeling brave, you may wish to compile with threads: # if they're not supported by the target platform, they will be disabled @@ -464,7 +464,7 @@ and configure before you can type make. -------:x-----Cut here-----:x----- This script will build wxX11 using shared libraries. If you want to build - a static wxWindows library, use --disable-shared. + a static wxWidgets library, use --disable-shared. Troubleshooting --------------- @@ -502,7 +502,7 @@ Bug reports Please send bug reports with a description of your environment, compiler and the error message(s) to the wxwin-developers mailing list at: - wx-dev@lists.wxwindows.org + wx-dev@lists.wxwidgets.org Julian Smart, Robert Roebling and Vadim Zeitlin, Decemver 2002. diff --git a/docs/x11/readme-nanox.txt b/docs/x11/readme-nanox.txt index 3698cf4ac0..5a6192b2f7 100644 --- a/docs/x11/readme-nanox.txt +++ b/docs/x11/readme-nanox.txt @@ -14,12 +14,12 @@ The Microwindows web site is at http://microwindows.org/ Nano-X is intended to work on devices with very small amounts -of memory. wxWindows is quite a large library, so if your +of memory. wxWidgets is quite a large library, so if your memory is measured in KB instead of MB you will need to use an alternative library, such as FLTK. However, with memory -capacity increasing all the time, wxWindows could become +capacity increasing all the time, wxWidgets could become an appropriate embedded GUI solution for many projects. -Also, it's possible to think of ways to cut wxWindows +Also, it's possible to think of ways to cut wxWidgets further down to size, such as disabling advanced controls or rewriting utility functions. See the section on code size below. @@ -43,7 +43,7 @@ both at configuration time and at subsequent make time, so you may find it convenient to put it in your .bash_profile or similar file. -Typically, various features in wxWindows will be switched off to +Typically, various features in wxWidgets will be switched off to conserve space. The sample script below calls configure with typical options for Nano-X. @@ -64,7 +64,7 @@ Port notes ========== Nano-X has a different API from Xlib, although there -are many similarities. Instead of changing the wxWindows +are many similarities. Instead of changing the wxWidgets code to reflect Nano-X conventions, a compatibility layer has been added, in the form of these files: @@ -105,14 +105,14 @@ Things to do: Code Size ========= -Allow about 2.5 MB for a shared wxWindows library, with the +Allow about 2.5 MB for a shared wxWidgets library, with the dynamically linked minimal sample taking about 24KB. If statically linked, minimal takes up just over 1MB when stripped. This 1MB -includes all of wxWindows used in the minimal sample including some of +includes all of wxWidgets used in the minimal sample including some of the wxUniversal widgets. As application complexity increases, -the amount of wxWindows code pulled into statically linked +the amount of wxWidgets code pulled into statically linked executables increases, but for large applications, the overhead -of wxWindows becomes less significant. +of wxWidgets becomes less significant. Sample sizes: ------------- @@ -142,8 +142,8 @@ Strategies for reducing code size - Rewrite functions or classes for alternative stripped-down functionality. - Remove unnecessary functionality or obsolete code from - wxWindows. -- Factor out wxWindows code to reduce repetition. + wxWidgets. +- Factor out wxWidgets code to reduce repetition. - Add inlining, remove unnecessary empty functions. - Separate code out into individual files so that all of a .o file doesn't get pulled in, just because an app @@ -162,7 +162,7 @@ Sample script for building wxNano-X =================================== This script assumes that you will invoke it -from a build directory under the wxWindows +from a build directory under the wxWidgets top level. So you might type: % cd wx2 diff --git a/docs/x11/readme.txt b/docs/x11/readme.txt index 902f7c1783..ca7b4abc1e 100644 --- a/docs/x11/readme.txt +++ b/docs/x11/readme.txt @@ -1,17 +1,17 @@ - Welcome to wxWindows/X11 2.4.2 + Welcome to wxWidgets/X11 2.4.3 -You have downloaded version 2.4.2 of the X11 port of -the wxWindows GUI library. This runs on X11 with no +You have downloaded version 2.4.3 of the X11 port of +the wxWidgets GUI library. This runs on X11 with no Motif, Xt, GTK+ or any other standard widget set -- instead it uses the wxUniversal widgets. The intention is to have it run on NanoX as well as desktop X11. The wxX11 distribution also includes the wxMotif port. -More information about the wxWindows project as a whole +More information about the wxWidgets project as a whole can be found at: - http://www.wxwindows.org + http://www.wxwidgets.org Information on how to install can be found in the file install.txt, but if you cannot wait, this should work on @@ -28,22 +28,22 @@ exit When you run into problems, please read the install.txt and follow those instructions. If you still don't have any success, please send a bug report to one of our mailing lists (see -the wxWindows homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND +the wxWidgets homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF X, WHAT DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. Alternatively, you may also use the bug -reporting system linked from the wxWindows web page. +reporting system linked from the wxWidgets web page. The library produced by the install process will be called libwx_x11univ[d].a (static) and libwx_x11univ[d]-2.3.so.0.0.0 (shared) so that once a binary incompatible version of -wxWindows/X11 comes out we'll augment the library version number +wxWidgets/X11 comes out we'll augment the library version number to avoid linking problems. Please send problems concerning installation, feature requests, -bug reports or comments to the wxWindows users list. Information -on how to subscribe is available from www.wxwindows.org. +bug reports or comments to the wxWidgets users list. Information +on how to subscribe is available from www.wxwidgets.org. -wxWindows/X11 doesn't come with any guarantee whatsoever. It might +wxWidgets/X11 doesn't come with any guarantee whatsoever. It might crash your hard disk or destroy your monitor. It doesn't claim to be suitable for any special or general purpose. @@ -68,5 +68,5 @@ Some remaining issues: Regards, - The wxWindows team + The wxWidgets team diff --git a/samples/dnd/dnd_copy.cur b/samples/dnd/dnd_copy.cur index ce349aa332..1978f706b5 100644 Binary files a/samples/dnd/dnd_copy.cur and b/samples/dnd/dnd_copy.cur differ diff --git a/samples/dnd/dnd_move.cur b/samples/dnd/dnd_move.cur index ce349aa332..55693b7dd1 100644 Binary files a/samples/dnd/dnd_move.cur and b/samples/dnd/dnd_move.cur differ diff --git a/samples/dnd/dnd_none.cur b/samples/dnd/dnd_none.cur index ce349aa332..28bfd394d3 100644 Binary files a/samples/dnd/dnd_none.cur and b/samples/dnd/dnd_none.cur differ diff --git a/samples/sockets/connect.ico b/samples/sockets/connect.ico index 74f006f82a..7844dfd2bc 100644 Binary files a/samples/sockets/connect.ico and b/samples/sockets/connect.ico differ diff --git a/src/makeg95.env b/src/makeg95.env index 50f006b1f2..1de44535bb 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -60,7 +60,7 @@ MINGW32VERSION=3.0 #OSTYPE=msys # If building DLL, the version -WXVERSION=242 +WXVERSION=243 ifndef UNICODE UNICODE=0