Changeset 8 for trunk/include/qregion.h

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/include/qregion.h (modified) (4 diffs)

trunk/include/qregion.h

@@ -94 +94 @@
                         { return !(operator==(r)); }
 
-#if defined(Q_WS_WIN)
-    HRGN    handle() const { return data->rgn; }
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
+    HRGN    handle() const { if (! data->rgn ) update(); return data->rgn; }
 #elif defined(Q_WS_X11)
     Region handle() const { if(!data->rgn) updateX11Region(); return data->rgn; }
@@ -115 +115 @@
 #if defined(Q_WS_WIN)
     QRegion winCombine( const QRegion &, int ) const;
-#endif
-#if defined(Q_WS_X11)
+#elif defined(Q_WS_PM)
+    QRegion pmCombine( const QRegion &, int ) const;
+    void update() const;
+#elif defined(Q_WS_X11)
     void updateX11Region() const;
     void *clipRectangles( int &num ) const;
@@ -123 +125 @@
     void    exec( const QByteArray &, int ver = 0 );
     struct QRegionData : public QShared {
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
         HRGN   rgn;
 #elif defined(Q_WS_X11)
@@ -145 +147 @@
 #elif defined(Q_WS_WIN)
     friend class QETWidget;
+#elif defined(Q_WS_PM)
+    friend class QETWidget;
+    friend class QPainter;
+    friend void qt_set_paintevent_clipping( QPaintDevice*, const QRegion& );
 #endif