diff --git a/Makefile.in b/Makefile.in index cc82b9a1c9..d95087eef2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1444,16 +1444,23 @@ PYTHON_DIST: wxPython/demo/bmp_source \ wxPython/demo/data \ wxPython/demo/dllwidget \ + wxPython/samples/StyleEditor \ + wxPython/samples/doodle \ + wxPython/samples/embedded \ + wxPython/samples/frogedit \ + wxPython/samples/pySketch \ + wxPython/samples/pySketch/images \ + wxPython/samples/wxProject \ + wxPython/samples/wx_examples \ + wxPython/samples/wx_examples/basic \ + wxPython/samples/wx_examples/hello \ + wxPython/samples/wx_examples/screenshots \ wxPython/distutils \ wxPython/distutils/command \ wxPython/scripts \ wxPython/src \ wxPython/src/gtk \ wxPython/wx \ - wxPython/wx/examples \ - wxPython/wx/examples/basic \ - wxPython/wx/examples/hello \ - wxPython/wx/examples/screenshots \ wxPython/wx/lib \ wxPython/wx/lib/colourchooser \ wxPython/wx/lib/editor \ diff --git a/wxPython/wx/examples/__init__.py b/wxPython/samples/wx_examples/basic/__init__.py similarity index 100% rename from wxPython/wx/examples/__init__.py rename to wxPython/samples/wx_examples/basic/__init__.py diff --git a/wxPython/wx/examples/basic/app.py b/wxPython/samples/wx_examples/basic/app.py similarity index 100% rename from wxPython/wx/examples/basic/app.py rename to wxPython/samples/wx_examples/basic/app.py diff --git a/wxPython/wx/examples/basic/frame.py b/wxPython/samples/wx_examples/basic/frame.py similarity index 100% rename from wxPython/wx/examples/basic/frame.py rename to wxPython/samples/wx_examples/basic/frame.py diff --git a/wxPython/wx/examples/default.css b/wxPython/samples/wx_examples/default.css similarity index 100% rename from wxPython/wx/examples/default.css rename to wxPython/samples/wx_examples/default.css diff --git a/wxPython/wx/examples/examples.html b/wxPython/samples/wx_examples/examples.html similarity index 100% rename from wxPython/wx/examples/examples.html rename to wxPython/samples/wx_examples/examples.html diff --git a/wxPython/wx/examples/examples.txt b/wxPython/samples/wx_examples/examples.txt similarity index 100% rename from wxPython/wx/examples/examples.txt rename to wxPython/samples/wx_examples/examples.txt diff --git a/wxPython/wx/examples/basic/__init__.py b/wxPython/samples/wx_examples/hello/__init__.py similarity index 100% rename from wxPython/wx/examples/basic/__init__.py rename to wxPython/samples/wx_examples/hello/__init__.py diff --git a/wxPython/wx/examples/hello/hello.py b/wxPython/samples/wx_examples/hello/hello.py similarity index 100% rename from wxPython/wx/examples/hello/hello.py rename to wxPython/samples/wx_examples/hello/hello.py diff --git a/wxPython/wx/examples/hello/wxPython.jpg b/wxPython/samples/wx_examples/hello/wxPython.jpg similarity index 100% rename from wxPython/wx/examples/hello/wxPython.jpg rename to wxPython/samples/wx_examples/hello/wxPython.jpg diff --git a/wxPython/wx/examples/screenshots/hello-linux.png b/wxPython/samples/wx_examples/screenshots/hello-linux.png similarity index 100% rename from wxPython/wx/examples/screenshots/hello-linux.png rename to wxPython/samples/wx_examples/screenshots/hello-linux.png diff --git a/wxPython/wx/examples/screenshots/hello-mac.png b/wxPython/samples/wx_examples/screenshots/hello-mac.png similarity index 100% rename from wxPython/wx/examples/screenshots/hello-mac.png rename to wxPython/samples/wx_examples/screenshots/hello-mac.png diff --git a/wxPython/wx/examples/screenshots/hello-win98.png b/wxPython/samples/wx_examples/screenshots/hello-win98.png similarity index 100% rename from wxPython/wx/examples/screenshots/hello-win98.png rename to wxPython/samples/wx_examples/screenshots/hello-win98.png diff --git a/wxPython/setup.py b/wxPython/setup.py index 818468195b..0e3fcae708 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -1230,7 +1230,7 @@ else: DATA_FILES += find_data_files('wxPython/tools/XRCed', '*.txt', '*.xrc') DATA_FILES += find_data_files('wxPython/py', '*.txt', '*.ico', '*.css', '*.html') -DATA_FILES += find_data_files('wx', '*.txt', '*.ico', '*.css', '*.html', '*.jpg', '*.png') +DATA_FILES += find_data_files('wx', '*.txt', '*.css', '*.html') #---------------------------------------------------------------------- @@ -1261,9 +1261,6 @@ if __name__ == "__main__": 'wxPython.tools.XRCed', 'wx', - 'wx.examples', - 'wx.examples.basic', - 'wx.examples.hello', 'wx.lib', 'wx.lib.colourchooser', 'wx.lib.editor', diff --git a/wxPython/wx/examples/hello/__init__.py b/wxPython/wx/examples/hello/__init__.py deleted file mode 100644 index b929a7db76..0000000000 --- a/wxPython/wx/examples/hello/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# Python package. diff --git a/wxPython/wxPython/py/wxd/LICENSE.txt b/wxPython/wxPython/py/wxd/LICENSE.txt deleted file mode 100644 index 5bfa143812..0000000000 --- a/wxPython/wxPython/py/wxd/LICENSE.txt +++ /dev/null @@ -1,60 +0,0 @@ - wxWindows Free Documentation Licence, Version 3 - =============================================== - - Copyright (c) 1998 Julian Smart, Robert Roebling et al - - Everyone is permitted to copy and distribute verbatim copies - of this licence document, but changing it is not allowed. - - WXWINDOWS FREE DOCUMENTATION LICENCE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 1. Permission is granted to make and distribute verbatim copies of this - manual or piece of documentation provided any copyright notice and this - permission notice are preserved on all copies. - - 2. Permission is granted to process this file or document through a - document processing system and, at your option and the option of any third - party, print the results, provided a printed document carries a copying - permission notice identical to this one. - - 3. Permission is granted to copy and distribute modified versions of this - manual or piece of documentation under the conditions for verbatim - copying, provided also that any sections describing licensing conditions - for this manual, such as, in particular, the GNU General Public Licence, - the GNU Library General Public Licence, and any wxWindows Licence are - included exactly as in the original, and provided that the entire - resulting derived work is distributed under the terms of a permission - notice identical to this one. - - 4. Permission is granted to copy and distribute translations of this - manual or piece of documentation into another language, under the above - conditions for modified versions, except that sections related to - licensing, including this paragraph, may also be included in translations - approved by the copyright holders of the respective licence documents in - addition to the original English. - - WARRANTY DISCLAIMER - - 5. BECAUSE THIS MANUAL OR PIECE OF DOCUMENTATION IS LICENSED FREE OF CHARGE, - THERE IS NO WARRANTY FOR IT, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER - PARTIES PROVIDE THIS MANUAL OR PIECE OF DOCUMENTATION "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 MANUAL OR PIECE OF DOCUMENTATION IS WITH YOU. SHOULD THE MANUAL OR - PIECE OF DOCUMENTATION PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 6. 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 MANUAL OR PIECE OF DOCUMENTATION 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 - MANUAL OR PIECE OF DOCUMENTATION (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 A PROGRAM BASED ON THE MANUAL OR PIECE OF - DOCUMENTATION TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -