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/lang.py
+++ b/wxPython/samples/ide/activegrid/util/lang.py
@@ -65,3 +65,9 @@ def ifDefPy(comment=False):
    
 def endIfDef():
    pass
+    
+def ag_isPHP():
+    return False
+    
+def ag_isPython():
+    return True