Merged modifications from the 2.6 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 23:02:03 +00:00
parent a780a8dc19
commit 02b800ce7c
104 changed files with 14102 additions and 46560 deletions
--- a/wxPython/samples/ide/activegrid/util/xmlprettyprinter.py
+++ b/wxPython/samples/ide/activegrid/util/xmlprettyprinter.py
@@ -9,8 +9,10 @@
 # Copyright:    (c) 2004-2005 ActiveGrid, Inc.
 # License:      wxWindows License
 #----------------------------------------------------------------------------
-import xml.sax
 from activegrid.util.lang import *
+ifDefPy()
+import xml.sax
+endIfDef()

 class XMLPrettyPrinter(xml.sax.ContentHandler):
    def __init__(self, indentationChar='    ', newlineChar='\n'):