Changeset 124 for cafu/branches/cafu_to_wx/CaWE/GuiEditor/ChildFrame.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/ChildFrame.cpp (modified) (4 diffs)

cafu/branches/cafu_to_wx/CaWE/GuiEditor/ChildFrame.cpp

@@ -497 +497 @@
 {
     SubmitCommand(new CommandDeleteT(m_GuiDocument, m_GuiDocument->GetSelection()));
-    SubmitCommand(CommandSelectT::Clear(m_GuiDocument));
 }
 
@@ -519 +518 @@
 void GuiEditor::ChildFrameT::OnUpdateEditCutCopyDelete(wxUpdateUIEvent& UE)
 {
-    if (m_GuiDocument->GetSelection().Size()>0) UE.Enable(true);
-    else                                        UE.Enable(false);
+    UE.Enable(m_GuiDocument->GetSelection().Size()>0);
 }
 
@@ -526 +524 @@
 void GuiEditor::ChildFrameT::OnUpdateEditPaste(wxUpdateUIEvent& UE)
 {
-    if (ClipBoard.Size()>0 && m_GuiDocument->GetSelection().Size()==1) UE.Enable(true);
-    else                                                               UE.Enable(false);
+    UE.Enable(ClipBoard.Size()>0 && m_GuiDocument->GetSelection().Size()==1);
 }
 
@@ -702 +699 @@
         case ID_TOOLBAR_WINDOW_DELETE:
             SubmitCommand(new CommandDeleteT(m_GuiDocument, m_GuiDocument->GetSelection()));
-            SubmitCommand(CommandSelectT::Clear(m_GuiDocument));
             break;