Changeset 8 for trunk/include/qpainter.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/qpainter.h (modified) (5 diffs)

trunk/include/qpainter.h

@@ -279 +279 @@
 #if defined(Q_WS_WIN)
     HDC         handle() const;
+#elif defined(Q_WS_PM)
+    HPS         handle() const;
 #elif defined(Q_WS_X11) || defined(Q_WS_MAC)
     HANDLE      handle() const;
@@ -301 +303 @@
     void        mapInv( int, int, int *, int * ) const;
     void        mapInv( int, int, int, int, int *, int *, int *, int * ) const;
+#if defined(Q_WS_PM)
+    void        drawPolyInternal( const QPointArray &, bool close=TRUE,
+                                  bool winding=FALSE, int index=0, int npoints=-1,
+                                  bool disjoint=FALSE );
+    enum        ArcClose { CloseNone, CloseChord, ClosePie };                                      
+    void        drawArcInternal( int x, int y, int w, int h, int a = 0,
+                                 int alen = 360*16, ArcClose close = CloseChord );
+    void        drawWinFocusRectInternal( int x, int y, int w, int h,
+                                          const QColor &bgCol, bool xormode );
+    void        drawRectInternal( int x, int y, int w, int h, int wRnd, int hRnd ); 
+#else    
     void        drawPolyInternal( const QPointArray &, bool close=TRUE );
+#endif    
     void        drawWinFocusRect( int x, int y, int w, int h, bool xorPaint,
                                   const QColor &penColor );
@@ -368 +382 @@
 #endif
 
+#if !defined(Q_WS_PM)
     void       *penRef;                         // pen cache ref
     void       *brushRef;                       // brush cache ref
+#endif    
     void       *ps_stack;
     void       *wm_stack;
@@ -383 +399 @@
     friend class QFontEngineBox;
     QT_WIN_PAINTER_MEMBERS
+#elif defined(Q_WS_PM)
+    bool setNativeXForm( bool assumeYNegation );
+    void clearNativeXForm();
+    friend class QFontEnginePM;
+    HPS         hps;
+    HPAL        holdpal;
+    HRGN        holdrgn;
+    HBITMAP     hbrushbm;
+    uint        nocolBrush  : 1;
+    uint        pixmapBrush : 1;
+    int         devh;
+    QRegion     repaintRgn;
 #elif defined(Q_WS_X11)
     friend class QFontEngineXLFD;
@@ -545 +573 @@
     return hdc;
 }
+#elif defined(Q_WS_PM)
+inline HPS QPainter::handle() const
+{
+    return hps;
+}
 #elif defined(Q_WS_X11) || defined(Q_WS_MAC)
 inline Qt::HANDLE QPainter::handle() const