From 9feb48edf372b2eddae01755df9d990ff14ee25b Mon Sep 17 00:00:00 2001 From: "cmanske%netscape.com" Date: Tue, 29 Sep 1998 05:26:13 +0000 Subject: [PATCH] Fixed Delete command inactive when it should be active git-svn-id: svn://10.0.0.236/trunk@11323 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cmd/winfe/edview.cpp | 10 +++++++++- mozilla/cmd/winfe/edview.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mozilla/cmd/winfe/edview.cpp b/mozilla/cmd/winfe/edview.cpp index efa2d92269b..18df2e8ce89 100644 --- a/mozilla/cmd/winfe/edview.cpp +++ b/mozilla/cmd/winfe/edview.cpp @@ -406,7 +406,7 @@ BEGIN_MESSAGE_MAP(CNetscapeEditView, CNetscapeView) ON_UPDATE_COMMAND_UI(ID_DISPLAY_TABLES, OnUpdateDisplayTables) ON_UPDATE_COMMAND_UI(ID_EDIT_COPY, OnUpdateEditCopy) ON_UPDATE_COMMAND_UI(ID_EDIT_CUT, OnUpdateEditCut) - ON_UPDATE_COMMAND_UI(ID_EDIT_DELETE, OnUpdateEditCut) + ON_UPDATE_COMMAND_UI(ID_EDIT_DELETE, OnUpdateDelete) ON_UPDATE_COMMAND_UI(ID_EDIT_PASTE, OnUpdateEditPaste) ON_UPDATE_COMMAND_UI(ID_LOCAL_POPUP, OnCanInteract) ON_UPDATE_COMMAND_UI(ID_FILE_EDITSOURCE, OnCanInteract) @@ -2563,6 +2563,14 @@ BOOL UpdateCanCopyInEditControl(CWnd *pView, CCmdUI* pCmdUI) return TRUE; } +void CNetscapeEditView::OnUpdateDelete(CCmdUI* pCmdUI) +{ + if( EDT_IsSelected(GET_MWCONTEXT) ) + OnUpdateEditCut(pCmdUI); + else + OnCanInteract(pCmdUI); +} + void CNetscapeEditView::OnUpdateEditCut(CCmdUI* pCmdUI) { if( UpdateCanCopyInEditControl(this, pCmdUI) ) diff --git a/mozilla/cmd/winfe/edview.h b/mozilla/cmd/winfe/edview.h index 9e544f514d0..4a339591247 100644 --- a/mozilla/cmd/winfe/edview.h +++ b/mozilla/cmd/winfe/edview.h @@ -477,6 +477,7 @@ protected: afx_msg void OnEditCut(); afx_msg void OnEditDelete(); afx_msg void OnEditPaste(); + afx_msg void OnUpdateDelete(CCmdUI* pCmdUI); afx_msg void OnUpdateEditCut(CCmdUI* pCmdUI); afx_msg void OnUpdateEditCopy(CCmdUI* pCmdUI); afx_msg void OnUpdateEditPaste(CCmdUI* pCmdUI);