Bug: [ 1538340 ] Undo enabled for folder compare.

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 23d088b..811ca69 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -2,6 +2,10 @@ Src\Changes.txt
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-08-13 Gal
+ BUG: [ 1538340 ] Undo enabled for folder compare.
+  Src: DirView.h DirView.cpp
+
 2006-08-13 Takashi
  Japanese translation - update
   Src/Languages/Japanese/MergeJapanese.rc

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index b682210..1232e47 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -192,6 +192,7 @@ BEGIN_MESSAGE_MAP(CDirView, CListView)
        ON_COMMAND(ID_EDIT_CUT, OnEditCut)
        ON_COMMAND(ID_EDIT_PASTE, OnEditPaste)
        ON_COMMAND(ID_EDIT_UNDO, OnEditUndo)
+       ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo)
        //}}AFX_MSG_MAP
        ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
        ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged)
@@ -3034,3 +3035,20 @@ void CDirView::OnEditUndo()
                pEdit->Undo();
        }
 }
+
+/**
+ * @brief Update the tool bar's "Undo" icon. It should be enabled when
+ * renaming an item and undo is possible.
+ */
+void CDirView::OnUpdateEditUndo(CCmdUI* pCmdUI)
+{
+       CEdit *pEdit = m_pList->GetEditControl();
+       if (NULL != pEdit)
+       {
+               pCmdUI->Enable(pEdit->CanUndo());
+       }
+       else
+       {
+               pCmdUI->Enable(FALSE);
+       }
+}

diff --git a/Src/DirView.h b/Src/DirView.h
index 93c6794..9aafef9 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -366,6 +366,7 @@ protected:
        afx_msg void OnEditCut();
        afx_msg void OnEditPaste();
        afx_msg void OnEditUndo();
+       afx_msg void OnUpdateEditUndo(CCmdUI* pCmdUI);
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
        BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);