b91dc38
diff --git a/wxPython/distrib/DIRLIST b/wxPython/distrib/DIRLIST
b91dc38
index 688d0d1..82dd00d 100644
b91dc38
--- a/wxPython/distrib/DIRLIST
b91dc38
+++ b/wxPython/distrib/DIRLIST
b91dc38
@@ -149,104 +149,5 @@ wx/tools/XRCed/misc/src-images
b91dc38
 wx/tools/XRCed/plugins
b91dc38
 wx/tools/XRCed/plugins/bitmaps
b91dc38
 wx/tools/XRCed/plugins/src-images
b91dc38
-wx/tools/Editra
b91dc38
-wx/tools/Editra/docs
b91dc38
-wx/tools/Editra/include
b91dc38
-wx/tools/Editra/include/python2.5
b91dc38
-wx/tools/Editra/include/python2.5/darwin
b91dc38
-wx/tools/Editra/include/python2.5/win32
b91dc38
-wx/tools/Editra/locale
b91dc38
-wx/tools/Editra/locale/ca_ES@valencia
b91dc38
-wx/tools/Editra/locale/ca_ES@valencia/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/cs_CZ
b91dc38
-wx/tools/Editra/locale/cs_CZ/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/da_DK
b91dc38
-wx/tools/Editra/locale/da_DK/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/de_DE
b91dc38
-wx/tools/Editra/locale/de_DE/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/en_US
b91dc38
-wx/tools/Editra/locale/en_US/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/es_ES
b91dc38
-wx/tools/Editra/locale/es_ES/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/fr_FR
b91dc38
-wx/tools/Editra/locale/fr_FR/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/gl_ES
b91dc38
-wx/tools/Editra/locale/gl_ES/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/it_IT
b91dc38
-wx/tools/Editra/locale/it_IT/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/hr_HR
b91dc38
-wx/tools/Editra/locale/hr_HR/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/hu_HU
b91dc38
-wx/tools/Editra/locale/hu_HU/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/ja_JP
b91dc38
-wx/tools/Editra/locale/ja_JP/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/lv_LV
b91dc38
-wx/tools/Editra/locale/lv_LV/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/nl_NL
b91dc38
-wx/tools/Editra/locale/nl_NL/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/nn_NO
b91dc38
-wx/tools/Editra/locale/nn_NO/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/pl_PL
b91dc38
-wx/tools/Editra/locale/pl_PL/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/pt_BR
b91dc38
-wx/tools/Editra/locale/pt_BR/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/ro_RO
b91dc38
-wx/tools/Editra/locale/ro_RO/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/ru_RU
b91dc38
-wx/tools/Editra/locale/ru_RU/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/sk_SK
b91dc38
-wx/tools/Editra/locale/sk_SK/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/sl_SI
b91dc38
-wx/tools/Editra/locale/sl_SI/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/sr_RS
b91dc38
-wx/tools/Editra/locale/sr_RS/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/sv_SE
b91dc38
-wx/tools/Editra/locale/sv_SE/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/tr_TR
b91dc38
-wx/tools/Editra/locale/tr_TR/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/uk_UA
b91dc38
-wx/tools/Editra/locale/uk_UA/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/zh_CN
b91dc38
-wx/tools/Editra/locale/zh_CN/LC_MESSAGES
b91dc38
-wx/tools/Editra/locale/zh_TW
b91dc38
-wx/tools/Editra/locale/zh_TW/LC_MESSAGES
b91dc38
-wx/tools/Editra/pixmaps
b91dc38
-wx/tools/Editra/pixmaps/theme
b91dc38
-wx/tools/Editra/pixmaps/theme/Default
b91dc38
-wx/tools/Editra/pixmaps/theme/Tango
b91dc38
-wx/tools/Editra/pixmaps/theme/Tango/menu
b91dc38
-wx/tools/Editra/pixmaps/theme/Tango/mime
b91dc38
-wx/tools/Editra/pixmaps/theme/Tango/other
b91dc38
-wx/tools/Editra/pixmaps/theme/Tango/toolbar
b91dc38
-wx/tools/Editra/pixmaps/theme/Tango/other
b91dc38
-wx/tools/Editra/plugins
b91dc38
-wx/tools/Editra/plugins/codebrowser
b91dc38
-wx/tools/Editra/plugins/codebrowser/codebrowser
b91dc38
-wx/tools/Editra/plugins/codebrowser/codebrowser/gentag
b91dc38
-wx/tools/Editra/plugins/filebrowser
b91dc38
-wx/tools/Editra/plugins/filebrowser/filebrowser
b91dc38
-wx/tools/Editra/plugins/hello
b91dc38
-wx/tools/Editra/plugins/hello/hello
b91dc38
-wx/tools/Editra/plugins/Launch
b91dc38
-wx/tools/Editra/plugins/Launch/launch
b91dc38
-wx/tools/Editra/plugins/pyshell
b91dc38
-wx/tools/Editra/plugins/pyshell/pyshell
b91dc38
-wx/tools/Editra/scripts
b91dc38
-wx/tools/Editra/scripts/i18n
b91dc38
-wx/tools/Editra/src
b91dc38
-wx/tools/Editra/src/autocomp
b91dc38
-wx/tools/Editra/src/ebmlib
b91dc38
-wx/tools/Editra/src/eclib
b91dc38
-wx/tools/Editra/src/extern
b91dc38
-wx/tools/Editra/src/extern/aui
b91dc38
-wx/tools/Editra/src/extern/pygments
b91dc38
-wx/tools/Editra/src/extern/pygments/filters
b91dc38
-wx/tools/Editra/src/extern/pygments/formatters
b91dc38
-wx/tools/Editra/src/extern/pygments/lexers
b91dc38
-wx/tools/Editra/src/extern/pygments/styles
b91dc38
-wx/tools/Editra/src/syntax
b91dc38
-wx/tools/Editra/styles
b91dc38
-wx/tools/Editra/templates
b91dc38
-wx/tools/Editra/tests/syntax
b91dc38
 
b91dc38
 wxversion
b91dc38
diff --git a/wxPython/setup.py b/wxPython/setup.py
b91dc38
index 35ce514..76fe6d1 100755
b91dc38
--- a/wxPython/setup.py
b91dc38
+++ b/wxPython/setup.py
b91dc38
@@ -897,13 +897,6 @@ WX_PKGLIST =      [ 'wx',
b91dc38
                     'wx.tools',
b91dc38
                     'wx.tools.XRCed',
b91dc38
                     'wx.tools.XRCed.plugins',
b91dc38
-                    'wx.tools.Editra',
b91dc38
-                    'wx.tools.Editra.src',
b91dc38
-                    'wx.tools.Editra.src.autocomp',
b91dc38
-                    'wx.tools.Editra.src.eclib',
b91dc38
-                    'wx.tools.Editra.src.ebmlib',
b91dc38
-                    'wx.tools.Editra.src.extern',
b91dc38
-                    'wx.tools.Editra.src.syntax',
b91dc38
                     ]
b91dc38
 
b91dc38
 
b91dc38
@@ -921,7 +914,6 @@ else:
b91dc38
                opj('scripts/pywrap'),
b91dc38
                opj('scripts/pywxrc'),
b91dc38
                opj('scripts/xrced'),
b91dc38
-               opj('scripts/editra'),
b91dc38
                ]
b91dc38
     if os.name == 'nt':
b91dc38
         SCRIPTS.append( opj('scripts/genaxmodule') ) 
b91dc38
@@ -936,16 +928,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb')
b91dc38
 DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx')
b91dc38
 DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png')
b91dc38
 
b91dc38
-DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt')
b91dc38
-DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo')
b91dc38
-DATA_FILES += find_data_files('wx/tools/Editra/pixmaps',
b91dc38
-                              '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING')
b91dc38
-DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg')
b91dc38
-DATA_FILES += find_data_files('wx/tools/Editra/src', 'README')
b91dc38
-DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess')
b91dc38
-DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*')
b91dc38
-DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False)
b91dc38
-
b91dc38
 
b91dc38
 ## import pprint
b91dc38
 ## pprint.pprint(DATA_FILES)
b91dc38
@@ -995,7 +977,6 @@ if EGGing:
b91dc38
                                   'pyshell = wx.py.PyShell:main',
b91dc38
                                   'pywrap = wx.py.PyWrap:main',
b91dc38
                                   'helpviewer = wx.tools.helpviewer:main',
b91dc38
-                                  'editra = wx.tools.Editra.launcher:main',
b91dc38
                                   'xrced = wx.tools.XRCed.xrced:main',
b91dc38
                                   ], 
b91dc38
             },