Changeset 63

Timestamp:

Feb 25, 2006, 9:58:01 PM (19 years ago)

Author:

dmik

Message:

Fixed QWidget::erase() broken by changeset:61.

Location:

trunk

Files:

• include/qwidget.h (modified) (1 diff)
• src/kernel/qpainter_pm.cpp (modified) (2 diffs)
• src/kernel/qwidget_pm.cpp (modified) (5 diffs)

trunk/include/qwidget.h

@@ -599 +599 @@
     friend class QDragManager;
 #elif defined (Q_WS_PM)
-    enum ClipMode { Unclipped, ClipAll, ClipSiblings }; 
-    HPS getTargetPS( ClipMode m = ClipAll );    
+    enum ClipMode { ClipDefault, Unclipped, ClipAll, ClipSiblings }; 
+    HPS getTargetPS( ClipMode m = ClipDefault );    
     friend Q_EXPORT void bitBlt( QPaintDevice *, int, int,
                                  const QPaintDevice *,

trunk/src/kernel/qpainter_pm.cpp

@@ -539 +539 @@
         } else {
             hps = w->getTargetPS ( unclipped ? QWidget::Unclipped :
-                                               QWidget::ClipAll ); 
+                                               QWidget::ClipDefault ); 
             w->hps = hps;
         }
@@ -931 +931 @@
 //      }
 #endif
+        // clip region in GPI cannot be used for anything else, so detach it
+        cur_crgn.detach();
     } else {
         cur_crgn = def_crgn;
     }
 
-    // clip region in GPI cannot be used for anything else, so detach it
-    cur_crgn.detach();
-    
     if ( !cur_crgn.isNull() )
         GpiSetClipRegion( hps, cur_crgn.handle( devh ), NULL );

trunk/src/kernel/qwidget_pm.cpp

@@ -994 +994 @@
 #if defined (DEBUG_REPAINTRESIZE)
         qDebug( "repaint(): [%s/%s/%08X] <region> erase: %d resizeNoErase: %d",
-                name(), className(), widget_flags,
+                name(), className(), widget_flags, erase,
                 (testWFlags( WResizeNoErase ) != 0) );
 #endif
@@ -1405 +1405 @@
     } else if ( !hps ) {
         tmphps = TRUE;
-        lhps = getTargetPS();
+        lhps = getTargetPS( ClipAll );
     } else {
         tmphps = FALSE;
@@ -1440 +1440 @@
     } else if ( !hps ) {
         tmphps = TRUE;
-        lhps = getTargetPS();
+        lhps = getTargetPS( ClipAll );
     } else {
         tmphps = FALSE;
@@ -1872 +1872 @@
  *  The returned handle must be freed using WinReleasePS() after usage.
  */
-HPS QWidget::getTargetPS( ClipMode m /* = ClipAll */ )
+HPS QWidget::getTargetPS( ClipMode m /* = ClipDefault */ )
 {
     HPS widgetPS = 0;
@@ -1879 +1879 @@
         widgetPS = WinGetScreenPS( HWND_DESKTOP );
     } else {
-        if ( m == Unclipped || testWFlags( WPaintUnclipped ) ) {
+        if ( m == Unclipped || (m == ClipDefault &&
+                                testWFlags( WPaintUnclipped )) ) {
             widgetPS = WinGetClipPS( winId(), 0, PSF_PARENTCLIP );
         } else {