Changeset 8 for trunk/src/widgets/qtextedit.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/widgets/qtextedit.cpp (modified) (14 diffs)

trunk/src/widgets/qtextedit.cpp

@@ -1162 +1162 @@
             case Key_Home:
             case Key_End:
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
             case Key_Insert:
             case Key_Delete:
@@ -1172 +1172 @@
         } else {
             switch ( ke->key() ) {
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
             case Key_Insert:
                 ke->accept();
@@ -1276 +1276 @@
         break;
     case Key_Delete:
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
         if ( e->state() & ShiftButton ) {
             cut();
@@ -1294 +1294 @@
         if ( e->state() & ShiftButton )
             paste();
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
         else if ( e->state() & ControlButton )
             copy();
@@ -1302 +1302 @@
         break;
     case Key_Backspace:
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
         if ( e->state() & AltButton ) {
             if (e->state() & ControlButton ) {
@@ -1517 +1517 @@
                     doKeyboardAction( ActionKill );
                     break;
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined (Q_WS_PM)
                 case Key_Insert:
                     copy();
@@ -2408 +2408 @@
             emitLinkClicked( u.toString( FALSE, FALSE ) );
         }
+#ifndef QT_NO_TEXTBROWSER
         if (::qt_cast<QTextBrowser*>(this)) { // change for 4.0
             QConnectionList *clist = receivers(
@@ -2418 +2419 @@
             }
         }
+#endif        
 
         // emitting linkClicked() may result in that the cursor winds
@@ -4724 +4726 @@
             }
             if (!doc->focusIndicator.name.isEmpty()) {
+#ifndef QT_NO_TEXTBROWSER
                 if (::qt_cast<QTextBrowser*>(this)) { // change for 4.0
                     QConnectionList *clist = receivers(
@@ -4736 +4739 @@
                     }
                 }
+#endif                
             }
 #ifndef QT_NO_CURSOR
@@ -4749 +4753 @@
                 copy();
                 break;
-#ifdef Q_WS_WIN
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
             case Key_Insert:
                 copy();
@@ -5010 +5014 @@
         }
     } else {
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined (Q_OS_OS2)
         // Need to convert CRLF to LF
         t.replace( "\r\n", "\n" );
@@ -6692 +6696 @@
     int endLine = startLine + nLines;
 
-    if ( startLine >= d->od->numLines )
-        return;
+    if ( startLine >= d->od->numLines ) {
+#if defined (Q_WS_PM)
+        // see below for more info
+        p->eraseRect( clipx, clipy, clipw, cliph );
+#endif
+        return;
+    }
+    
     if ( (startLine + nLines) > d->od->numLines )
         nLines = d->od->numLines - startLine;
@@ -6842 +6852 @@
     td->draw( p, r.x(), r.y(), r.width(), r.height(), colorGroup() );
     p->translate( 0, -(clipy - offset) );
+    
+#if defined (Q_WS_PM)
+    // QTextEdit has WResizeNoErase and WRepaintNoErase flags (actually applied
+    // to the viewport()), so we must erase areas not covered by the text doc.
+    // [Win32 version feels ok without this, because it doesn't actually
+    // fully obey WResizeNoErase and WRepaintNoErase: WM_ERASEBKGND always
+    // erases the background before WM_PAINT and after every resize].
+    
+    int tw = td->width();
+    // calculate the height the text doc will occupy starting with clipy
+    int th = td->height() - offset;  
+    if ( clipx + clipw > td->width() ) {
+        // erase background to the left of every line
+        p->eraseRect( tw, clipy, clipx + clipw - tw, th );
+    }
+    if ( cliph > th ) {
+        // erase background under the text doc
+        p->eraseRect( clipx, clipy + th, clipw, cliph - th );
+    }
+#endif
+    
     delete td;
 }