X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f1a3f9c1a056e5ae063f020d38a5f40cc5e85ef..d0ee33f5c6908b4ac5e1364381f0ef00942e3936:/wxPython/wx/lib/pydocview.py

diff --git a/wxPython/wx/lib/pydocview.py b/wxPython/wx/lib/pydocview.py
index 90c49aefd0..7c9f8e00c0 100644
--- a/wxPython/wx/lib/pydocview.py
+++ b/wxPython/wx/lib/pydocview.py
@@ -1478,7 +1478,7 @@ class GeneralOptionsPanel(wx.Panel):
                     msgTitle = wx.GetApp().GetAppName()
                     if not msgTitle:
                         msgTitle = _("Document Options")
-                    wx.MessageBox("Document interface changes will not appear until the application is restarted.",
+                    wx.MessageBox(_("Document interface changes will not appear until the application is restarted."),
                                   msgTitle,
                                   wx.OK | wx.ICON_INFORMATION,
                                   self.GetParent())
@@ -1603,7 +1603,7 @@ class DocApp(wx.PySimpleApp):
             args = pickle.loads(data)
             for arg in args:
                 if arg[0] != '/' and arg[0] != '-' and os.path.exists(arg):
-                    self.GetDocumentManager().CreateDocument(arg, wx.lib.docview.DOC_SILENT)
+                    self.GetDocumentManager().CreateDocument(os.path.normpath(arg), wx.lib.docview.DOC_SILENT)
             
             # force display of running app
             topWindow = wx.GetApp().GetTopWindow()
@@ -1624,7 +1624,7 @@ class DocApp(wx.PySimpleApp):
         args = sys.argv[1:]
         for arg in args:
             if arg[0] != '/' and arg[0] != '-' and os.path.exists(arg):
-                self.GetDocumentManager().CreateDocument(arg, wx.lib.docview.DOC_SILENT)
+                self.GetDocumentManager().CreateDocument(os.path.normpath(arg), wx.lib.docview.DOC_SILENT)
 
 
     def GetDocumentManager(self):
@@ -1995,10 +1995,7 @@ class DocApp(wx.PySimpleApp):
             if isinstance(document, ChildDocument) and document.GetParentDocument() == parentDocument:
                 if document.GetFirstView().GetFrame():
                     document.GetFirstView().GetFrame().SetFocus()
-                if document.GetFirstView().OnClose(deleteWindow = False):
-                    if document.GetFirstView().GetFrame():
-                        document.GetFirstView().GetFrame().Close()  # wxBug: Need to do this for some random reason
-                else:
+                if not document.GetFirstView().OnClose():
                     return False
         return True