little tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index bd0785da86b3839327e4b9c8400e7886ab84df24..cce8c7b333ed0d62190d3b3b7651e8e71fb9d691 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -30,7 +30,7 @@ import images
 
 _treeList = [
     # new stuff
-    ('Recent Additions and Updates', [
+    ('Recent Additions/Updates', [
         'OGL',
         'FloatCanvas',
         ]),

diff --git a/wxPython/distrib/makedocs b/wxPython/distrib/makedocs
index 4fb5faf345bfeee8a5d6873f6579d33b999f60f4..682b6b7a8e3521ab42903419536de3ddf786307a 100755 (executable)
--- a/wxPython/distrib/makedocs
+++ b/wxPython/distrib/makedocs
@@ -12,18 +12,20 @@ VERSION=`python -c "import setup;print setup.VERSION"`
 CONTRIBS="ogl gizmos"
 DEST=wxPython-$VERSION/docs
 
+
 # **** Make a directory to build up a distribution tree
 mkdir -p _build_docs/$DEST
 cd _build_docs
 mkdir $DEST/wx
 
 WXDIR=../..
+INI=$WXDIR/docs/latex/wx/tex2rtf.ini
 
 # **** Build the main docs using tex2rtf
 echo "****" main "****"
 cp $WXDIR/docs/latex/wx/*.gif $DEST/wx
 cp $WXDIR/docs/latex/wx/*.css $DEST/wx
-$WXDIR/utils/tex2rtf/src/tex2rtf $WXDIR/docs/latex/wx/manual.tex $DEST/wx/wx.html -twice -html -macros $WXDIR/docs/latex/wx/tex2rtf.ini
+tex2rtf $WXDIR/docs/latex/wx/manual.tex $DEST/wx/wx.html -twice -html -macros $INI
 cp $DEST/wx/wx_contents.html $DEST/wx/index.html
 cp $DEST/wx/* $WXDIR/docs/html/wx
 
@@ -33,7 +35,7 @@ for c in $CONTRIBS; do
     mkdir $DEST/$c
     cp $WXDIR/contrib/docs/latex/$c/*.gif $DEST/$c
     cp $WXDIR/contrib/docs/latex/$c/*.bmp $DEST/$c
-    $WXDIR/utils/tex2rtf/src/tex2rtf $WXDIR/contrib/docs/latex/$c/$c.tex $DEST/$c/$c.html -twice -html -macros $WXDIR/docs/latex/wx/tex2rtf.ini
+    tex2rtf $WXDIR/contrib/docs/latex/$c/$c.tex $DEST/$c/$c.html -twice -html -macros $INI
     cp $DEST/$c/$c.html $DEST/$c/index.html || cp $DEST/$c/${c}_contents.html $DEST/$c/index.html
 done
 

diff --git a/wxPython/docs/bin/makeapidocs b/wxPython/docs/bin/makeapidocs
index de3666f460a2c9f3a45fb9f03a01a14709c631ef..27e3d6713a2d68dc42b5171048a0ce57ca36d52f 100755 (executable)
--- a/wxPython/docs/bin/makeapidocs
+++ b/wxPython/docs/bin/makeapidocs
@@ -10,6 +10,8 @@ fi
 
 rm -r docs/api/*
 
+export PTYHONPATH=$PWD
+
 epydoc --name wxPython \
     --html \
     --output docs/api \
@@ -19,12 +21,21 @@ epydoc --name wxPython \
     --no-private \
     --css docs/wxPython-epydoc.css \
     --docformat restructuredtext \
+    --url http://wxPython.org/ \
+    --no-frames \
     $* \
-    ./wx/__init__.py
+    wx
+
+#    wx/__init__.py \
+
+#    wx/calendar.py wx/grid.py wx/html.py wx/wizard.py \
+#    wx/gizmos.py wx/ogl.py wx/stc.py wx/xrc.py
+
 
 #    --no-frames \
 #    --docformat epytext \
 #    --debug \
+#    --inheritance grouped \
 
 
 # TODO: