Changeset 124 for cafu/branches/cafu_to_wx/CaWE/GuiEditor/Commands/Paste.cpp

Timestamp:

08/20/10 15:06:58 (21 months ago)

Author:

Carsten

Message:

Merged latest changes from trunk into branches/cafu_to_wx.

Files:

• cafu/branches/cafu_to_wx/CaWE/GuiEditor/Commands/Paste.cpp (modified) (5 diffs)

cafu/branches/cafu_to_wx/CaWE/GuiEditor/Commands/Paste.cpp

@@ -23 +23 @@
 
 #include "Paste.hpp"
-
 #include "../GuiDocument.hpp"
-
 #include "../EditorData/Window.hpp"
-
 #include "GuiSys/Window.hpp"
 
@@ -78 +75 @@
 {
     wxASSERT(!m_Done);
-
     if (m_Done) return false;
 
@@ -84 +80 @@
     {
         m_Windows[WinNr]->Parent=m_NewParent;
-
         m_NewParent->Children.PushBack(m_Windows[WinNr]);
 
-        // If current window name is not unique within the window structure it was pasted into,
-        // create a new unique name.
-        wxString CurrentWindowName=m_Windows[WinNr]->Name;
-        unsigned long Counter=1;
-
-        while (!(((EditorDataWindowT*)m_Windows[WinNr]->EditorData)->CheckNameUniqueness(m_Windows[WinNr]->Name)))
-        {
-            std::ostringstream NameStream;
-            NameStream << CurrentWindowName << "_" << Counter;
-            Counter++;
-
-            m_Windows[WinNr]->Name=NameStream.str();
-        }
+        // If the name of the window is not unique among its siblings, find a new unique name.
+        ((EditorDataWindowT*)m_Windows[WinNr]->EditorData)->RepairNameUniqueness();
     }
 
@@ -105 +89 @@
 
     m_Done=true;
-
     return true;
 }
@@ -113 +96 @@
 {
     wxASSERT(m_Done);
-
     if (!m_Done) return;