From 57def18492f53fcd89d88f23d9924fe88cdc3d5f Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 22 Jul 2011 16:07:57 +0000 Subject: [PATCH] .developing rainbow git-svn-id: svn://ultimatepp.org/upp/trunk@3702 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/CtrlClip.cpp | 2 +- uppsrc/RichEdit/Clip.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/uppsrc/CtrlCore/CtrlClip.cpp b/uppsrc/CtrlCore/CtrlClip.cpp index 9c25484e8..e538d6d53 100644 --- a/uppsrc/CtrlCore/CtrlClip.cpp +++ b/uppsrc/CtrlCore/CtrlClip.cpp @@ -61,7 +61,7 @@ bool PasteClip::Accept(const char *_fmt) { Vector f = Split(_fmt, ';'); for(int i = 0; i < f.GetCount(); i++) { - if(IsAccepted() && fmt == _fmt) + if(IsAccepted() && fmt == f[i]) return paste; if(IsAvailable(f[i])) { accepted = true; diff --git a/uppsrc/RichEdit/Clip.cpp b/uppsrc/RichEdit/Clip.cpp index 8e5cf10e0..e4d0f0147 100644 --- a/uppsrc/RichEdit/Clip.cpp +++ b/uppsrc/RichEdit/Clip.cpp @@ -124,7 +124,8 @@ void RichEdit::DragAndDrop(Point p, PasteClip& d) return; } } - if(!d.IsAccepted()) dropcursor = -1; + if(!d.IsAccepted()) + dropcursor = -1; Rect r = Null; if(dropcursor >= 0 && dropcursor < text.GetLength()) { RichCaret pr = text.GetCaret(dropcursor, pagesz);