Changeset 63 for trunk/src/kernel/qwidget_pm.cpp

Timestamp:

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

Author:

dmik

Message:

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

File:

• trunk/src/kernel/qwidget_pm.cpp (modified) (5 diffs)

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 {