Changeset 61 for trunk/include

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).

Location:

trunk/include

Files:

• qpainter.h (modified) (1 diff)
• qregion.h (modified) (4 diffs)
• qwidget.h (modified) (1 diff)
• qwindowdefs_pm.h (modified) (2 diffs)

trunk/include/qpainter.h

@@ -410 +410 @@
     uint        pixmapBrush : 1;
     int         devh;
-    QRegion     repaintRgn;
+    QRegion     def_crgn;
+    QRegion     cur_crgn;
 #elif defined(Q_WS_X11)
     friend class QFontEngineXLFD;

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
 

trunk/include/qwidget.h

@@ -598 +598 @@
     friend bool qt_window_rgn(WId, short, RgnHandle, bool);
     friend class QDragManager;
+#elif defined (Q_WS_PM)
+    enum ClipMode { Unclipped, ClipAll, ClipSiblings }; 
+    HPS getTargetPS( ClipMode m = ClipAll );    
+    friend Q_EXPORT void bitBlt( QPaintDevice *, int, int,
+                                 const QPaintDevice *,
+                                 int, int, int, int, RasterOp, bool );
 #endif
 

trunk/include/qwindowdefs_pm.h

@@ -56 +56 @@
 #include <os2.h>
 
+// Innotek GCC lacks some API functions in its version of OS/2 Toolkit headers
+
+#define QCRGN_ERROR                 0
+#define QCRGN_OK                    1
+#define QCRGN_NO_CLIP_REGION        2
+
+LONG APIENTRY WinQueryClipRegion( HWND hwnd, HRGN hrgnClip );
+BOOL APIENTRY WinSetClipRegion( HWND hwnd, HRGN hrgnClip );
+
 #else
 
@@ -71 +80 @@
 typedef HWND WId;
 
-//@@TODO (dmik): remove
-//Q_EXPORT HINSTANCE qWinAppInst();
-//Q_EXPORT HINSTANCE qWinAppPrevInst();
-//Q_EXPORT int     qWinAppCmdShow();
 Q_EXPORT HPS       qt_display_ps();