Changeset 389 for cafu/trunk

Timestamp:

09/20/11 22:56:52 (8 months ago)

Author:

Carsten

Message:

Gui Editor:
Revised handling of "rename window" events.

Location:

cafu/trunk/CaWE/GuiEditor

Files:

• WindowTree.cpp (modified) (2 diffs)
• WindowTree.hpp (modified) (1 diff)
• Windows/EditorWindow.cpp (modified) (1 diff)

cafu/trunk/CaWE/GuiEditor/WindowTree.cpp

@@ -63 +63 @@
     EVT_LEFT_DCLICK          (WindowTreeT::OnTreeLeftClick) // Handle double clicks like normal left clicks when it comes to clicks on tree item icons (otherwise double clicks are handled normally).
     EVT_TREE_SEL_CHANGED     (wxID_ANY, WindowTreeT::OnSelectionChanged)
-    EVT_TREE_END_LABEL_EDIT  (wxID_ANY, WindowTreeT::OnLabelChanged)
+    EVT_TREE_END_LABEL_EDIT  (wxID_ANY, WindowTreeT::OnEndLabelEdit)
     EVT_TREE_ITEM_RIGHT_CLICK(wxID_ANY, WindowTreeT::OnTreeItemRightClick)
     EVT_TREE_BEGIN_DRAG      (wxID_ANY, WindowTreeT::OnBeginDrag)
@@ -398 +398 @@
 
 
-void WindowTreeT::OnLabelChanged(wxTreeEvent& TE)
-{
-    // Emtpy string means the user has either not changed the label at all or
-    // deleted the whole label string.
-    if (TE.GetLabel()=="")
-    {
-        TE.Veto(); // Reset value.
-        return;
-    }
-
+void WindowTreeT::OnEndLabelEdit(wxTreeEvent& TE)
+{
     cf::GuiSys::WindowT* Window=((WindowTreeItemT*)GetItemData(TE.GetItem()))->GetWindow();
 
+    if (TE.IsEditCancelled()) return;
+
     m_IsRecursiveSelfNotify=true;
-
-    if (!m_Parent->SubmitCommand(new CommandModifyWindowT(m_GuiDocument, Window, "Name", Window->GetMemberVar("name"), TE.GetLabel())))
-    {
-        TE.Veto(); // Reset value if not valid.
-    }
+    m_Parent->SubmitCommand(new CommandModifyWindowT(m_GuiDocument, Window, "Name", Window->GetMemberVar("name"), TE.GetLabel()));
+    m_IsRecursiveSelfNotify=false;
 
     // The command may well have set a name different from TE.GetLabel().
     TE.Veto();
     SetItemText(TE.GetItem(), Window->Name);
-
-    m_IsRecursiveSelfNotify=false;
 }
 

cafu/trunk/CaWE/GuiEditor/WindowTree.hpp

@@ -91 +91 @@
         void OnTreeLeftClick     (wxMouseEvent& ME);
         void OnSelectionChanged  (wxTreeEvent&  TE);
-        void OnLabelChanged      (wxTreeEvent&  TE);
+        void OnEndLabelEdit      (wxTreeEvent&  TE);
         void OnTreeItemRightClick(wxTreeEvent&  TE);
         void OnBeginDrag         (wxTreeEvent&  TE);

cafu/trunk/CaWE/GuiEditor/Windows/EditorWindow.cpp

@@ -241 +241 @@
         // Specially treated by command.
         ChildFrame->SubmitCommand(new CommandModifyWindowT(m_GuiDoc, m_Win, PropName, DummyVar, Prop->GetValueAsString()));
+
+        // The command may well have set a name different from Prop->GetValueAsString().
+        wxASSERT(Event.GetEventType() == wxEVT_PG_CHANGED);
+        Event.GetProperty()->SetValueFromString(m_Win->Name);
     }
     else if (PropName=="Visible")