From: <sh...@us...> - 2003-02-07 17:44:28
|
Update of /cvsroot/sim-icq/sim/sim/qt3 In directory sc8-pr-cvs1:/tmp/cvs-serv20630/sim/qt3 Modified Files: qtextedit.cpp qtextedit.h Log Message: Small fixes Index: qtextedit.cpp =================================================================== RCS file: /cvsroot/sim-icq/sim/sim/qt3/qtextedit.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** qtextedit.cpp 15 Dec 2002 02:49:15 -0000 1.8 --- qtextedit.cpp 7 Feb 2003 17:44:23 -0000 1.9 *************** *** 1796,1800 **** return; inDnD = FALSE; - e->acceptAction(); QString text; bool intern = FALSE; --- 1796,1799 ---- *************** *** 1804,1808 **** e->action() == QDropEvent::Move ) { removeSelectedText(); ! intern = TRUE; } else { doc->removeSelection( QTextDocument::Standard ); --- 1803,1808 ---- e->action() == QDropEvent::Move ) { removeSelectedText(); ! intern = TRUE; ! e->acceptAction(); } else { doc->removeSelection( QTextDocument::Standard ); *************** *** 3146,3156 **** return currentAlignment; } ! void QTextEdit::startDrag() { #ifndef QT_NO_DRAGANDDROP mousePressed = FALSE; ! inDoubleClick = FALSE; ! QDragObject *drag = new QTextDrag( doc->selectedText( QTextDocument::Standard ), viewport() ); if ( isReadOnly() ) { drag->dragCopy(); --- 3146,3158 ---- return currentAlignment; } ! void QTextEdit::startDrag() { #ifndef QT_NO_DRAGANDDROP mousePressed = FALSE; ! inDoubleClick = FALSE; ! QString s = selectedText(); ! removeSelection(); ! QDragObject *drag = new QTextDrag( s, this ); if ( isReadOnly() ) { drag->dragCopy(); Index: qtextedit.h =================================================================== RCS file: /cvsroot/sim-icq/sim/sim/qt3/qtextedit.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** qtextedit.h 26 Dec 2002 17:01:21 -0000 1.5 --- qtextedit.h 7 Feb 2003 17:44:23 -0000 1.6 *************** *** 180,184 **** bool hasSelectedText() const; ! QString selectedText() const; bool isUndoAvailable() const; bool isRedoAvailable() const; --- 180,184 ---- bool hasSelectedText() const; ! virtual QString selectedText() const; bool isUndoAvailable() const; bool isRedoAvailable() const; |