default ctor should create an empty/uninitialized buffer, not one with a single chara...

[wxWidgets.git] / wxPython / wx / lib / docview.py

diff --git a/wxPython/wx/lib/docview.py b/wxPython/wx/lib/docview.py
index 7d41d3dfe12109be1590d1b9924520921a2bd2fb..85b6253205acf4b06810cce6e85ca3948cc6b014 100644 (file)
--- a/wxPython/wx/lib/docview.py
+++ b/wxPython/wx/lib/docview.py
@@ -13,6 +13,7 @@
 
 import os
 import os.path
 
 import os
 import os.path

+import shutil

 import wx
 import sys
 _ = wx.GetTranslation
 import wx
 import sys
 _ = wx.GetTranslation


@@ -27,10 +28,12 @@ DOC_MDI = 2
 DOC_NEW = 4
 DOC_SILENT = 8
 DOC_OPEN_ONCE = 16
 DOC_NEW = 4
 DOC_SILENT = 8
 DOC_OPEN_ONCE = 16

+DOC_NO_VIEW = 32

 DEFAULT_DOCMAN_FLAGS = DOC_SDI & DOC_OPEN_ONCE
 
 TEMPLATE_VISIBLE = 1
 TEMPLATE_INVISIBLE = 2
 DEFAULT_DOCMAN_FLAGS = DOC_SDI & DOC_OPEN_ONCE
 
 TEMPLATE_VISIBLE = 1
 TEMPLATE_INVISIBLE = 2

+TEMPLATE_NO_CREATE = (4 | TEMPLATE_VISIBLE)

 DEFAULT_TEMPLATE_FLAGS = TEMPLATE_VISIBLE
 
 MAX_FILE_HISTORY = 9
 DEFAULT_TEMPLATE_FLAGS = TEMPLATE_VISIBLE
 
 MAX_FILE_HISTORY = 9


@@ -436,6 +439,7 @@ class Document(wx.EvtHandler):
 
         backupFilename = None
         fileObject = None
 
         backupFilename = None
         fileObject = None

+        copied = False

         try:
             # if current file exists, move it to a safe place temporarily
             if os.path.exists(filename):
         try:
             # if current file exists, move it to a safe place temporarily
             if os.path.exists(filename):


@@ -453,7 +457,8 @@ class Document(wx.EvtHandler):
                 while os.path.exists(backupFilename):
                     i += 1
                     backupFilename = "%s.bak%s" % (filename, i)
                 while os.path.exists(backupFilename):
                     i += 1
                     backupFilename = "%s.bak%s" % (filename, i)

-                os.rename(filename, backupFilename)
+                shutil.copy(filename, backupFilename)
+                copied = True

 
             fileObject = file(filename, 'w')
             self.SaveObject(fileObject)
 
             fileObject = file(filename, 'w')
             self.SaveObject(fileObject)


@@ -470,11 +475,9 @@ class Document(wx.EvtHandler):
             if fileObject:
                 fileObject.close()  # file is still open, close it, need to do this before removal 
 
             if fileObject:
                 fileObject.close()  # file is still open, close it, need to do this before removal 
 

-            # save failed, restore old file
-            if backupFilename:
-                os.remove(filename)
-                os.rename(backupFilename, filename)
-                self.SetDocumentModificationDate()
+            # save failed, remove copied file
+            if backupFilename and copied:
+                os.remove(backupFilename)

 
             wx.MessageBox("Could not save '%s'.  %s" % (FileNameFromPath(filename), sys.exc_value),
                           msgTitle,
 
             wx.MessageBox("Could not save '%s'.  %s" % (FileNameFromPath(filename), sys.exc_value),
                           msgTitle,


@@ -679,8 +682,10 @@ class Document(wx.EvtHandler):
         """
         The default implementation calls DeleteContents (an empty
         implementation) sets the modified flag to false. Override this to
         """
         The default implementation calls DeleteContents (an empty
         implementation) sets the modified flag to false. Override this to

-        supply additional behaviour when the document is closed with Close.
+        supply additional behaviour when the document is opened with Open.

         """
         """

+        if flags & DOC_NO_VIEW:
+            return True

         return self.GetDocumentTemplate().CreateView(self, flags)
 
 
         return self.GetDocumentTemplate().CreateView(self, flags)
 
 


@@ -911,11 +916,11 @@ class View(wx.EvtHandler):
         Call this from your view frame's OnActivate member to tell the
         framework which view is currently active. If your windowing system
         doesn't call OnActivate, you may need to call this function from
         Call this from your view frame's OnActivate member to tell the
         framework which view is currently active. If your windowing system
         doesn't call OnActivate, you may need to call this function from

-        OnMenuCommand or any place where you know the view must be active, and
+        any place where you know the view must be active, and

         the framework will need to get the current view.
 
         The prepackaged view frame wxDocChildFrame calls wxView.Activate from
         the framework will need to get the current view.
 
         The prepackaged view frame wxDocChildFrame calls wxView.Activate from

-        its OnActivate member and from its OnMenuCommand member.
+        its OnActivate member.

         """
         if self.GetDocument() and self.GetDocumentManager():
             self.OnActivateView(activate, self, self.GetDocumentManager().GetCurrentView())
         """
         if self.GetDocument() and self.GetDocumentManager():
             self.OnActivateView(activate, self, self.GetDocumentManager().GetCurrentView())


@@ -1192,6 +1197,16 @@ class DocTemplate(wx.Object):
         return (self._flags & TEMPLATE_VISIBLE) == TEMPLATE_VISIBLE
 
 
         return (self._flags & TEMPLATE_VISIBLE) == TEMPLATE_VISIBLE
 
 

+    def IsNewable(self):
+        """
+        Returns true if the document template can be shown in "New" dialogs,
+        false otherwise.
+        
+        This method has been added to wxPython and is not in wxWindows.
+        """
+        return (self._flags & TEMPLATE_NO_CREATE) != TEMPLATE_NO_CREATE
+        
+

     def GetDocumentName(self):
         """
         Returns the document type name, as passed to the document template
     def GetDocumentName(self):
         """
         Returns the document type name, as passed to the document template


@@ -1247,14 +1262,11 @@ class DocTemplate(wx.Object):
         Returns True if the path's extension matches one of this template's
         file filter extensions.
         """
         Returns True if the path's extension matches one of this template's
         file filter extensions.
         """

-##        print "*** path", path
-##        if "*.*" in self.GetFileFilter():
-##            return True
-##            

         ext = FindExtension(path)
         if not ext: return False
         ext = FindExtension(path)
         if not ext: return False

-        return ext in self.GetFileFilter()
-        # return self.GetDefaultExtension() == FindExtension(path)
+        
+        extList = self.GetFileFilter().replace('*','').split(';')
+        return ext in extList

 
 
 class DocManager(wx.EvtHandler):
 
 
 class DocManager(wx.EvtHandler):


@@ -1805,7 +1817,13 @@ class DocManager(wx.EvtHandler):
         will delete the oldest currently loaded document before creating a new
         one.
 
         will delete the oldest currently loaded document before creating a new
         one.
 

-        wxPython version supports the document manager's wx.lib.docview.DOC_OPEN_ONCE flag.
+        wxPython version supports the document manager's wx.lib.docview.DOC_OPEN_ONCE
+        and wx.lib.docview.DOC_NO_VIEW flag.
+        
+        if wx.lib.docview.DOC_OPEN_ONCE is present, trying to open the same file multiple 
+        times will just return the same document.
+        if wx.lib.docview.DOC_NO_VIEW is present, opening a file will generate the document,
+        but not generate a corresponding view.

         """
         templates = []
         for temp in self._templates:
         """
         templates = []
         for temp in self._templates:


@@ -1820,16 +1838,13 @@ class DocManager(wx.EvtHandler):
                return None
 
         if flags & DOC_NEW:
                return None
 
         if flags & DOC_NEW:

+            for temp in templates[:]:
+                if not temp.IsNewable():
+                    templates.remove(temp)

             if len(templates) == 1:
                 temp = templates[0]
             if len(templates) == 1:
                 temp = templates[0]

-                newDoc = temp.CreateDocument(path, flags)
-                if newDoc:
-                    newDoc.SetDocumentName(temp.GetDocumentName())
-                    newDoc.SetDocumentTemplate(temp)
-                    newDoc.OnNewDocument()
-                return newDoc
-
-            temp = self.SelectDocumentType(templates)
+            else:
+                temp = self.SelectDocumentType(templates)

             if temp:
                 newDoc = temp.CreateDocument(path, flags)
                 if newDoc:
             if temp:
                 newDoc = temp.CreateDocument(path, flags)
                 if newDoc:


@@ -1868,7 +1883,12 @@ class DocManager(wx.EvtHandler):
                             document.SetDocumentModificationDate()
 
                     firstView = document.GetFirstView()
                             document.SetDocumentModificationDate()
 
                     firstView = document.GetFirstView()

-                    if firstView and firstView.GetFrame():
+                    if not firstView and not (flags & DOC_NO_VIEW):
+                        document.GetDocumentTemplate().CreateView(document, flags)
+                        document.UpdateAllViews()
+                        firstView = document.GetFirstView()
+                        
+                    if firstView and firstView.GetFrame() and not (flags & DOC_NO_VIEW):

                         firstView.GetFrame().SetFocus()  # Not in wxWindows code but useful nonetheless
                         if hasattr(firstView.GetFrame(), "IsIconized") and firstView.GetFrame().IsIconized():  # Not in wxWindows code but useful nonetheless
                             firstView.GetFrame().Iconize(False)
                         firstView.GetFrame().SetFocus()  # Not in wxWindows code but useful nonetheless
                         if hasattr(firstView.GetFrame(), "IsIconized") and firstView.GetFrame().IsIconized():  # Not in wxWindows code but useful nonetheless
                             firstView.GetFrame().Iconize(False)


@@ -1881,7 +1901,9 @@ class DocManager(wx.EvtHandler):
                 newDoc.SetDocumentTemplate(temp)
                 if not newDoc.OnOpenDocument(path):
                     newDoc.DeleteAllViews()  # Implicitly deleted by DeleteAllViews
                 newDoc.SetDocumentTemplate(temp)
                 if not newDoc.OnOpenDocument(path):
                     newDoc.DeleteAllViews()  # Implicitly deleted by DeleteAllViews

-                    newDoc.GetFirstView().GetFrame().Destroy() # DeleteAllViews doesn't get rid of the frame, so we'll explicitly destroy it.
+                    frame = newDoc.GetFirstView().GetFrame()
+                    if frame:
+                        frame.Destroy() # DeleteAllViews doesn't get rid of the frame, so we'll explicitly destroy it.

                     return None
                 self.AddFileToHistory(path)
             return newDoc
                     return None
                 self.AddFileToHistory(path)
             return newDoc


@@ -1889,7 +1911,7 @@ class DocManager(wx.EvtHandler):
         return None
 
 
         return None
 
 

-    def CreateView(self, document, flags=0):
+    def CreateView(self, doc, flags=0):

         """
         Creates a new view for the given document. If more than one view is
         allowed for the document (by virtue of multiple templates mentioning
         """
         Creates a new view for the given document. If more than one view is
         allowed for the document (by virtue of multiple templates mentioning


@@ -2120,41 +2142,32 @@ class DocManager(wx.EvtHandler):
         This function is used in wxDocManager.CreateDocument.
         """
         if wx.Platform == "__WXMSW__" or wx.Platform == "__WXGTK__" or wx.Platform == "__WXMAC__":
         This function is used in wxDocManager.CreateDocument.
         """
         if wx.Platform == "__WXMSW__" or wx.Platform == "__WXGTK__" or wx.Platform == "__WXMAC__":

-            allfilter = ''

             descr = ''
             for temp in templates:
                 if temp.IsVisible():
                     if len(descr) > 0:
                         descr = descr + _('|')
             descr = ''
             for temp in templates:
                 if temp.IsVisible():
                     if len(descr) > 0:
                         descr = descr + _('|')

-                        allfilter = allfilter + _(';')

                     descr = descr + temp.GetDescription() + _(" (") + temp.GetFileFilter() + _(") |") + temp.GetFileFilter()  # spacing is important, make sure there is no space after the "|", it causes a bug on wx_gtk
                     descr = descr + temp.GetDescription() + _(" (") + temp.GetFileFilter() + _(") |") + temp.GetFileFilter()  # spacing is important, make sure there is no space after the "|", it causes a bug on wx_gtk

-                    allfilter = allfilter + temp.GetFileFilter()
-            descr = _("All (%s)|%s|%s|Any (*.*) | *.*") %  (allfilter, allfilter, descr)  # spacing is important, make sure there is no space after the "|", it causes a bug on wx_gtk
+            descr = _("All (*.*)|*.*|%s") % descr  # spacing is important, make sure there is no space after the "|", it causes a bug on wx_gtk

         else:
             descr = _("*.*")
 
         else:
             descr = _("*.*")
 

-        path = wx.FileSelector(_("Select a File"),
-                               self._lastDirectory,
-                               _(""),
-                               wildcard = descr,
-                               flags = wx.HIDE_READONLY,
-                               parent = self.FindSuitableParent())
-        if path:
-            if not FileExists(path):
-                msgTitle = wx.GetApp().GetAppName()
-                if not msgTitle:
-                    msgTitle = _("File Error")
-                    wx.MessageBox("Could not open '%s'." % FileNameFromPath(path),
-                          msgTitle,
-                          wx.OK | wx.ICON_EXCLAMATION,
-                          parent)
-                    return (None, None)
-            self._lastDirectory = PathOnly(path)
-
+        dlg = wx.FileDialog(self.FindSuitableParent(),
+                               _("Select a File"),
+                               wildcard=descr,
+                               style=wx.OPEN|wx.FILE_MUST_EXIST|wx.CHANGE_DIR)
+        # dlg.CenterOnParent()  # wxBug: caused crash with wx.FileDialog
+        if dlg.ShowModal() == wx.ID_OK:
+            path = dlg.GetPath()
+        else:
+            path = None
+        dlg.Destroy()
+            
+        if path:  

             theTemplate = self.FindTemplateForPath(path)
             return (theTemplate, path)
             theTemplate = self.FindTemplateForPath(path)
             return (theTemplate, path)

-
-        return (None, None)
+        
+        return (None, None)           

 
 
     def OnOpenFileFailure(self):
 
 
     def OnOpenFileFailure(self):


@@ -2793,8 +2806,10 @@ class DocMDIChildFrame(wx.MDIChildFrame):
                 self._childView.Activate(False)
                 self._childView.Destroy()
                 self._childView = None
                 self._childView.Activate(False)
                 self._childView.Destroy()
                 self._childView = None

-                if self._childDocument:
-                    self._childDocument.Destroy()  # This isn't in the wxWindows codebase but the document needs to be disposed of somehow
+                if self._childDocument:  # This isn't in the wxWindows codebase but the document needs to be disposed of somehow
+                    self._childDocument.DeleteContents()
+                    if self._childDocument.GetDocumentManager():
+                        self._childDocument.GetDocumentManager().RemoveDocument(self._childDocument)

                 self._childDocument = None
                 self.Destroy()
             else:
                 self._childDocument = None
                 self.Destroy()
             else:


@@ -2881,7 +2896,7 @@ class DocPrintout(wx.Printout):
         """
         Not quite sure why this was overridden, but it was in wxWindows! :)
         """
         """
         Not quite sure why this was overridden, but it was in wxWindows! :)
         """

-        if not wx.Printout.base_OnBeginDocument(self, startPage, endPage):
+        if not wx.Printout.OnBeginDocument(self, startPage, endPage):

             return False
         return True
 
             return False
         return True
 


@@ -3152,8 +3167,10 @@ class CommandProcessor(wx.Object):
         the history list.
         """
         done = command.Do()
         the history list.
         """
         done = command.Do()

-        if done and storeIt:
-            self._commands.append(command)
+        if done:
+            del self._redoCommands[:]
+            if storeIt:
+                self._commands.append(command)

         if self._maxCommands > -1:
             if len(self._commands) > self._maxCommands:
                 del self._commands[0]
         if self._maxCommands > -1:
             if len(self._commands) > self._maxCommands:
                 del self._commands[0]