ignore warning 4535 for VC8 too as it still seems to be harmless

[wxWidgets.git] / wxPython / distrib / viewdocs.py

diff --git a/wxPython/distrib/viewdocs.py b/wxPython/distrib/viewdocs.py
index efcd59b5231889ecff007cc709ad41f16dd4f879..01151c1902d1519b94fbca58c9f0687a8b37a8de 100755 (executable)
--- a/wxPython/distrib/viewdocs.py
+++ b/wxPython/distrib/viewdocs.py
@@ -2,7 +2,8 @@
 #---------------------------------------------------------------------------
 
 import sys, os, glob
 #---------------------------------------------------------------------------
 
 import sys, os, glob

-from wxPython.tools import helpviewer
+import wx
+from wx.tools import helpviewer

 
 
 # Figure out the path where this app is located
 
 
 # Figure out the path where this app is located


@@ -10,22 +11,36 @@ if __name__ == '__main__':
     basePath = os.path.dirname(sys.argv[0])
 else:
     basePath = os.path.dirname(__file__)
     basePath = os.path.dirname(sys.argv[0])
 else:
     basePath = os.path.dirname(__file__)

+if not basePath:
+    basePath = '.'

 
 
 
 

-# setup the args
-args = ['',
+# test for write access
+if os.access(basePath, os.W_OK):
+
+    # setup the args
+    args = ['',

         '--cache='+basePath,
         os.path.join(basePath, 'wx.zip'),
         '--cache='+basePath,
         os.path.join(basePath, 'wx.zip'),

-        os.path.join(basePath, 'ogl.zip'),

         ]
 
         ]
 

-# add any other .zip files found
-for file in glob.glob(os.path.join(basePath, "*.zip")):
-    if file not in args:
-        args.append(file)
+    # add any other .zip files found
+    for file in glob.glob(os.path.join(basePath, "*.zip")):
+        if file not in args:
+            args.append(file)
+
+    # launch helpviewer
+    helpviewer.main(args)

 
 

-# launch helpviewer
-helpviewer.main(args)
+else:
+    app = wx.PySimpleApp()
+    dlg = wx.MessageDialog(None,
+        "The wxDocs need to be located in a directory that is writable by you.  "
+        "I am unable to start the viewer in its current location.",
+                           "Error!", wx.OK|wx.ICON_EXCLAMATION)
+    dlg.ShowModal()
+    dlg.Destroy()
+    app.MainLoop()

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------