From df875e593f9ec4b2eb08d632e17caddf10b61ac8 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 7 Nov 1998 13:55:50 +0000 Subject: [PATCH] Fixed 5 bugs in wxImage and Blit Removed warning messages Some more clientdata fiddleing Added bitmap support to wxTreeCtrl Fixed some bugs in wxTreeCtrl Added licence.txt to /docs/gtk/ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/gtk/COPYING.LIB | 481 ++++++++++++++++++++++++++++++++++ docs/gtk/licence.txt | 56 ++++ docs/gtk/todo.txt | 12 +- samples/treectrl/icon1.xpm | 65 ++--- samples/treectrl/icon2.xpm | 68 ++--- samples/treectrl/treetest.cpp | 2 +- src/common/docview.cpp | 6 + src/common/image.cpp | 2 +- src/common/stream.cpp | 6 +- src/generic/choicdgg.cpp | 4 +- src/generic/treectrl.cpp | 88 +++++-- src/gtk/bitmap.cpp | 6 +- src/gtk/dcclient.cpp | 29 +- src/gtk1/bitmap.cpp | 6 +- src/gtk1/dcclient.cpp | 29 +- 15 files changed, 725 insertions(+), 135 deletions(-) create mode 100644 docs/gtk/COPYING.LIB create mode 100644 docs/gtk/licence.txt diff --git a/docs/gtk/COPYING.LIB b/docs/gtk/COPYING.LIB new file mode 100644 index 0000000000..eb685a5ec9 --- /dev/null +++ b/docs/gtk/COPYING.LIB @@ -0,0 +1,481 @@ + 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/gtk/licence.txt b/docs/gtk/licence.txt new file mode 100644 index 0000000000..e6dcfbd25c --- /dev/null +++ b/docs/gtk/licence.txt @@ -0,0 +1,56 @@ + + +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/gtk/todo.txt b/docs/gtk/todo.txt index 5f3cd63cf7..df154e8182 100644 --- a/docs/gtk/todo.txt +++ b/docs/gtk/todo.txt @@ -2,17 +2,23 @@ -------------------- High priority --------------------- wxTreeCtrl - -> Make it compile. Keyboard handling, icon support. + -> Keyboard handling. wxClipboard - -> Urgh. + -> On the way, but not functional yet. wxHelpController -> Karsten ? Fix printing of bitmaps -> No idea. + +OwnerDraw for wxListCtrl and others + -> That is a big one. +DnD + -> Must be rewritten for GTK+ 1.1.3 + -------------------- Low priority --------------------- wxDebugContext <-> wxLogXXX functions @@ -31,5 +37,5 @@ Correct tab navigation -> seems to be broken in GTK. Postponed. Cooperation with Qt - + -> Would be nice. \ No newline at end of file diff --git a/samples/treectrl/icon1.xpm b/samples/treectrl/icon1.xpm index 5d54c035a5..f420ec9d5d 100644 --- a/samples/treectrl/icon1.xpm +++ b/samples/treectrl/icon1.xpm @@ -1,44 +1,25 @@ /* XPM */ -static char *icon1_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 6 1", -" c Black", -". c Blue", -"X c #00bf00", -"o c Red", -"O c Yellow", -"+ c Gray100", +static char * icon1_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 3 1", +/* colors */ +" s None c None", +". c #000000", +"+ c #ffffff", /* pixels */ -" ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" ", -" ++++++ ++++++++++++++++++ .... ", -" ++++++ ++++++++++++++++++ .... ", -" ++++++ +++++++XXX++++++++ .... ", -" ++++++ ++++++X+XX++++++++ .... ", -" ++++++ +++++X++XX++++++++ .... ", -" ++++++ ++++++++XX++++++++ ", -" ++++++ ++++++++XX++++++++ ++++ ", -" ++++++ ++++++++XX++++++++ ++++ ", -" ++++++ ++++++++XX++++++++ ++++ ", -" ++++++ ++++++++XX++++++++ ++++ ", -" ++++++ ++++++++XX++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" " -}; +" ", +" ........ ", +" .++++++.. ", +" .+.+.++.+. ", +" .++++++.... ", +" .+.+.+++++. ", +" .+++++++++. ", +" .+.+.+.+.+. ", +" .+++++++++. ", +" .+.+.+.+.+. ", +" .+++++++++. ", +" .+.+.+.+.+. ", +" .+++++++++. ", +" ........... ", +" ", +" "}; diff --git a/samples/treectrl/icon2.xpm b/samples/treectrl/icon2.xpm index c300a6c2e3..5718cbce7c 100644 --- a/samples/treectrl/icon2.xpm +++ b/samples/treectrl/icon2.xpm @@ -1,44 +1,28 @@ /* XPM */ -static char *icon2_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 6 1", -" c Black", -". c Blue", -"X c #00bf00", -"o c Red", -"O c Yellow", -"+ c Gray100", +static char * icon2_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 6 1", +/* colors */ +" s None c None", +". c #000000", +"+ c #c0c0c0", +"@ c #808080", +"# c #ffff00", +"$ c #ffffff", /* pixels */ -" ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" ", -" ++++++ ++++++++++++++++++ .... ", -" ++++++ ++++++++++++++++++ .... ", -" ++++++ ++++++++++++++++++ .... ", -" ++++++ +++++XXXXXX+++++++ .... ", -" ++++++ ++++X++++++X++++++ .... ", -" ++++++ +++++++++++X++++++ ", -" ++++++ ++++++++++X+++++++ ++++ ", -" ++++++ ++++++++XX++++++++ ++++ ", -" ++++++ +++++++XX+++++++++ ++++ ", -" ++++++ ++++++X+++++++++++ ++++ ", -" ++++++ +++++X++++++++++++ ++++ ", -" ++++++ +++++XXXXXXXX+++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" " -}; +" ", +" @@@@@ ", +" @#+#+#@ ", +" @#+#+#+#@@@@@@ ", +" @$$$$$$$$$$$$@.", +" @$#+#+#+#+#+#@.", +" @$+#+#+#+#+#+@.", +" @$#+#+#+#+#+#@.", +" @$+#+#+#+#+#+@.", +" @$#+#+#+#+#+#@.", +" @$+#+#+#+#+#+@.", +" @$#+#+#+#+#+#@.", +" @@@@@@@@@@@@@@.", +" ..............", +" ", +" "}; diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index bceea5430d..65e281c84e 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -158,8 +158,8 @@ MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id, m_imageListNormal = new wxImageList(16, 16, TRUE); // should correspond to TreeCtrlIcon_xxx enum - m_imageListNormal->Add(wxICON(icon1)); m_imageListNormal->Add(wxICON(icon2)); + m_imageListNormal->Add(wxICON(icon1)); SetImageList(m_imageListNormal); diff --git a/src/common/docview.cpp b/src/common/docview.cpp index d25ac43c1e..a64026f17f 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -1130,8 +1130,14 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path) // How to implement in wxWindows? Must extend the file selector // dialog or implement own; OR match the extension to the // template extension. + +#ifdef __WXMSW__ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, int noTemplates, wxString& path, long WXUNUSED(flags), bool WXUNUSED(save)) +#else +wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **WXUNUSED(templates), + int WXUNUSED(noTemplates), wxString& path, long WXUNUSED(flags), bool WXUNUSED(save)) +#endif { // We can only have multiple filters in Windows #ifdef __WXMSW__ diff --git a/src/common/image.cpp b/src/common/image.cpp index f57881dcb6..e838d1cfc5 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -834,7 +834,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name ) for (i = 0; i < absolute; i++) { - +linepos++; + linepos++; byte = getc(file); ptr[poffset] = cmap[byte].r; ptr[poffset + 1] = cmap[byte].g; diff --git a/src/common/stream.cpp b/src/common/stream.cpp index 2bce4c881e..d81531d89c 100644 --- a/src/common/stream.cpp +++ b/src/common/stream.cpp @@ -420,17 +420,17 @@ wxStreamBase::~wxStreamBase() { } -size_t wxStreamBase::OnSysRead(void *buffer, size_t size) +size_t wxStreamBase::OnSysRead(void *WXUNUSED(buffer), size_t WXUNUSED(size)) { return 0; } -size_t wxStreamBase::OnSysWrite(const void *buffer, size_t bufsize) +size_t wxStreamBase::OnSysWrite(const void *WXUNUSED(buffer), size_t WXUNUSED(bufsize)) { return 0; } -off_t wxStreamBase::OnSysSeek(off_t seek, wxSeekMode mode) +off_t wxStreamBase::OnSysSeek(off_t WXUNUSED(seek), wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; } diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp index c045765534..e9f54e59f9 100644 --- a/src/generic/choicdgg.cpp +++ b/src/generic/choicdgg.cpp @@ -338,7 +338,7 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { m_selection = listBox->GetSelection(); m_stringSelection = listBox->GetStringSelection(); - m_clientData = listBox->GetClientData(m_selection); + m_clientData = (char*)listBox->GetClientData(m_selection); } EndModal(wxID_OK); @@ -351,7 +351,7 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event)) { m_selection = listBox->GetSelection(); m_stringSelection = listBox->GetStringSelection(); - m_clientData = listBox->GetClientData(m_selection); + m_clientData = (char*)listBox->GetClientData(m_selection); } EndModal(wxID_OK); diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index d12636c5b7..45b776dce1 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -27,6 +27,7 @@ #include "wx/intl.h" #include "wx/dynarray.h" #include "wx/dcclient.h" +#include "wx/imaglist.h" // ----------------------------------------------------------------------------- // array types @@ -165,6 +166,7 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent, m_isCollapsed = TRUE; m_hasHilight = FALSE; + m_hasPlus = FALSE; m_parent = parent; @@ -227,14 +229,17 @@ void wxGenericTreeItem::SetCross( int x, int y ) void wxGenericTreeItem::GetSize( int &x, int &y ) { // FIXME what does this all mean?? - if ( y < m_y + 10 ) y = m_y +10; + if ( y < m_y ) y = m_y; int width = m_x + m_width; if (width > x) x = width; - size_t count = m_children.Count(); - for ( size_t n = 0; n < count; n++ ) + if (IsExpanded()) { - m_children[n]->GetSize( x, y ); + size_t count = m_children.Count(); + for ( size_t n = 0; n < count; n++ ) + { + m_children[n]->GetSize( x, y ); + } } } @@ -402,7 +407,7 @@ void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has) // item status inquiries // ----------------------------------------------------------------------------- -bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const +bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const { wxFAIL_MSG("not implemented"); @@ -767,18 +772,18 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId) } } -void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) +void wxTreeCtrl::EnsureVisible(const wxTreeItemId& WXUNUSED(item)) { wxFAIL_MSG("not implemented"); } -void wxTreeCtrl::ScrollTo(const wxTreeItemId& item) +void wxTreeCtrl::ScrollTo(const wxTreeItemId& WXUNUSED(item)) { wxFAIL_MSG("not implemented"); } -wxTextCtrl *wxTreeCtrl::EditLabel(const wxTreeItemId& item, - wxClassInfo* textCtrlClass) +wxTextCtrl *wxTreeCtrl::EditLabel( const wxTreeItemId& WXUNUSED(item), + wxClassInfo* WXUNUSED(textCtrlClass) ) { wxFAIL_MSG("not implemented"); @@ -792,13 +797,13 @@ wxTextCtrl *wxTreeCtrl::GetEditControl() const return NULL; } -void wxTreeCtrl::EndEditLabel(const wxTreeItemId& item, bool discardChanges) +void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool WXUNUSED(discardChanges)) { wxFAIL_MSG("not implemented"); } -void wxTreeCtrl::SortChildren(const wxTreeItemId& item, - wxTreeItemCmpFunc *cmpFunction) +void wxTreeCtrl::SortChildren( const wxTreeItemId& WXUNUSED(item), + wxTreeItemCmpFunc *WXUNUSED(cmpFunction)) { wxFAIL_MSG("not implemented"); } @@ -863,7 +868,7 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & int exposed_x = dc.LogicalToDeviceX( 0 ); int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 ); - if (IsExposed( exposed_x, exposed_y, 1000, m_lineHeight+4 )) + if (IsExposed( exposed_x, exposed_y, 10000, m_lineHeight+4 )) // 10000 = very much { int startX = horizX; int endX = horizX + 10; @@ -888,19 +893,33 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & { dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); dc.SetBrush( *m_hilightBrush ); - long tw, th; - dc.GetTextExtent( item->GetText(), &tw, &th ); - if (m_hasFocus) + + long text_w = 0; + long text_h = 0; + dc.GetTextExtent( item->GetText(), &text_w, &text_h ); + + int image_h = 0; + int image_w = 0; + if (item->GetImage() != -1) { - dc.SetPen( *wxBLACK_PEN ); - dc.DrawRectangle( item->GetX()-2, item->GetY()-2, tw+4, th+4 ); + m_imageListNormal->GetSize( item->GetImage(), image_w, image_h ); + image_w += 4; } + + if (m_hasFocus) + dc.SetPen( *wxBLACK_PEN ); else - { dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRectangle( item->GetX()-2, item->GetY()-2, tw+4, th+4 ); + + dc.DrawRectangle( item->GetX()-2, item->GetY()-2, image_w+text_w+4, text_h+4 ); + + if (item->GetImage() != -1) + { + dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, text_h ); + m_imageListNormal->Draw( item->GetImage(), dc, item->GetX(), item->GetY()-1, wxIMAGELIST_DRAW_TRANSPARENT ); + dc.DestroyClippingRegion(); } - dc.DrawText( item->GetText(), item->GetX(), item->GetY() ); + dc.DrawText( item->GetText(), image_w+item->GetX(), item->GetY() ); dc.SetPen( *wxBLACK_PEN ); dc.SetTextForeground( *wxBLACK ); @@ -910,10 +929,29 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & { dc.SetBrush( *wxWHITE_BRUSH ); dc.SetPen( *wxTRANSPARENT_PEN ); - long tw, th; - dc.GetTextExtent( item->GetText(), &tw, &th ); - dc.DrawRectangle( item->GetX()-2, item->GetY()-2, tw+4, th+4 ); - dc.DrawText( item->GetText(), item->GetX(), item->GetY() ); + + long text_w = 0; + long text_h = 0; + dc.GetTextExtent( item->GetText(), &text_w, &text_h ); + + int image_h = 0; + int image_w = 0; + if (item->GetImage() != -1) + { + m_imageListNormal->GetSize( item->GetImage(), image_w, image_h ); + image_w += 4; + } + + dc.DrawRectangle( item->GetX()-2, item->GetY()-2, image_w+text_w+4, text_h+4 ); + + if (item->GetImage() != -1) + { + dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, text_h ); + m_imageListNormal->Draw( item->GetImage(), dc, item->GetX(), item->GetY()-1, wxIMAGELIST_DRAW_TRANSPARENT ); + dc.DestroyClippingRegion(); + } + + dc.DrawText( item->GetText(), image_w+item->GetX(), item->GetY() ); dc.SetPen( *wxBLACK_PEN ); } } diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 24abc0cbc4..011930fbd1 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -452,10 +452,10 @@ wxBitmap::wxBitmap( const wxImage &image ) if (image.HasMask()) { - if ((r == r_mask) && (b = b_mask) && (g = g_mask)) - gdk_image_put_pixel( mask_image, x, y, 0 ); - else + if ((r == r_mask) && (b == b_mask) && (g == g_mask)) gdk_image_put_pixel( mask_image, x, y, 1 ); + else + gdk_image_put_pixel( mask_image, x, y, 0 ); } switch (render_depth) diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index 3e8025961b..516237687e 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -476,7 +476,7 @@ void wxPaintDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask ) } bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, - wxDC *source, long xsrc, long ysrc, int WXUNUSED(logical_func), bool WXUNUSED(useMask) ) + wxDC *source, long xsrc, long ysrc, int WXUNUSED(logical_func), bool useMask ) { if (!Ok()) return FALSE; @@ -485,16 +485,35 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, if (csrc->m_isMemDC) { wxMemoryDC* srcDC = (wxMemoryDC*)source; - GdkBitmap* bmap = srcDC->m_selected.GetBitmap(); + GdkPixmap* bmap = srcDC->m_selected.GetPixmap(); if (bmap) { - gdk_draw_bitmap( m_window, m_textGC, bmap, + long xx = XLOG2DEV(xdest); + long yy = YLOG2DEV(ydest); + + GdkBitmap *mask = (GdkBitmap *) NULL; + if (srcDC->m_selected.GetMask()) mask = srcDC->m_selected.GetMask()->GetBitmap(); + + if (useMask && mask) + { + gdk_gc_set_clip_mask( m_penGC, mask ); + gdk_gc_set_clip_origin( m_penGC, xx, yy ); + } + + gdk_draw_pixmap( m_window, m_penGC, bmap, source->DeviceToLogicalX(xsrc), source->DeviceToLogicalY(ysrc), - XLOG2DEV(xdest), - YLOG2DEV(ydest), + xx, + yy, source->DeviceToLogicalXRel(width), source->DeviceToLogicalYRel(height) ); + + if (useMask && mask) + { + gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); + gdk_gc_set_clip_origin( m_penGC, 0, 0 ); + } + return TRUE; } } diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index 24abc0cbc4..011930fbd1 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -452,10 +452,10 @@ wxBitmap::wxBitmap( const wxImage &image ) if (image.HasMask()) { - if ((r == r_mask) && (b = b_mask) && (g = g_mask)) - gdk_image_put_pixel( mask_image, x, y, 0 ); - else + if ((r == r_mask) && (b == b_mask) && (g == g_mask)) gdk_image_put_pixel( mask_image, x, y, 1 ); + else + gdk_image_put_pixel( mask_image, x, y, 0 ); } switch (render_depth) diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp index 3e8025961b..516237687e 100644 --- a/src/gtk1/dcclient.cpp +++ b/src/gtk1/dcclient.cpp @@ -476,7 +476,7 @@ void wxPaintDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask ) } bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, - wxDC *source, long xsrc, long ysrc, int WXUNUSED(logical_func), bool WXUNUSED(useMask) ) + wxDC *source, long xsrc, long ysrc, int WXUNUSED(logical_func), bool useMask ) { if (!Ok()) return FALSE; @@ -485,16 +485,35 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height, if (csrc->m_isMemDC) { wxMemoryDC* srcDC = (wxMemoryDC*)source; - GdkBitmap* bmap = srcDC->m_selected.GetBitmap(); + GdkPixmap* bmap = srcDC->m_selected.GetPixmap(); if (bmap) { - gdk_draw_bitmap( m_window, m_textGC, bmap, + long xx = XLOG2DEV(xdest); + long yy = YLOG2DEV(ydest); + + GdkBitmap *mask = (GdkBitmap *) NULL; + if (srcDC->m_selected.GetMask()) mask = srcDC->m_selected.GetMask()->GetBitmap(); + + if (useMask && mask) + { + gdk_gc_set_clip_mask( m_penGC, mask ); + gdk_gc_set_clip_origin( m_penGC, xx, yy ); + } + + gdk_draw_pixmap( m_window, m_penGC, bmap, source->DeviceToLogicalX(xsrc), source->DeviceToLogicalY(ysrc), - XLOG2DEV(xdest), - YLOG2DEV(ydest), + xx, + yy, source->DeviceToLogicalXRel(width), source->DeviceToLogicalYRel(height) ); + + if (useMask && mask) + { + gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL ); + gdk_gc_set_clip_origin( m_penGC, 0, 0 ); + } + return TRUE; } } -- 2.45.2