Changeset 61 for trunk/include/qregion.h

Timestamp:

Feb 6, 2006, 10:43:39 PM (20 years ago)

Author:

dmik

Message:

Implemented QRegion(..., QRegion::Eclipse) and QRegion(QPointArray &,...) constructors.
Improved Qt<->GPI region coordinates translation (it's now implicit), QRegion::handle() takes a height of the target devise as an argument (defaults to 0).

File:

• trunk/include/qregion.h (modified) (4 diffs)

trunk/include/qregion.h

@@ -94 +94 @@
                         { return !(operator==(r)); }
 
-#if defined(Q_WS_WIN) || defined(Q_WS_PM)
-    HRGN    handle() const { if (! data->rgn ) update(); return data->rgn; }
+#if defined(Q_WS_WIN)
+    HRGN    handle() const { return data->rgn; }
+#elif defined(Q_WS_PM)    
+    HRGN handle( int target_height = 0 ) const {
+        if ( !data->rgn || data->hgt != target_height )
+            updateHandle( target_height );
+        return data->rgn;
+    }
 #elif defined(Q_WS_X11)
     Region handle() const { if(!data->rgn) updateX11Region(); return data->rgn; }
@@ -116 +122 @@
     QRegion winCombine( const QRegion &, int ) const;
 #elif defined(Q_WS_PM)
+    QRegion( HRGN hrgn, int target_height );
     QRegion pmCombine( const QRegion &, int ) const;
-    void update() const;
+    void updateHandle( int target_height ) const;
 #elif defined(Q_WS_X11)
     void updateX11Region() const;
@@ -125 +132 @@
     void    exec( const QByteArray &, int ver = 0 );
     struct QRegionData : public QShared {
-#if defined(Q_WS_WIN) || defined(Q_WS_PM)
+#if defined(Q_WS_WIN)
         HRGN   rgn;
+#elif defined(Q_WS_PM)
+        HRGN rgn;
+        int hgt;
 #elif defined(Q_WS_X11)
         Region rgn;
@@ -150 +160 @@
     friend class QETWidget;
     friend class QPainter;
-    friend void qt_set_paintevent_clipping( QPaintDevice*, const QRegion& );
 #endif