]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/dc.cpp
VA needs FALSE not false
[wxWidgets.git] / src / os2 / dc.cpp
index 05dbc01904415c9720eb7cb57e9f11cc6fc86fc1..2de4ebe67253fd915852dcf918445633458620b2 100644 (file)
@@ -42,6 +42,87 @@ static const int VIEWPORT_EXTENT = 1000;
 static const int MM_POINTS = 9;
 static const int MM_METRIC = 10;
 
+// usually this is defined in math.h
+#ifndef M_PI
+    static const double M_PI = 3.14159265358979323846;
+#endif // M_PI
+
+// ---------------------------------------------------------------------------
+// private functions
+// ---------------------------------------------------------------------------
+
+// convert degrees to radians
+static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
+
+int SetTextColor(
+  HPS                               hPS
+, int                               nForegroundColour
+)
+{
+    CHARBUNDLE                      vCbnd;
+
+    vCbnd.lColor =  nForegroundColour;
+    ::GpiSetAttrs( hPS       // presentation-space handle
+                  ,PRIM_CHAR // Char primitive.
+                  ,CBB_COLOR // sets color.
+                  ,0         //
+                  ,&vCbnd    // buffer for attributes.
+                 );
+    return 0;
+}
+
+int QueryTextBkColor(
+  HPS                               hPS
+)
+{
+    CHARBUNDLE                      vCbnd;
+
+    ::GpiQueryAttrs( hPS            // presentation-space handle
+                    ,PRIM_CHAR      // Char primitive.
+                    ,CBB_BACK_COLOR // Background color.
+                    ,&vCbnd         // buffer for attributes.
+                   );
+    return vCbnd.lBackColor;
+}
+
+
+int SetTextBkColor(
+  HPS                               hPS
+, int                               nBackgroundColour
+)
+{
+    CHARBUNDLE                      vCbnd;
+    int                             rc;
+
+    rc =  QueryTextBkColor(hPS);
+
+    vCbnd.lBackColor = nBackgroundColour;
+    ::GpiSetAttrs(hPS,            // presentation-space handle
+                  PRIM_CHAR,      // Char primitive.
+                  CBB_BACK_COLOR, // sets color.
+                  0,
+                  &vCbnd          // buffer for attributes.
+                 );
+    return rc;
+}
+
+int SetBkMode(
+  HPS                               hPS
+, int                               nBackgroundMode
+)
+{
+    if(nBackgroundMode == wxTRANSPARENT)
+        ::GpiSetBackMix( hPS
+                        ,BM_LEAVEALONE
+                       );
+    else
+        // the background of the primitive takes  over whatever is underneath.
+        ::GpiSetBackMix( hPS
+                        ,BM_OVERPAINT
+                        );
+    return 0;
+}
+
 // ===========================================================================
 // implementation
 // ===========================================================================
@@ -52,17 +133,20 @@ static const int MM_METRIC = 10;
 
 wxDC::wxDC(void)
 {
-    m_canvas  = NULL;
+    m_pCanvas      = NULL;
 
-    m_oldBitmap  = 0;
-    m_oldPen     = 0;
-    m_oldBrush   = 0;
-    m_oldFont    = 0;
-    m_oldPalette = 0;
+    m_hOldBitmap   = 0;
+    m_hOldPen      = 0;
+    m_hOldBrush    = 0;
+    m_hOldFont     = 0;
+    m_hOldPalette  = 0;
 
-    m_bOwnsDC = FALSE;
-    m_hDC        = 0;
-    m_hDCCount   = 0;
+    m_bOwnsDC      = FALSE;
+    m_hDC          = 0;
+    m_nDCCount     = 0;
+    m_hOldPS       = NULL;
+    m_hPS          = NULL;
+    m_bIsPaintTime = FALSE;// True at Paint Time
 };
 
 wxDC::~wxDC(void)
@@ -77,75 +161,116 @@ void wxDC::SelectOldObjects(WXHDC dc)
 {
     if (dc)
     {
-        if (m_oldBitmap)
+        if (m_hOldBitmap)
         {
 //            ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
-            if (m_selectedBitmap.Ok())
+            if (m_vSelectedBitmap.Ok())
             {
-                m_selectedBitmap.SetSelectedInto(NULL);
+                m_vSelectedBitmap.SetSelectedInto(NULL);
             }
         }
-        m_oldBitmap = 0;
-        if (m_oldPen)
+        m_hOldBitmap = 0;
+        if (m_hOldPen)
         {
 //            ::SelectObject((HDC) dc, (HPEN) m_oldPen);
         }
-        m_oldPen = 0;
-        if (m_oldBrush)
+        m_hOldPen = 0;
+        if (m_hOldBrush)
         {
 //            ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush);
         }
-        m_oldBrush = 0;
-        if (m_oldFont)
+        m_hOldBrush = 0;
+        if (m_hOldFont)
         {
 //            ::SelectObject((HDC) dc, (HFONT) m_oldFont);
         }
-        m_oldFont = 0;
-        if (m_oldPalette)
+        m_hOldFont = 0;
+        if (m_hOldPalette)
         {
 //            ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE);
         }
-        m_oldPalette = 0;
+        m_hOldPalette = 0;
     }
 
-    m_brush = wxNullBrush;
-    m_pen = wxNullPen;
-    m_palette = wxNullPalette;
-    m_font = wxNullFont;
+    m_brush           = wxNullBrush;
+    m_pen             = wxNullPen;
+    m_palette         = wxNullPalette;
+    m_font            = wxNullFont;
     m_backgroundBrush = wxNullBrush;
-    m_selectedBitmap = wxNullBitmap;
+    m_vSelectedBitmap = wxNullBitmap;
 }
 
 // ---------------------------------------------------------------------------
 // clipping
 // ---------------------------------------------------------------------------
 
-void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
-{
-   // TODO
+#define DO_SET_CLIPPING_BOX()                    \
+{                                                \
+    RECTL rect;                                  \
+                                                 \
+    ::GpiQueryClipBox(m_hPS, &rect);             \
+                                                 \
+    m_clipX1 = (wxCoord) XDEV2LOG(rect.xLeft);   \
+    m_clipY1 = (wxCoord) YDEV2LOG(rect.yTop);    \
+    m_clipX2 = (wxCoord) XDEV2LOG(rect.xRight);  \
+    m_clipY2 = (wxCoord) YDEV2LOG(rect.yBottom); \
 }
 
-void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y
-                               ,wxCoord width, wxCoord height
-                              )
-{
-   // TODO
-}
+void wxDC::DoSetClippingRegion(
+  wxCoord                           x
+, wxCoord                           y
+, wxCoord                           width
+, wxCoord                           height
+)
+{
+    RECTL                           vRect;
+
+    m_clipping    = TRUE;
+    vRect.xLeft   = XLOG2DEV(x);
+    vRect.yTop    = YLOG2DEV(y + height);
+    vRect.xRight  = XLOG2DEV(x + width);
+    vRect.yBottom = YLOG2DEV(y);
+    ::GpiIntersectClipRectangle(m_hPS, &vRect);
+    DO_SET_CLIPPING_BOX()
+} // end of wxDC::DoSetClippingRegion
+
+void wxDC::DoSetClippingRegionAsRegion(
+  const wxRegion&                   rRegion
+)
+{
+     wxCHECK_RET(rRegion.GetHRGN(), wxT("invalid clipping region"));
+     HRGN                           hRgnOld;
+
+     m_clipping = TRUE;
+     ::GpiSetClipRegion( m_hPS
+                        ,(HRGN)rRegion.GetHRGN()
+                        ,&hRgnOld
+                       );
+    DO_SET_CLIPPING_BOX()
+} // end of wxDC::DoSetClippingRegionAsRegion
 
-void wxDC::DoClipping(WXHDC dc)
+void wxDC::DestroyClippingRegion(void)
 {
-    if (m_clipping && dc)
+    if (m_clipping && m_hPS)
     {
-//      TODO:
-//      IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1),
-//                                  XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2));
-    }
-}
+         HRGN                       hRgnOld;
+         RECTL                      vRect;
 
-void wxDC::DestroyClippingRegion(void)
-{
-    // TODO:
-};
+         // TODO: this should restore the previous clipped region
+         //       so that OnPaint processing works correctly, and
+         //       the update doesn't get destroyed after the first
+         //       DestroyClippingRegion
+         vRect.xLeft   = XLOG2DEV(0);
+         vRect.yTop    = YLOG2DEV(32000);
+         vRect.xRight  = XLOG2DEV(32000);
+         vRect.yBottom = YLOG2DEV(0);
+
+         HRGN                       hRgn = ::GpiCreateRegion(m_hPS, 1, &vRect);
+
+         ::GpiSetClipRegion(m_hPS, hRgn, &hRgnOld);
+     }
+      m_clipping = FALSE;
+} // end of wxDC::DestroyClippingRegion
 
 // ---------------------------------------------------------------------------
 // query capabilities
@@ -177,22 +302,48 @@ int wxDC::GetDepth() const
 
 void wxDC::Clear()
 {
-   // TODO
+    ::GpiErase(m_hPS);
 }
 
-void wxDC::DoFloodFill( wxCoord x
-                       ,wxCoord y
-                       ,const wxColour& col
-                       ,int style
-                      )
-{
-   // TODO
+void wxDC::DoFloodFill(
+  wxCoord                           vX
+, wxCoord                           vY
+, const wxColour&                   rCol
+, int                               nStyle
+)
+{
+    POINTL                          vPtlPos;
+    LONG                            lColor;
+    LONG                            lOptions;
+
+    vPtlPos.x = vX;             // Loads x-coordinate
+    vPtlPos.y = vY;             // Loads y-coordinate
+    ::GpiMove(m_hPS, &vPtlPos); // Sets current position
+    lColor = rCol.GetPixel();
+    lOptions = FF_BOUNDARY;
+    if(wxFLOOD_SURFACE == nStyle)
+        lOptions = FF_SURFACE;
+
+    ::GpiFloodFill(m_hPS, lOptions, lColor);
 }
 
-bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
-{
-   // TODO
-   return(TRUE);
+bool wxDC::DoGetPixel(
+  wxCoord                           vX
+, wxCoord                           vY
+, wxColour*                         pCol
+) const
+{
+    POINTL                          vPoint;
+    LONG                            lColor;
+
+    vPoint.x = vX;
+    vPoint.y = vY;
+    lColor = ::GpiSetPel(m_hPS, &vPoint);
+    pCol->Set((unsigned long)lColor);
+    if(lColor>= 0)
+        return(TRUE);
+    else
+        return(FALSE);
 }
 
 void wxDC::DoCrossHair(wxCoord x, wxCoord y)
@@ -200,71 +351,449 @@ void wxDC::DoCrossHair(wxCoord x, wxCoord y)
    // TODO
 }
 
-void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
-{
-   // TODO
+void wxDC::DoDrawLine(
+  wxCoord                           vX1
+, wxCoord                           vY1
+, wxCoord                           vX2
+, wxCoord                           vY2
+)
+{
+    POINTL                          vPoint[2];
+
+    vPoint[0].x = vX1;
+    vPoint[0].y = vY1;
+    vPoint[1].x = vX2;
+    vPoint[1].y = vY2;
+    ::GpiMove(m_hPS, &vPoint[0]);
+    ::GpiLine(m_hPS, &vPoint[1]);
 }
 
-void wxDC::DoDrawArc( wxCoord x1, wxCoord y1
-                     ,wxCoord x2, wxCoord y2
-                     ,wxCoord xc, wxCoord yc
-                    )
-{
-   // TODO
+//////////////////////////////////////////////////////////////////////////////
+// Draws an arc of a circle, centred on (xc, yc), with starting point (x1, y1)
+// and ending at (x2, y2). The current pen is used for the outline and the
+// current brush for filling the shape. The arc is drawn in an anticlockwise
+// direction from the start point to the end point.
+//////////////////////////////////////////////////////////////////////////////
+void wxDC::DoDrawArc(
+  wxCoord                           vX1
+, wxCoord                           vY1
+, wxCoord                           vX2
+, wxCoord                           vY2
+, wxCoord                           vXc
+, wxCoord                           vYc
+)
+{
+     POINTL                         vPtlPos;
+     POINTL                         vPtlArc[2]; // Structure for current position
+     int                            nDx;
+     int                            nDy;
+     double                         dRadius;
+     double                         dAngl1;
+     double                         dAngl2;
+     double                         dAnglmid;
+     wxCoord                        vXm;
+     wxCoord                        vYm;
+     ARCPARAMS                      vArcp; // Structure for arc parameters
+
+    if((vX1 == vXc && vY1 == vXc) || (vX2 == vXc && vY2 == vXc))
+        return; // Draw point ??
+    dRadius = 0.5 * ( hypot( (double)(vY1 - vYc)
+                            ,(double)(vX1 - vXc)
+                           ) +
+                      hypot( (double)(vY2 - vYc)
+                            ,(double)(vX2 - vXc)
+                           )
+                     );
+
+    dAngl1 = atan2( (double)(vY1 - vYc)
+                   ,(double)(vX1 - vXc)
+                  );
+    dAngl2 = atan2( (double)(vY2 - vYc)
+                   ,(double)(vX2 - vXc)
+                  );
+    if(dAngl2 < dAngl1)
+        dAngl2 += M_PI * 2;
+
+    //
+    // GpiPointArc can't draw full arc
+    //
+     if(dAngl2 == dAngl1 || (vX1 == vX2 && vY1 == vY2) )
+     {
+        //
+        // Medium point
+        //
+        dAnglmid = (dAngl1 + dAngl2)/2. + M_PI;
+        vXm      = vXc + dRadius * cos(dAnglmid);
+        vYm      = vYc + dRadius * sin(dAnglmid);
+        DoDrawArc( vX1
+                  ,vY1
+                  ,vXm
+                  ,vYm
+                  ,vXc
+                  ,vYc
+                 );
+        DoDrawArc( vXm
+                  ,vYm
+                  ,vX2
+                  ,vY2
+                  ,vXc
+                  ,vYc
+                 );
+        return;
+    }
+
+    //
+    // Medium point
+    //
+    dAnglmid = (dAngl1 + dAngl2)/2.;
+    vXm      = vXc + dRadius * cos(dAnglmid);
+    vYm      = vYc + dRadius * sin(dAnglmid);
+
+    //
+    // Ellipse main axis (r,q), (p,s) with center at (0,0) */
+    //
+    vArcp.lR = 0;
+    vArcp.lQ = 1;
+    vArcp.lP = 1;
+    vArcp.lS = 0;
+    ::GpiSetArcParams(m_hPS, &vArcp); // Sets parameters to default
+
+    vPtlPos.x = vX1; // Loads x-coordinate
+    vPtlPos.y = vY1; // Loads y-coordinate
+    ::GpiMove(m_hPS, &vPtlPos); // Sets current position
+    vPtlArc[0].x =  vXm;
+    vPtlArc[0].y =  vYm;
+    vPtlArc[1].x = vX2;
+    vPtlArc[1].y = vY2;
+    ::GpiPointArc(m_hPS, vPtlArc); // Draws the arc
 }
 
-void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
-{
-   // TODO
+void wxDC::DoDrawCheckMark(
+  wxCoord                           vX1
+, wxCoord                           vY1
+, wxCoord                           vWidth
+, wxCoord                           vHeight
+)
+{
+    POINTL                          vPoint[2];
+
+    vPoint[0].x = vX1;
+    vPoint[0].y = vY1;
+    vPoint[1].x = vX1 + vWidth;
+    vPoint[1].y = vY1 + vHeight;
+
+    ::GpiMove(m_hPS, &vPoint[0]);
+    ::GpiBox( m_hPS       // handle to a presentation space
+             ,DRO_OUTLINE // draw the box outline ? or ?
+             ,&vPoint[1]  // address of the corner
+             ,0L          // horizontal corner radius
+             ,0L          // vertical corner radius
+            );
+    if(vWidth > 4 && vHeight > 4)
+    {
+        int                         nTmp;
+
+        vPoint[0].x += 2; vPoint[0].y += 2;
+        vPoint[1].x -= 2; vPoint[1].y -= 2;
+        ::GpiMove(m_hPS, &vPoint[0]);
+        ::GpiLine(m_hPS, &vPoint[1]);
+        nTmp = vPoint[0].x;
+        vPoint[0].x = vPoint[1].x;
+        vPoint[1].x = nTmp;
+        ::GpiMove(m_hPS, &vPoint[0]);
+        ::GpiLine(m_hPS, &vPoint[1]);
+    }
 }
 
-void wxDC::DoDrawPolygon(int n, wxPoint points[]
-                         ,wxCoord xoffset, wxCoord yoffset
-                         ,int fillStyle
-                        )
+void wxDC::DoDrawPoint(
+  wxCoord                           vX
+, wxCoord                           vY
+)
 {
-   // TODO
+    POINTL                          vPoint;
+
+    vPoint.x = vX;
+    vPoint.y = vY;
+    ::GpiSetPel(m_hPS, &vPoint);
 }
 
-void wxDC::DoDrawLines( int n, wxPoint points[]
-                       ,wxCoord xoffset, wxCoord yoffset
-                      )
-{
-   // TODO
+void wxDC::DoDrawPolygon(
+  int                               n
+, wxPoint                           vPoints[]
+, wxCoord                           vXoffset
+, wxCoord                           vYoffset
+, int                               nFillStyle
+)
+{
+    ULONG                           ulCount = 1;    // Number of polygons.
+    POLYGON                         vPlgn;          // polygon.
+    ULONG                           flOptions = 0L; // Drawing options.
+
+//////////////////////////////////////////////////////////////////////////////
+// This contains fields of option bits... to draw boundary lines as well as
+// the area interior.
+//
+// Drawing boundary lines:
+//   POLYGON_NOBOUNDARY              Does not draw boundary lines.
+//   POLYGON_BOUNDARY                Draws boundary lines (the default).
+//
+// Construction of the area interior:
+//   POLYGON_ALTERNATE               Constructs interior in alternate mode
+//                                   (the default).
+//   POLYGON_WINDING                 Constructs interior in winding mode.
+//////////////////////////////////////////////////////////////////////////////
+
+    ULONG                           flModel = 0L; // Drawing model.
+
+//////////////////////////////////////////////////////////////////////////////
+// Drawing model.
+//   POLYGON_INCL  Fill is inclusive of bottom right (the default).
+//   POLYGON_EXCL  Fill is exclusive of bottom right.
+//       This is provided to aid migration from other graphics models.
+//////////////////////////////////////////////////////////////////////////////
+
+    LONG                            lHits = 0L; // Correlation/error indicator.
+    POINTL                          vPoint;
+    int                             i;
+    int                             nIsTRANSPARENT = 0;
+    LONG                            lBorderColor = 0L;
+    LONG                            lColor = 0L;
+
+    lBorderColor = m_pen.GetColour().GetPixel();
+    lColor       = m_brush.GetColour().GetPixel();
+    if(m_brush.GetStyle() == wxTRANSPARENT)
+        nIsTRANSPARENT = 1;
+
+    vPlgn.ulPoints = n;
+    vPlgn.aPointl = (POINTL*) calloc( n + 1
+                                     ,sizeof(POINTL)
+                                    ); // well, new will call malloc
+
+    for(i = 0; i < n; i++)
+    {
+        vPlgn.aPointl[i].x = vPoints[i].x; // +xoffset;
+        vPlgn.aPointl[i].y = vPoints[i].y; // +yoffset;
+    }
+    flModel = POLYGON_BOUNDARY;
+    if(nFillStyle == wxWINDING_RULE)
+        flModel |= POLYGON_WINDING;
+    else
+        flModel |= POLYGON_ALTERNATE;
+
+    vPoint.x = vXoffset;
+    vPoint.y = vYoffset;
+
+    ::GpiSetColor(m_hPS, lBorderColor);
+    ::GpiMove(m_hPS, &vPoint);
+    lHits = ::GpiPolygons(m_hPS, ulCount, &vPlgn, flOptions, flModel);
+    free(vPlgn.aPointl);
 }
 
-void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxDC::DoDrawLines(
+  int                               n
+, wxPoint                           vPoints[]
+, wxCoord                           vXoffset
+, wxCoord                           vYoffset
+)
 {
-   // TODO
+    int                             i;
+    POINTL                          vPoint;
+
+    vPoint.x = vPoints[0].x + vXoffset;
+    vPoint.y = vPoints[0].y + vYoffset;
+    ::GpiMove(m_hPS, &vPoint);
+
+    LONG                            lBorderColor = m_pen.GetColour().GetPixel();
+
+    ::GpiSetColor(m_hPS, lBorderColor);
+    for(i = 1; i < n; i++)
+    {
+        vPoint.x = vPoints[0].x + vXoffset;
+        vPoint.y = vPoints[0].y + vYoffset;
+        ::GpiLine(m_hPS, &vPoint);
+    }
 }
 
-void wxDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y
-                                  ,wxCoord width, wxCoord height
-                                  ,double radius
-                                 )
-{
-   // TODO
+void wxDC::DoDrawRectangle(
+  wxCoord                           vX
+, wxCoord                           vY
+, wxCoord                           vWidth
+, wxCoord                           vHeight
+)
+{
+    POINTL                          vPoint[2];
+    LONG                            lControl;
+    LONG                            lColor;
+    LONG                            lBorderColor;
+    int                             nIsTRANSPARENT = 0;
+
+    vPoint[0].x = vX;
+    vPoint[0].y = vY;
+    vPoint[1].x = vX + vWidth;
+    vPoint[1].y = vY - vHeight;
+    ::GpiMove(m_hPS, &vPoint[0]);
+    lColor       = m_brush.GetColour().GetPixel();
+    lBorderColor = m_pen.GetColour().GetPixel();
+    if (m_brush.GetStyle() == wxTRANSPARENT)
+        nIsTRANSPARENT = 1;
+    if(lColor == lBorderColor || nIsTRANSPARENT)
+    {
+        lControl = DRO_OUTLINEFILL; //DRO_FILL;
+        if(m_brush.GetStyle() == wxTRANSPARENT)
+            lControl = DRO_OUTLINE;
+
+        ::GpiSetColor(m_hPS, CLR_GREEN);
+        ::GpiBox( m_hPS       // handle to a presentation space
+                 ,lControl   // draw the box outline ? or ?
+                 ,&vPoint[1]  // address of the corner
+                 ,0L          // horizontal corner radius
+                 ,0L          // vertical corner radius
+                );
+    }
+    else
+    {
+        lControl = DRO_OUTLINE;
+        ::GpiSetColor( m_hPS
+                      ,lBorderColor
+                     );
+        ::GpiBox( m_hPS
+                 ,lControl
+                 ,&vPoint[1]
+                 ,0L
+                 ,0L
+                );
+        lControl = DRO_FILL;
+        ::GpiSetColor( m_hPS
+                      ,lColor
+                     );
+        ::GpiBox( m_hPS
+                 ,lControl
+                 ,&vPoint[1]
+                 ,0L
+                 ,0L
+                );
+    }
 }
 
-void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-{
-   // TODO
+void wxDC::DoDrawRoundedRectangle(
+  wxCoord                           vX
+, wxCoord                           vY
+, wxCoord                           vWidth
+, wxCoord                           vHeight
+, double                            dRadius
+)
+{
+    POINTL                          vPoint[2];
+    LONG                            lControl;
+
+    vPoint[0].x = vX;
+    vPoint[0].y = vY;
+    vPoint[1].x = vX + vWidth;
+    vPoint[1].y = vY + vHeight;
+    ::GpiMove(m_hPS, &vPoint[0]);
+
+    lControl = DRO_OUTLINEFILL; //DRO_FILL;
+    if (m_brush.GetStyle() == wxTRANSPARENT)
+        lControl = DRO_OUTLINE;
+    ::GpiBox( m_hPS         // handle to a presentation space
+             ,DRO_OUTLINE   // draw the box outline ? or ?
+             ,&vPoint[1]    // address of the corner
+             ,(LONG)dRadius // horizontal corner radius
+             ,(LONG)dRadius // vertical corner radius
+            );
 }
 
-void wxDC::DoDrawEllipticArc( wxCoord x
-                             ,wxCoord y
-                             ,wxCoord w
-                             ,wxCoord h
-                             ,double sa
-                             ,double ea
-                            )
-{
-   // TODO
+// Draw Ellipse within box (x,y) - (x+width, y+height)
+void wxDC::DoDrawEllipse(
+  wxCoord                           vX
+, wxCoord                           vY
+, wxCoord                           vWidth
+, wxCoord                           vHeight
+)
+{
+    POINTL                          vPtlPos; // Structure for current position
+    FIXED                           vFxMult; // Multiplier for ellipse
+    ARCPARAMS                       vArcp;   // Structure for arc parameters
+
+    vArcp.lR = 0;
+    vArcp.lQ = vHeight/2;
+    vArcp.lP = vWidth/2;
+    vArcp.lS = 0;
+    ::GpiSetArcParams( m_hPS
+                      ,&vArcp
+                     ); // Sets parameters to default
+    vPtlPos.x = vX + vWidth/2;  // Loads x-coordinate
+    vPtlPos.y = vY + vHeight/2; // Loads y-coordinate
+    ::GpiMove( m_hPS
+              ,&vPtlPos
+             ); // Sets current position
+    vFxMult = MAKEFIXED(1, 0);             /* Sets multiplier            */
+
+    //
+    // DRO_FILL, DRO_OTLINEFILL - where to get
+    //
+    ::GpiFullArc( m_hPS
+                 ,DRO_OUTLINE
+                 ,vFxMult
+                ); // Draws full arc with center at current position
+}
+
+void wxDC::DoDrawEllipticArc(
+  wxCoord                           vX
+, wxCoord                           vY
+, wxCoord                           vWidth
+, wxCoord                           vHeight
+, double                            dSa
+, double                            dEa
+)
+{
+    POINTL                          vPtlPos; // Structure for current position
+    FIXED                           vFxMult; // Multiplier for ellipse
+    ARCPARAMS                       vArcp;   // Structure for arc parameters
+    FIXED                           vFSa;
+    FIXED                           vFSweepa; // Start angle, sweep angle
+    double                          dIntPart;
+    double                          dFractPart;
+    double                          dRadius;
+
+    dFractPart = modf(dSa,&dIntPart);
+    vFSa = MAKEFIXED((int)dIntPart, (int)(dFractPart * 0xffff) );
+    dFractPart = modf(dEa - dSa, &dIntPart);
+    vFSweepa = MAKEFIXED((int)dIntPart, (int)(dFractPart * 0xffff) );
+
+    //
+    // Ellipse main axis (r,q), (p,s) with center at (0,0)
+    //
+    vArcp.lR = 0;
+    vArcp.lQ = vHeight/2;
+    vArcp.lP = vWidth/2;
+    vArcp.lS = 0;
+    ::GpiSetArcParams(m_hPS, &vArcp); // Sets parameters to default
+    vPtlPos.x = vX + vWidth/2  * (1. + cos(DegToRad(dSa))); // Loads x-coordinate
+    vPtlPos.y = vY + vHeight/2 * (1. + sin(DegToRad(dSa))); // Loads y-coordinate
+    ::GpiMove(m_hPS, &vPtlPos); // Sets current position
+
+    //
+    // May be not to the center ?
+    //
+    vPtlPos.x = vX + vWidth/2 ; // Loads x-coordinate
+    vPtlPos.y = vY + vHeight/2; // Loads y-coordinate
+    vFxMult = MAKEFIXED(1, 0);  // Sets multiplier
+
+    //
+    // DRO_FILL, DRO_OTLINEFILL - where to get
+    //
+    ::GpiPartialArc( m_hPS
+                    ,&vPtlPos
+                    ,vFxMult
+                    ,vFSa
+                    ,vFSweepa
+                   );
 }
 
 void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
 {
-   // TODO
+    // TODO:
 }
 
 void wxDC::DoDrawBitmap( const wxBitmap &bmp
@@ -275,15 +804,93 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp
    // TODO
 }
 
-void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
+void wxDC::DoDrawText(
+  const wxString&                   rsText
+, wxCoord                           vX
+, wxCoord                           vY
+)
 {
-   // TODO
+    DrawAnyText( rsText
+                ,vX
+                ,vY
+               );
 }
 
-void wxDC::DoDrawRotatedText(const wxString& text,
-                             wxCoord x, wxCoord y,
-                             double angle)
+void wxDC::DrawAnyText(
+  const wxString&                   rsText
+, wxCoord                           vX
+, wxCoord                           vY
+)
 {
+    int                             nOldBackground = 0;
+    POINTL                          vPtlStart;
+    LONG                            lHits;
+
+    //
+    // prepare for drawing the text
+    //
+
+    //
+    // Set text color attributes
+    //
+    if (m_textForegroundColour.Ok())
+    {
+        SetTextColor( m_hPS
+                     ,(int)m_textForegroundColour.GetPixel()
+                    );
+    }
+
+    if (m_textBackgroundColour.Ok())
+    {
+        nOldBackground = SetTextBkColor( m_hPS
+                                        ,(int)m_textBackgroundColour.GetPixel()
+                                       );
+    }
+    SetBkMode( m_hPS
+              ,m_backgroundMode
+             );
+    vPtlStart.x = vX;
+    vPtlStart.y = vY;
+
+    lHits = ::GpiCharStringAt( m_hPS
+                              ,&vPtlStart
+                              ,rsText.length()
+                              ,(PCH)rsText.c_str()
+                             );
+    if (lHits != GPI_OK)
+    {
+        wxLogLastError(wxT("TextOut"));
+    }
+
+    //
+    // Restore the old parameters (text foreground colour may be left because
+    // it never is set to anything else, but background should remain
+    // transparent even if we just drew an opaque string)
+    //
+    if (m_textBackgroundColour.Ok())
+            SetTextBkColor( m_hPS
+                           ,nOldBackground
+                          );
+    SetBkMode( m_hPS
+              ,wxTRANSPARENT
+             );
+}
+
+void wxDC::DoDrawRotatedText(
+  const wxString&                   rsText
+, wxCoord                           vX
+, wxCoord                           vY
+, double                            dAngle
+)
+{
+    if (dAngle == 0.0)
+    {
+        DoDrawText( rsText
+                   ,vX
+                   ,vY
+                  );
+    }
+
    // TODO:
    /*
     if ( angle == 0.0 )
@@ -345,16 +952,81 @@ void wxDC::SetPalette(const wxPalette& palette)
    // TODO
 }
 
-void wxDC::SetFont(const wxFont& font)
+void wxDC::SetFont(
+  const wxFont&                     rFont
+)
 {
-   // TODO
+    //
+    // Set the old object temporarily, in case the assignment deletes an object
+    // that's not yet selected out.
+    //
+    if (m_hOldFont)
+    {
+//        ::SelectObject(GetHdc(), (HFONT) m_hOldFont);
+        m_hOldFont = 0;
+    }
+
+    m_font = rFont;
+
+    if (!rFont.Ok())
+    {
+        if (m_hOldFont)
+//            ::SelectObject(GetHdc(), (HFONT) m_hOldFont);
+        m_hOldFont = 0;
+    }
+
+    if (m_font.Ok() && m_font.GetResourceHandle())
+    {
+        HFONT                       hFont = (HFONT)0; //::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
+        if (hFont == (HFONT) NULL)
+        {
+            wxLogDebug(wxT("::SelectObject failed in wxDC::SetFont."));
+        }
+        if (!m_hOldFont)
+            m_hOldFont = (WXHFONT) hFont;
+    }
 }
 
-void wxDC::SetPen(const wxPen& pen)
+void wxDC::SetPen(
+  const wxPen&                      rPen
+)
 {
-   // TODO
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    if (m_pen == rPen)
+        return;
+    m_pen = rPen;
+    if (!m_pen.Ok())
+        return;
+
+    if (m_hOldPen)
+        m_hOldPen = 0L;
+    m_pen = rPen;
+
+    if (!m_pen.Ok())
+    {
+        if (m_hOldPen)
+        {
+            m_pen.SetPS((HPS)m_hOldPen);
+        }
+        m_hOldPen = 0L;
+    }
+
+    if (m_pen.Ok())
+    {
+        if (m_pen.GetResourceHandle())
+        {
+            m_pen.SetPS(m_hPS);
+            if (!m_hOldPen)
+                m_hOldPen = m_pen.GetPS();
+        }
+    }
+
 }
-void wxDC::SetBrush(const wxBrush& brush)
+
+void wxDC::SetBrush(
+  const wxBrush&                    rBrush
+)
 {
    // TODO
 }
@@ -364,9 +1036,11 @@ void wxDC::SetBackground(const wxBrush& brush)
    // TODO
 }
 
-void wxDC::SetBackgroundMode(int mode)
+void wxDC::SetBackgroundMode(
+  int                               nMode
+)
 {
-   // TODO
+    m_backgroundMode = nMode;
 }
 
 void wxDC::SetLogicalFunction(int function)
@@ -430,25 +1104,89 @@ void wxDC::EndPage()
 
 wxCoord wxDC::GetCharHeight() const
 {
-    // TODO
-    return(1);
+    FONTMETRICS                     vFM; // metrics structure
+
+    ::GpiQueryFontMetrics( m_hPS
+                          ,sizeof(FONTMETRICS)
+                          ,&vFM
+                         );
+    return YDEV2LOGREL(vFM.lXHeight);
 }
 
 wxCoord wxDC::GetCharWidth() const
 {
-    // TODO
-    return(1);
+    FONTMETRICS                     vFM; // metrics structure
+
+    ::GpiQueryFontMetrics( m_hPS
+                          ,sizeof(FONTMETRICS)
+                          ,&vFM
+                         );
+    return XDEV2LOGREL(vFM.lAveCharWidth);
 }
 
-void wxDC::DoGetTextExtent( const wxString& string
-                           ,wxCoord* x
-                           ,wxCoord* y
-                           ,wxCoord* decent
-                           ,wxCoord* externalLeading
-                           ,wxFont* theFont
-                          ) const
-{
-   // TODO:
+void wxDC::DoGetTextExtent(
+  const wxString&                   rsString
+, wxCoord*                          pvX
+, wxCoord*                          pvY
+, wxCoord*                          pvDescent
+, wxCoord*                          pvExternalLeading
+, wxFont*                           pTheFont
+) const
+{
+    POINTL                          avPoint[TXTBOX_COUNT];
+    POINTL                          vPtMin;
+    POINTL                          vPtMax;
+    int                             i;
+    int                             l;
+    FONTMETRICS                     vFM; // metrics structure
+    BOOL                            bRc;
+    char*                           pStr;
+    ERRORID                         vErrorCode; // last error id code
+    wxFont*                         pFontToUse = (wxFont*)pTheFont;
+
+    if (!pFontToUse)
+        pFontToUse = (wxFont*)&m_font;
+    l = rsString.length();
+    pStr = (PCH) rsString.c_str();
+
+    //
+    // In world coordinates.
+    //
+    bRc = ::GpiQueryTextBox( m_hPS
+                            ,l
+                            ,pStr
+                            ,TXTBOX_COUNT // return maximum information
+                            ,avPoint      // array of coordinates points
+                           );
+    if(!bRc)
+    {
+       vErrorCode = ::WinGetLastError(wxGetInstance());
+    }
+
+    vPtMin.x = avPoint[0].x;
+    vPtMax.x = avPoint[0].x;
+    vPtMin.y = avPoint[0].y;
+    vPtMax.y = avPoint[0].y;
+    for (i = 1; i < 4; i++)
+    {
+        if(vPtMin.x > avPoint[i].x) vPtMin.x = avPoint[i].x;
+        if(vPtMin.y > avPoint[i].y) vPtMin.y = avPoint[i].y;
+        if(vPtMax.x < avPoint[i].x) vPtMax.x = avPoint[i].x;
+        if(vPtMax.y < avPoint[i].y) vPtMax.y = avPoint[i].y;
+    }
+    ::GpiQueryFontMetrics( m_hPS
+                          ,sizeof(FONTMETRICS)
+                          ,&vFM
+                         );
+
+    if (pvX)
+        *pvX = (wxCoord)(vPtMax.x - vPtMin.x + 1);
+    if (pvY)
+        *pvY = (wxCoord)(vPtMax.y - vPtMin.y + 1);
+    if (pvDescent)
+        *pvDescent = vFM.lMaxDescender;
+    if (pvExternalLeading)
+        *pvExternalLeading = vFM.lExternalLeading;
 }
 
 void wxDC::SetMapMode( int mode )
@@ -487,7 +1225,18 @@ void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y )
 
 void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )
 {
-    // TODO:
+    RECTL                           vRect;
+
+    ::GpiQueryPageViewport( m_hPS
+                           ,&vRect
+                          );
+    vRect.xLeft += x;
+    vRect.xRight += x;
+    vRect.yBottom -= y;
+    vRect.yTop -= y;
+    ::GpiSetPageViewport( m_hPS
+                         ,&vRect
+                        );
 };
 
 // ---------------------------------------------------------------------------
@@ -496,71 +1245,43 @@ void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )
 
 wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
 {
-    wxCoord new_x = x - m_deviceOriginX;
-    if (new_x > 0)
-        return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
-    else
-        return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
-};
+    return (wxCoord) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX) - m_logicalOriginX);
+}
 
 wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
 {
-    if (x > 0)
-        return (wxCoord)((double)(x) / m_scaleX + 0.5);
-    else
-        return (wxCoord)((double)(x) / m_scaleX - 0.5);
-};
+    return (wxCoord) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX));
+}
 
 wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
 {
-    wxCoord new_y = y - m_deviceOriginY;
-    if (new_y > 0)
-        return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
-    else
-        return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
-};
+    return (wxCoord) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY) - m_logicalOriginY);
+}
 
 wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
 {
-    if (y > 0)
-        return (wxCoord)((double)(y) / m_scaleY + 0.5);
-    else
-        return (wxCoord)((double)(y) / m_scaleY - 0.5);
-};
+    return (wxCoord) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY));
+}
 
 wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
 {
-    wxCoord new_x = x - m_logicalOriginX;
-    if (new_x > 0)
-        return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX;
-    else
-    return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
-};
+    return (wxCoord) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX);
+}
 
 wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
 {
-    if (x > 0)
-        return (wxCoord)((double)(x) * m_scaleX + 0.5);
-    else
-        return (wxCoord)((double)(x) * m_scaleX - 0.5);
-};
+    return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX);
+}
 
 wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
 {
-    wxCoord new_y = y - m_logicalOriginY;
-    if (new_y > 0)
-        return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY;
-    else
-        return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
-};
+    return (wxCoord) ((y - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY);
+}
 
 wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
 {
-    if (y > 0)
-        return (wxCoord)((double)(y) * m_scaleY + 0.5);
-    else
-        return (wxCoord)((double)(y) * m_scaleY - 0.5);
-};
+    return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY);
+}
 
 // ---------------------------------------------------------------------------
 // bit blit