From 9ba09ba5e6c67fcdf0a91f8f72123bf6d7a0111f Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 14 Mar 2000 17:53:11 +0000 Subject: [PATCH] Removed some redundant files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 8 + docs/gtk/makewxgtk | 2 +- docs/html/index.htm | 5 +- docs/motif/makewxmotif | 2 +- docs/motif/readme.txt | 49 ++-- docs/motif2/COPYING.LIB | 481 ---------------------------------------- docs/motif2/changes.txt | 4 - docs/motif2/install.txt | 423 ----------------------------------- docs/motif2/licence.txt | 56 ----- docs/motif2/readme.txt | 56 ----- docs/motif2/todo.txt | 48 ---- docs/readme.txt | 21 +- docs/release.txt | 63 ------ 13 files changed, 54 insertions(+), 1164 deletions(-) delete mode 100644 docs/motif2/COPYING.LIB delete mode 100644 docs/motif2/changes.txt delete mode 100644 docs/motif2/install.txt delete mode 100644 docs/motif2/licence.txt delete mode 100644 docs/motif2/readme.txt delete mode 100644 docs/motif2/todo.txt delete mode 100644 docs/release.txt diff --git a/docs/changes.txt b/docs/changes.txt index 5e2203e7e6..20457ea5b9 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -47,6 +47,10 @@ all (GUI): - added wxEncodingConverter and improved wxFontMapper for dealing with convertions between different encodings, charsets support in wxLocale and wxHTML +- wxDragImage class added +- samples/help improved to show standard and advanced HTML help + controllers, as well as native help +- contrib hierarchy started, and OGL/Mmedia moved to it wxMSW: @@ -62,6 +66,8 @@ wxMSW: - wxBitmap/wxIcon may be constructed from XPM included into a program, as in Unix ports - returning FALSE from OnPrintPage() aborts printing +- VC++ makefiles and project files made (mostly) consistent +- wxSetCursorEvent added wxGTK: @@ -72,6 +78,8 @@ wxGTK: wxMotif: - wxMenu::Enable works +- wxToolBar bugs fixed +- OGL samples made to work again wxHTML: diff --git a/docs/gtk/makewxgtk b/docs/gtk/makewxgtk index fa496124e2..d6d76f2124 100644 --- a/docs/gtk/makewxgtk +++ b/docs/gtk/makewxgtk @@ -6,6 +6,6 @@ # if you're feeling braven, you may wish to compile with threads. # -- Julian Smart rm -f *.cache -chmod a+x configure config.sub config.guess +chmod a+x configure config.sub config.guess samples/configure contrib/configure ./configure --disable-shared --with-gtk --with-debug_flag --with-debug_info --enable-debug --without-threads --without-sockets -without-odbc -without-libjpeg make diff --git a/docs/html/index.htm b/docs/html/index.htm index de8a154f92..63fde10e2c 100644 --- a/docs/html/index.htm +++ b/docs/html/index.htm @@ -47,7 +47,6 @@ downloaded from the wxWindows Web site.

wxGTK, wxMotif, wxMSW -

  • Release notes
  • Installation: wxGTK, wxMotif, wxMSW @@ -136,8 +135,8 @@ downloaded from the wxWindows Web site.

    Technical notes

    Third-party tools

    diff --git a/docs/motif/makewxmotif b/docs/motif/makewxmotif index d2927541ec..3146edfe56 100644 --- a/docs/motif/makewxmotif +++ b/docs/motif/makewxmotif @@ -6,6 +6,6 @@ # if you're feeling brave, you may wish to compile with threads. # -- Julian Smart rm -f *.cache -chmod a+x configure config.sub config.guess +chmod a+x configure config.sub config.guess samples/configure contrib/configure ./configure --disable-shared --with-motif --without-gtk --with-debug_flag --with-debug_info --enable-debug --without-sockets --without-odbc --without-threads --enable-newgrid make diff --git a/docs/motif/readme.txt b/docs/motif/readme.txt index 115494e85a..442b0681ef 100644 --- a/docs/motif/readme.txt +++ b/docs/motif/readme.txt @@ -1,23 +1,22 @@ - Welcome to wxWindows/Motif 2.1 snapshot 7, + Welcome to wxWindows/Motif 2.1.14 -you have downloaded version 2.1 of the Motif port of -the wxWindows 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. +You have downloaded version 2.1.14 of the Motif port of +the wxWindows GUI library. Although this is not yet the +final stable release wxMotif 2.2, the current version has +been tested carefully on many systems and has been found +to work better than any other previous version. -More information is available from my homepage at: +This is the last beta release. wxWindows is now in a code +freeze and only bugs will be corrected. - http://wesley.informatik.uni-freiburg.de/~wxxt - -and about the wxWindows project as a whole (and the -Windows and Motif ports in particular) can be found -at Julian Smart's homepage at: +More information about the wxWindows project as a whole +can be found at: - http://web.ukonline.co.uk/julian.smart/wxwin + http://www.wxwindows.org Information on how to install can be found in the file -INSTALL.txt, but if you cannot wait, this should work on +install.txt, but if you cannot wait, this should work on many systems: ./configure --with-motif @@ -27,30 +26,32 @@ make install ldconfig exit -When you run into problems, please read the INSTALL.txt and +Alternatively, a script (makewxmotif) for running configure can +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 -my homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND -YOUR PROBLEM, SUCH AS YOUR VERSION OF GTK, WXGTK, WHAT -DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. I know -this has no effect, but I tried... +the wxWindows 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. The library produced by the install process will be called -libwx_motif.a (static) and libwx_motif-2.1.so.0.0.0 (shared) so that +libwx_motif.a (static) and libwx_motif-2.1.so.14.0.0 (shared) so that once a binary incompatible version of wxWindows/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 my homepage. +on how to subscribe is available from www.wxwindows.org. wxWindows/Motif doesn't come with any guarantee whatsoever. It might -crash your harddisk or destroy your monitor. It doesn't claim to be +crash your hard disk or destroy your monitor. It doesn't claim to be suitable for any special or general purpose. Regards, - Robert Roebling - - + The wxWindows team diff --git a/docs/motif2/COPYING.LIB b/docs/motif2/COPYING.LIB deleted file mode 100644 index eb685a5ec9..0000000000 --- a/docs/motif2/COPYING.LIB +++ /dev/null @@ -1,481 +0,0 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/docs/motif2/changes.txt b/docs/motif2/changes.txt deleted file mode 100644 index d286db4e9e..0000000000 --- a/docs/motif2/changes.txt +++ /dev/null @@ -1,4 +0,0 @@ - -22th June '99: First wxMotif 2.1 snapshot released - -Initial release diff --git a/docs/motif2/install.txt b/docs/motif2/install.txt deleted file mode 100644 index 43150cd5e7..0000000000 --- a/docs/motif2/install.txt +++ /dev/null @@ -1,423 +0,0 @@ - - !!! When sending bug reports tell us what version of wxWindows you are - using (including the beta) and what compiler on what system. One - example: wxMotif 2.1 beta 6, egcs 1.1.1, Redhat 5.0 !!! - -* The most simple case ------------------------ - -If you compile wxWindows on Linux for the first time and don't like to read -install instructions just do (in the base dir): - -> ./configure --with-motif -> make -> su -> make install -> ldconfig -> exit - -Afterwards you can continue with - -> make -> su -> make install -> ldconfig -> exit - -If you want to remove wxWindows on Unix you can do this: - -> su -> make uninstall -> ldconfig -> exit - -* The expert case ------------------ - -If you want to do some more serious cross-platform programming with wxWindows, -such as for GTK and Motif, you can now build two complete libraries and use -them concurretly. For this end, you have to create a directory for each build -of wxWindows - you may also want to create different versions of wxWindows -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. -For building three versions (one GTK, one Motif and a debug version of the GTK -source) you'd do this: - -md buildmotif -cd buildmotif -../configure --with-motif -make -cd .. - -md buildgtk -cd buildgtk -../configure --with-gtk -make -cd .. - -md buildgtkd -cd buildgtkd -../configure --with-gtk --enable-debug_flag -make -cd .. - -* The most simple errors ------------------------- - -You get errors during compilation: The reason is that you probably have a broken -compiler, which includes almost everything that is called gcc. If you use gcc 2.8 -you have to disable optimsation as the compiler will give up with an internal -compiler error. - -If there is just any way for you to use egcs, use egcs. We cannot fix gcc. - -You get immediate segfault when starting any sample or application: This is either -due to having compiled the library with different flags or options than your program - -typically you might have the __WXDEBUG__ option set for the library but not for your -program - or due to using a broken compiler (and its optimisation) such as GCC 2.8. - -* The most simple program -------------------------- - -Now create your super-application myfoo.app and compile anywhere with - -g++ myfoo.cpp `wx-config --libs --cflags` -o myfoo - -* General ------------------------ - -The Unix variants of wxWindows 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 - - http://wesley.informatik.uni-freiburg.de/~wxxt - -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 -YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF GTK, WXGTK, WHAT DISTRIBUTION -YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried... - -* GUI libraries ------------------------ - -wxWindows/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. - -You can get the newest version of the Lesstif from the lesstif homepage at: - - http://www.lesstif.org - -* Additional libraries ------------------------ - -wxWindows/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 2 support: - - - RedHat 5.1 - - Debian 2.0 - - Stampede - - DLD 6.0 - - SuSE 6.0 - -You can disable thread support by running - -./configure "--disable-threads" -make -su -make install -ldconfig -exit - -NB: DO NOT COMPILE WXGTK WITH GCC AND THREADS, SINCE ALL PROGRAMS WILL CRASH UPON -START-UP! Just always use egcs and be happy. - -* Building wxGTK on OS/2 --------------------------- - -Please send comments and question about the OS/2 installation -to Andrea Venturoli and patches to -the wxWindows mailing list. - -You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3 or newer), -Lesstif (0.89.1 or newer), emx (0.9d fix 1), flex (2.5.4), -yacc (1.8), unix like shell, e.g. korn shell (5.2.13), -Autoconf (2.13), GNU file utilities (3.6), -GNU text utilities (1.3), GNU shell utilites (1.12), m4 (1.4), -sed (2.05), grep (2.0), Awk (3.0.3), GNU Make (3.76.1). - -Open an OS/2 prompt and switch to the directory above. -First set some global environment variables we need: - -SET CXXFLAGS=-Zmtd -D__ST_MT_ERRNO__ -SET CFLAGS=-Zmtd -D__ST_MT_ERRNO__ -SET OSTYPE=OS2X -SET COMSPEC=sh - -Notice you can choose whatever you want, if you don't like OS2X. - -Now, run autoconf in the main directory and in the samples, demos -and utils subdirectory. This will generate the OS/2 specific -versions of the configure scripts. Now run - configure --with-motif -as described above. - -To verify Lesstif installation, configure will try to compile a -sample program that requires X headers/libraries to be either -available via C_INCLUDE_PATH and LIBRARY_PATH or you need to -explicitly set CFLAGS prior to running configure. - -If you have pthreads library installed, it will be autodetected -and the library will be compiled with thread-support. - -Note that configure assumes your flex will generate files named -"lexyy.c", not "lex.yy.c". If you have a version which does -generate "lex.yy.c", you need to manually change the generated -makefile. - -* Building wxMotif on SGI --------------------------- - -Using the SGI native compilers, it is recommended that you -also set CFLAGS and CXXFLAGS before running configure. These -should be set to : - -CFLAGS="-mips3 -n32" -CXXFLAGS="-mips3 -n32" - -This is essential if you want to use the resultant binaries -on any other machine than the one it was compiled on. If you -have a 64bit machine (Octane) you should also do this to ensure -you don't accidently build the libraries as 64bit (which is -untested). - -The SGI native compiler support has only been tested on Irix 6.5. - -* Create your configuration ------------------------------ - -Usage: - ./configure options - -If you want to use system's C and C++ compiler, -set environment variables CC and CCC as - - % setenv CC cc - % setenv CCC CC - % ./configure options - -to see all the options please use: - - ./configure --help - -The basic philosophy is that if you want to use different -configurations, like a debug and a release version, -or use the same source tree on different systems, -you have only to change the environment variable OSTYPE. -(Sadly this variable is not set by default on some systems -in some shells - on SGI's for example). So you will have to -set it there. This variable HAS to be set before starting -configure, so that it knows which system it tries to -configure for. - -Configure will complain if the system variable OSTYPE has -not been defined. And Make in some circumstances as well... - - -* General options -------------------- - -Given below are the commands to change the default behaviour, -i.e. if it says "--disable-threads" it means that threads -are enabled by default. - -Many of the confiugre options have been thoroughly tested -in wxWindows 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 deafult to GTK). - - --without-gtk Don't use the GIMP ToolKit (GTK) - - --with-motif Use either Motif or Lesstif - Configure will look for both. - -The following options handle the kind of library you want to build. - - --disable-threads Compile without thread support. Threads - support is also required for the - socket code to work. - - --disable-shared Do not create shared libraries. - - --disable-optimise Do not optimise the code. Can - sometimes be useful for debugging - and is required on some architectures - such as Sun with gcc 2.8.X which - would otherwise produce segvs. - - --enable-profile Add profiling info to the object - files. Currently broken, I think. - - --enable-no_rtti Enable compilation without creation of - C++ RTTI information in object files. - This will speed-up compilation and reduce - binary size. - - --enable-no_exceptions Enable compilation without creation of - C++ exception information in object files. - This will speed-up compilation and reduce - binary size. Also fewer crashes during the - actual compilation... - - --enable-no_deps Enable compilation without creation of - dependency information. - - --enable-permissive Enable compilation without creation of - giving erros as soon as you compile with - Solaris ANSI-defying headers... - - --enable-mem_tracing Add built-in memory tracing. - - --enable-dmalloc Use the dmalloc memory debugger. - Read more at www.letters.com/dmalloc/ - - --enable-debug_info Add debug info to object files and - executables for use with debuggers - such as gdb (or its many frontends). - - --enable-debug_flag Define __DEBUG__ and __WXDEBUG__ when - compiling. This enable wxWindows' very - useful internal debugging tricks (such - as automatically reporting illegal calls) - to work. Note that program and library - must be compiled with the same debug - options. - -* Feature Options -------------------- - -Many of the confiugre options have been thoroughly tested -in wxWindows 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 -are not used in your program. The most relevant such features -are - - --without-libpng Disables PNG image format code. - - --without-libjpeg Disables JPEG image format code. - -{ --without-odbc Disables ODBC code. Not yet. } - - --disable-resources Disables the use of *.wxr type - resources. - - --disable-threads Disables threads. Will also - disable sockets. - - --disable-sockets Disables sockets. - - --disable-dnd Disables Drag'n'Drop. - - --disable-clipboard Disables Clipboard. - - --disable-serial Disables object instance serialiasation. - - --disable-streams Disables the wxStream classes. - - --disable-file Disables the wxFile class. - - --disable-textfile Disables the wxTextFile class. - - --disable-intl Disables the internationalisation. - - --disable-validators Disables validators. - - --disable-accel Disables accel. - -Apart from disabling certain features you can very often "strip" -the program of its debugging information resulting in a significant -reduction in size. - -* Compiling -------------- - -The following must be done in the base directory (e.g. ~/wxGTK -or ~/wxWin or whatever) - -Now the makefiles are created (by configure) and you can compile -the library by typing: - - make - -make yourself some coffee, as it will take some time. On an old -386SX possibly two weeks. During compilation, you'll get a few -warning messages depending in your compiler. - -If you want to be more selective, you can change into a specific -directiry and type "make" there. - -Then you may install the library and it's header files under -/usr/local/include/wx and /usr/local/lib respectively. You -have to log in as root (i.e. run "su" and enter the root -password) and type - - make install - -You can remove any traces of wxWindows by typing - - make uninstall - -If you want to save disk space by removing unnecessary -object-files: - - make clean - -in the various directories will do the work for you. - -* Creating a new Project --------------------------- - -1) The first way uses the installed libraries and header files -automatically using wx-config - -g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo - -Using this way, a make file for the minimal sample would look -like this - -CC = g++ - -minimal: minimal.o - $(CC) -o minimal minimal.o `wx-config --libs` - -minimal.o: minimal.cpp mondrian.xpm - $(CC) `wx-config --cflags` -c minimal.cpp -o minimal.o - -clean: - rm -f *.o minimal - -This is certain to become the standard way unless we decide -to sitch to tmake. - -2) The other way creates a project within the source code -directories of wxWindows. 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. - - ----------------------- - -In the hope that it will be useful, - - Robert Roebling - - diff --git a/docs/motif2/licence.txt b/docs/motif2/licence.txt deleted file mode 100644 index e6dcfbd25c..0000000000 --- a/docs/motif2/licence.txt +++ /dev/null @@ -1,56 +0,0 @@ - - -wxWindows Library License, Version 3 -==================================== - - Copyright (C) 1998 Julian Smart, Robert Roebling et al. - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - WXWINDOWS LIBRARY LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at - your option) any later version. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- - TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library - General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this software, usually in a file named COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - Boston, MA 02111-1307 USA. - - EXCEPTION NOTICE - - 1. As a special exception, the copyright holders of this library give - permission for additional uses of the text contained in this release of - the library as licensed under the wxWindows Library License, applying - either version 3 of the License, or (at your option) any later version of - the License as published by the copyright holders of version 3 of the - License document. - - 2. The exception is that you may create binary object code versions of any - works using this library or based on this library, and use, copy, modify, - link and distribute such binary object code files unrestricted under terms - of your choice. - - 3. If you copy code from files distributed under the terms of the GNU - General Public License or the GNU Library General Public License into a - copy of this library, as this license permits, the exception does not - apply to the code that you add in this way. To avoid misleading anyone as - to the status of such modified files, you must delete this exception - notice from such code and/or adjust the licensing conditions notice - accordingly. - - 4. If you write modifications of your own for this library, it is your - choice whether to permit this exception to apply to your modifications. - If you do not wish that, you must delete the exception notice from such - code and/or adjust the licensing conditions notice accordingly. - - diff --git a/docs/motif2/readme.txt b/docs/motif2/readme.txt deleted file mode 100644 index 115494e85a..0000000000 --- a/docs/motif2/readme.txt +++ /dev/null @@ -1,56 +0,0 @@ - - Welcome to wxWindows/Motif 2.1 snapshot 7, - -you have downloaded version 2.1 of the Motif port of -the wxWindows 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. - -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 -Windows and Motif ports in particular) can be found -at Julian Smart's homepage at: - - http://web.ukonline.co.uk/julian.smart/wxwin - -Information on how to install can be found in the file -INSTALL.txt, but if you cannot wait, this should work on -many systems: - -./configure --with-motif -make -su -make install -ldconfig -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 -my homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND -YOUR PROBLEM, SUCH AS YOUR VERSION OF GTK, WXGTK, WHAT -DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. I know -this has no effect, but I tried... - -The library produced by the install process will be called -libwx_motif.a (static) and libwx_motif-2.1.so.0.0.0 (shared) so that -once a binary incompatible version of wxWindows/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 my homepage. - -wxWindows/Motif 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. - - Regards, - - Robert Roebling - - - diff --git a/docs/motif2/todo.txt b/docs/motif2/todo.txt deleted file mode 100644 index 96bce1ccb8..0000000000 --- a/docs/motif2/todo.txt +++ /dev/null @@ -1,48 +0,0 @@ - --------------------- High priority --------------------- - -Finalise DnD API. - -More testing of Unicode support. - -New wxSizer class implementation. - -Make wxSockets work on all platform. - -Do something about reentry problems with GUI threads - when doing asynchronous work (clipboard transfer, - DnD, sockets, different threads). - -Add ID based i18n system as a replacement for the - unelegant gettext system. - -Add controls to toolbar. - -Add TIFF handler. Someone? (Hint, hint). - -Improve, update translations. Install *.mo files somewehere. - -Completely remove internal usage of C++ iostreams. - -Sleep, eat, walk, study, shave, read, play piano and wash less. - --------------------- Medium priority --------------------- - -Show accelerator control labels and actually implement them - -> Changed in GTK 1.2 (so let's do it for 1.2). Difficult. - --------------------- Low priority --------------------- - -Right aligned checkboxes: focus highlighting is wrong, tooltips can't be set can't be set - -OwnerDraw for wxListCtrl and others - -> Postponed. - -Implement wxPalette - -> I never understood that. Postponed. - -Implement different visuals and displays - -> I never understood that. Postponed. - -Cooperation with Qt - -> Would be nice. diff --git a/docs/readme.txt b/docs/readme.txt index b2dd7f93bd..d324e57e35 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,4 +1,4 @@ -wxWindows 2.1.13 +wxWindows 2.1.14 ---------------- Welcome to wxWindows 2, a sophisticated cross-platform C++ @@ -23,6 +23,16 @@ Changes in this release Please see changes.txt for details. +Note that there is a new contrib hierarchy for contributions, +which mirrors the regular wxWindows hierarchy. The Object +Graphics Library and MMedia library have been moved under +contrib, so you may need to change your makefiles or project +files, together with your source files. E.g. change #include "ogl.h" +to #include . + +Also VC++ project files and makefiles have been made more +consistent, so some paths and library names have changed. + Platforms supported ------------------- @@ -71,6 +81,7 @@ jpeg.zip Optional JPEG library tiff.zip Optional TIFF library ogl3.zip Optional Object Graphics Library mmedia.zip Optional MMedia class library (Motif, GTK, MSW) +stc.zip Optional wxStyledTextCtrl library (Motif, GTK, MSW) tex2rtf2.zip Tex2RTF documentation tool wxWindows for GTK distribution @@ -90,6 +101,7 @@ wxMotif-2.x.y.tgz wxMotif source distribution. You will wx2_x_y_gen.zip wx2_x_y_mot.zip jpeg.zip +tiff.zip wxWindows for Windows distribution ---------------------------------- @@ -165,8 +177,9 @@ See docs/bugs.txt for a bug list: this file is new and will initially See docs/html/index.htm for an HTML index of the major documents. -See docs/changes.txt for a detailed history of changes to wxWindows 2 - (not up-to-date). +See docs/changes.txt for a summary of changes to wxWindows 2. + +See docs/tech for an archive of technical notes. The Windows help files are located in docs/winhelp. The PDF help files are located in docs/pdf. @@ -194,5 +207,5 @@ web site) or contact Julian Smart . Good luck! -The wxWindows Team, February 2000 +The wxWindows Team, March 2000 diff --git a/docs/release.txt b/docs/release.txt deleted file mode 100644 index 6fb13eda0a..0000000000 --- a/docs/release.txt +++ /dev/null @@ -1,63 +0,0 @@ -wxWindows Release Notes ------------------------ - -2.1.13 -====== - -- New wxEncodingConverter class. - - -2.1.12 -====== - -- New wxDateTime class to replace millenium-uncompliant wxTime - and wxDate classes. - -- New wxCalendarCtrl class and sample. - -- New wxCmdLineParser class. - -- wxHTML printing and other improvements. - -- Life sample added. - -- TIFF support added to wxImage. - -2.1.11 -====== - -- wxMenu no longer takes a wxFunction argument: either use - event handlers in the menu's host window or set WXWIN_COMPATIBILITY - to 1 in setup.h, and recompile. - -- wxMotif still lags behind other ports but is in much better - shape than the 2.0.1 distribution. - -- Clipboard/drag and drop is still not implemented in wxMotif. - -- The new wxGrid implementation is in beta, but the original - implementation can be restored by setting wxUSE_NEW_GRID - to 0 (in wxMSW) or passing --disable-newgrid to configure - (wxGTK/wxMSW). Pass --enable-newgrid to configure to enable - the new implementation. - -- wxHTML is partially working in wxMotif. The About sample - works, but the others exhibit refresh problems. So light - use of wxHTML is recommended on wxMotif. - -- The wxHTML helpview application crashes on exit if - using VC++ 6 in release mode and loading a large amount of - HTML (such as the wxWindows manual generated using Tex2RTF). - This may be a compiler problem and will be investigated - for 2.1.12. - [ fixed since 2.1.13 ] - -- wxHTML printing has spacing problems under Windows, and may not - work fully under Unix. Hopefully this will be resolved for 2.1.12. - [ fixed since 2.1.12 ] - -- wxStaticBox under Windows obscures controls placed within it: - this will be fixed in 2.1.12. - -- wxStaticBitmap under Windows doesn't respect the transparency mask. - -- 2.45.2