From e757654cd8f9bb5f687694f9142e75ece3586a3a Mon Sep 17 00:00:00 2001
From: "Patrick K. O'Brien" <pobrien@orbtech.com>
Date: Sun, 25 Jan 2004 23:37:41 +0000
Subject: [PATCH] Minor cleanup for 2.5.  Upped version to 0.9.4.  Removed use
 of decorators.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/wx/py/CHANGES.txt | 18 +++++++++++++++++-
 wxPython/wx/py/README.txt  | 12 ++++++++----
 wxPython/wx/py/crust.py    | 28 ++++++++++++++--------------
 wxPython/wx/py/shell.py    |  3 ---
 wxPython/wx/py/version.py  |  2 +-
 5 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/wxPython/wx/py/CHANGES.txt b/wxPython/wx/py/CHANGES.txt
index 572f2a9529..26d33cd436 100644
--- a/wxPython/wx/py/CHANGES.txt
+++ b/wxPython/wx/py/CHANGES.txt
@@ -1,5 +1,21 @@
+0.9.4 (1/25/2004 to //2004)
+------------------------------
+
+Removed wxd decorators in favor of new SWIG-generated docstrings.
+
+Removed docs tabs from crust interface:
+* wxPython Docs
+* wxSTC Docs
+
+
+0.9.3 (9/25/2003 to 1/24/2004)
+------------------------------
+
+Fun and games with dynamic renaming.  Details of any other changes
+were lost in the confusion.  I'll try to do better in the future.
+
 
-0.9.2 (5/3/2003 to //2003)
+0.9.2 (5/3/2003 to 9/25/2003)
 -----------------------------
 
 Changed to the new prefix-less "wx" package::
diff --git a/wxPython/wx/py/README.txt b/wxPython/wx/py/README.txt
index b6a0126705..2d70db7424 100644
--- a/wxPython/wx/py/README.txt
+++ b/wxPython/wx/py/README.txt
@@ -30,7 +30,7 @@ build a Python program without a PyCrust either.
 What else do I need to use PyCrust?
 -----------------------------------
 
-PyCrust requires Python 2.1.3 or later, and wxPython 2.4 or later.
+PyCrust requires Python 2.2 or later, and wxPython 2.4 or later.
 PyCrust uses wxPython and the Scintilla wrapper (wxStyledTextCtrl).
 Python is available at http://www.python.org/.  wxPython is available
 at http://www.wxpython.org/.
@@ -40,16 +40,20 @@ Where can I get the latest version of PyCrust?
 ----------------------------------------------
 
 The latest production version ships with wxPython.  The latest
-developer version is available in CVS at:
-http://sourceforge.net/cvs/?group_id=31263
+developer version is available in the wxWindows CVS at:
+http://cvs.wxwindows.org/viewcvs.cgi/
 
 
 Where is the PyCrust project hosted?
 ------------------------------------
 
-At SourceForge, of course. The SourceForge summary page:
+The old answer was "At SourceForge, of course." The SourceForge
+summary page is still available at:
 http://sourceforge.net/projects/pycrust/
 
+The new answer is that there is no longer a need for a separate
+project.  Simply install wxPython and you'll have everything you need.
+
 
 I found a bug in PyCrust, what do I do with it?
 -----------------------------------------------
diff --git a/wxPython/wx/py/crust.py b/wxPython/wx/py/crust.py
index c7ac81fa92..2aa6b89276 100644
--- a/wxPython/wx/py/crust.py
+++ b/wxPython/wx/py/crust.py
@@ -62,20 +62,20 @@ class Crust(wx.SplitterWindow):
         self.notebook.AddPage(page=self.sessionlisting, text='Session')
         self.dispatcherlisting = DispatcherListing(parent=self.notebook)
         self.notebook.AddPage(page=self.dispatcherlisting, text='Dispatcher')
-        from wxd import wx_
-        self.wxdocs = Filling(parent=self.notebook, 
-                              rootObject=wx_,
-                              rootLabel='wx', 
-                              rootIsNamespace=False,
-                              static=True)
-        self.notebook.AddPage(page=self.wxdocs, text='wxPython Docs')
-        from wxd import stc_
-        self.stcdocs = Filling(parent=self.notebook, 
-                               rootObject=stc_.StyledTextCtrl,
-                               rootLabel='StyledTextCtrl', 
-                               rootIsNamespace=False,
-                               static=True)
-        self.notebook.AddPage(page=self.stcdocs, text='StyledTextCtrl Docs')
+##         from wxd import wx_
+##         self.wxdocs = Filling(parent=self.notebook, 
+##                               rootObject=wx_,
+##                               rootLabel='wx', 
+##                               rootIsNamespace=False,
+##                               static=True)
+##         self.notebook.AddPage(page=self.wxdocs, text='wxPython Docs')
+##         from wxd import stc_
+##         self.stcdocs = Filling(parent=self.notebook, 
+##                                rootObject=stc_.StyledTextCtrl,
+##                                rootLabel='StyledTextCtrl', 
+##                                rootIsNamespace=False,
+##                                static=True)
+##         self.notebook.AddPage(page=self.stcdocs, text='StyledTextCtrl Docs')
         self.SplitHorizontally(self.shell, self.notebook, 300)
         self.SetMinimumPaneSize(1)
 
diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py
index a3ad8b7a72..5c343c6b77 100644
--- a/wxPython/wx/py/shell.py
+++ b/wxPython/wx/py/shell.py
@@ -8,9 +8,6 @@ __author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-#from wxd.d_wx import wx
-#from wxd.d_stc import stc
-
 import wx
 from wx import stc
 
diff --git a/wxPython/wx/py/version.py b/wxPython/wx/py/version.py
index 469a43cbce..76a8cd87dc 100644
--- a/wxPython/wx/py/version.py
+++ b/wxPython/wx/py/version.py
@@ -6,4 +6,4 @@ __author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-VERSION = '0.9.3'
+VERSION = '0.9.4'
-- 
2.47.2