Unicode compilation fixes after wxFFile change

[wxWidgets.git] / src / motif / dcclient.cpp

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 9f994b2747c0852f259e8c410617b53ebd9c0466..202fc3e599c892376d9ff46d965cf4f5d87904e9 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -6,43 +6,63 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /*
 /////////////////////////////////////////////////////////////////////////////
 
 /*

-   About pens, brushes, and the autoSetting flag:
-
-   Under X, pens and brushes control some of the same X drawing 
-   parameters. Therefore, it is impossible to independently maintain
-   the current pen and the current brush. Also, some settings depend
-   on the current logical function. The m_currentFill, etc. instance
-   variables remember state across the brush and pen.
-
-   Since pens are used more than brushes, the autoSetting flag
-   is used to indicate that a brush was recently used, and SetPen
-   must be called to reinstall the current pen's parameters.
-   If autoSetting includes 0x2, then the pens color may need
-   to be set based on XOR.
-
-   There is, unfortunately, some confusion between setting the
-   current pen/brush and actually installing the brush/pen parameters.
-   Both functionalies are perform by SetPen and SetBrush. C'est la vie.
+  About pens, brushes, and the autoSetting flag:
+
+  Under X, pens and brushes control some of the same X drawing parameters.
+  Therefore, it is impossible to independently maintain the current pen and the
+  current brush. Also, some settings depend on the current logical function. The
+  m_currentFill, etc. instance variables remember state across the brush and
+  pen.
+
+  Since pens are used more than brushes, the autoSetting flag is used to
+  indicate that a brush was recently used, and SetPen must be called to
+  reinstall the current pen's parameters. If autoSetting includes 0x2, then the
+  pens color may need to be set based on XOR.
+
+  There is, unfortunately, some confusion between setting the current pen/brush
+  and actually installing the brush/pen parameters. Both functionalies are
+  perform by SetPen and SetBrush. C'est la vie.

 */
 
 */
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "dcclient.h"
+    #pragma implementation "dcclient.h"

 #endif
 
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/window.h"
 #include "wx/app.h"
 #endif
 
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/window.h"
 #include "wx/app.h"

+#include "wx/image.h"
+#include "wx/log.h"
+

 #include <math.h>
 
 #include <math.h>
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

+#ifdef __EMX__
+    #include <float.h>          // for M_PI
+#endif // __EMX__
+

 #include "bdiag.xbm"
 #include "fdiag.xbm"
 #include "cdiag.xbm"
 #include "bdiag.xbm"
 #include "fdiag.xbm"
 #include "cdiag.xbm"


@@ -52,25 +72,61 @@
 
 static Pixmap bdiag, cdiag, fdiag, cross, horiz, verti;
 
 
 static Pixmap bdiag, cdiag, fdiag, cross, horiz, verti;
 

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // constants
 // constants

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-#define RAD2DEG 57.2957795131
-// Fudge factor. Obsolete?
-#define WX_GC_CF 0
+// Fudge factor (VZ: what??)
+#define WX_GC_CF 1

 
 

-//-----------------------------------------------------------------------------
-// wxWindowDC
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
-IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
-#endif
+    IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
+    IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
+
+// ----------------------------------------------------------------------------
+// prototypes
+// ----------------------------------------------------------------------------
+
+static void XCopyRemote(Display *src_display, Display *dest_display,
+                        Drawable src, Drawable dest,
+                        GC destgc,
+                        int srcx, int srcy,
+                        unsigned int w, unsigned int h,
+                        int destx, int desty,
+                        bool more, XImage **cache);
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+/*
+ * compare two doubles and return the larger rounded
+ * to the nearest int
+ */
+static int roundmax(double a, double b)
+{
+    return (int)((a > b ? a : b) + 0.5);
+}
+
+/*
+ * compare two doubles and return the smaller rounded
+ * to the nearest int
+ */
+static int roundmin(double a, double b)
+{
+    return (int)((a < b ? a : b) - 0.5);
+}
+
+
+// ----------------------------------------------------------------------------
+// wxWindowDC
+// ----------------------------------------------------------------------------

 
 

-wxWindowDC::wxWindowDC(void)
+wxWindowDC::wxWindowDC()

 {
     m_gc = (WXGC) 0;
     m_gcBacking = (WXGC) 0;
 {
     m_gc = (WXGC) 0;
     m_gcBacking = (WXGC) 0;


@@ -79,10 +135,10 @@ wxWindowDC::wxWindowDC(void)
     m_currentPenWidth = 1;
     m_currentPenJoin = -1;
     m_currentPenDashCount = -1;
     m_currentPenWidth = 1;
     m_currentPenJoin = -1;
     m_currentPenDashCount = -1;

-    m_currentPenDash = (char*) NULL;
+    m_currentPenDash = (wxMOTIFDash*) NULL;

     m_currentStyle = -1;
     m_currentFill = -1;
     m_currentStyle = -1;
     m_currentFill = -1;

-//    m_currentBkMode = wxTRANSPARENT;
+    //    m_currentBkMode = wxTRANSPARENT;

     m_colour = wxColourDisplay();
     m_display = (WXDisplay*) NULL;
     m_currentRegion = (WXRegion) 0;
     m_colour = wxColourDisplay();
     m_display = (WXDisplay*) NULL;
     m_currentRegion = (WXRegion) 0;


@@ -90,23 +146,24 @@ wxWindowDC::wxWindowDC(void)
     m_pixmap = (WXPixmap) 0;
     m_autoSetting = 0;
     m_oldFont = (WXFont) 0;
     m_pixmap = (WXPixmap) 0;
     m_autoSetting = 0;
     m_oldFont = (WXFont) 0;

-};
+}

 
 wxWindowDC::wxWindowDC( wxWindow *window )
 {
     wxASSERT_MSG( (window != (wxWindow*) NULL), "You must pass a valid wxWindow to wxWindowDC/wxClientDC/wxPaintDC constructor." );
 
     m_window = window;
 
 wxWindowDC::wxWindowDC( wxWindow *window )
 {
     wxASSERT_MSG( (window != (wxWindow*) NULL), "You must pass a valid wxWindow to wxWindowDC/wxClientDC/wxPaintDC constructor." );
 
     m_window = window;

+    m_font = window->GetFont();

     m_gc = (WXGC) 0;
     m_gcBacking = (WXGC) 0;
     m_backgroundPixel = -1;
     m_currentPenWidth = 1;
     m_currentPenJoin = -1;
     m_currentPenDashCount = -1;
     m_gc = (WXGC) 0;
     m_gcBacking = (WXGC) 0;
     m_backgroundPixel = -1;
     m_currentPenWidth = 1;
     m_currentPenJoin = -1;
     m_currentPenDashCount = -1;

-    m_currentPenDash = (char*) NULL;
+    m_currentPenDash = (wxMOTIFDash*) NULL;

     m_currentStyle = -1;
     m_currentFill = -1;
     m_currentStyle = -1;
     m_currentFill = -1;

-//    m_currentBkMode = wxTRANSPARENT;
+    //    m_currentBkMode = wxTRANSPARENT;

     m_colour = wxColourDisplay();
     m_currentRegion = (WXRegion) 0;
     m_userRegion = (WXRegion) 0;
     m_colour = wxColourDisplay();
     m_currentRegion = (WXRegion) 0;
     m_userRegion = (WXRegion) 0;


@@ -123,17 +180,18 @@ wxWindowDC::wxWindowDC( wxWindow *window )
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
     gcvalues.graphics_exposures = False;
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
     gcvalues.graphics_exposures = False;

+    gcvalues.subwindow_mode = IncludeInferiors;

     gcvalues.line_width = 1;
     m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),
     gcvalues.line_width = 1;
     m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),

-        GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth,
-          &gcvalues);
+        GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
+        &gcvalues);

 
     if (m_window->GetBackingPixmap())
     {
 
     if (m_window->GetBackingPixmap())
     {

-      m_gcBacking = (WXGC) XCreateGC (display, RootWindow (display,
-                          DefaultScreen (display)),
-        GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth,
-             &gcvalues);
+        m_gcBacking = (WXGC) XCreateGC (display, RootWindow (display,
+            DefaultScreen (display)),
+            GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
+            &gcvalues);

     }
 
     m_backgroundPixel = (int) gcvalues.background;
     }
 
     m_backgroundPixel = (int) gcvalues.background;


@@ -142,16 +200,18 @@ wxWindowDC::wxWindowDC( wxWindow *window )
     XGCValues valReturn;
     XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
     m_oldFont = (WXFont) valReturn.font;
     XGCValues valReturn;
     XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
     m_oldFont = (WXFont) valReturn.font;

-};

 
 

-wxWindowDC::~wxWindowDC(void)
+    SetBackground(wxBrush(m_window->GetBackgroundColour(), wxSOLID));
+}
+
+wxWindowDC::~wxWindowDC()

 {
 {

-    if ((m_oldFont != (WXFont) 0) && ((long) m_oldFont != -1))
+    if (m_gc && (m_oldFont != (WXFont) 0) && ((long) m_oldFont != -1))

     {
     {

-      XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont);
+        XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont);

 
 

-      if (m_window && m_window->GetBackingPixmap())
-          XSetFont ((Display*) m_display,(GC) m_gcBacking, (Font) m_oldFont);
+        if (m_window && m_window->GetBackingPixmap())
+            XSetFont ((Display*) m_display,(GC) m_gcBacking, (Font) m_oldFont);

     }
 
     if (m_gc)
     }
 
     if (m_gc)


@@ -169,1527 +229,1655 @@ wxWindowDC::~wxWindowDC(void)
     if (m_userRegion)
         XDestroyRegion ((Region) m_userRegion);
     m_userRegion = (WXRegion) 0;
     if (m_userRegion)
         XDestroyRegion ((Region) m_userRegion);
     m_userRegion = (WXRegion) 0;

-};
+}

 
 

-void wxWindowDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1), 
-  wxColour* WXUNUSED(col), int WXUNUSED(style) )
-{
-  // TODO
-};
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+                          const wxColour & col, int style);

 
 

-bool wxWindowDC::GetPixel( long WXUNUSED(x1), long WXUNUSED(y1), wxColour *WXUNUSED(col) ) const
+bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
+                             const wxColour& col, int style)

 {
 {

-  // TODO
-  return FALSE;
-};
+    return wxDoFloodFill(this, x, y, col, style);
+}
+  
+bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
+{
+    // Generic (and therefore rather inefficient) method.
+    // Could be improved.
+    wxMemoryDC memdc;
+    wxBitmap bitmap(1, 1);
+    memdc.SelectObject(bitmap);
+    memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1);
+    memdc.SelectObject(wxNullBitmap);
+    wxImage image = bitmap.ConvertToImage();
+    col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
+    return TRUE;
+}

 
 

-void wxWindowDC::DrawLine( long x1, long y1, long x2, long y2 )
+void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )

 {
 {

-  if (!Ok()) return;
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-  int x1d, y1d, x2d, y2d;
+    int x1d, y1d, x2d, y2d;

 
 

-  //  FreeGetPixelCache();
+    //  FreeGetPixelCache();

 
 

-  x1d = XLOG2DEV(x1);
-  y1d = YLOG2DEV(y1);
-  x2d = XLOG2DEV(x2);
-  y2d = YLOG2DEV(y2);
+    x1d = XLOG2DEV(x1);
+    y1d = YLOG2DEV(y1);
+    x2d = XLOG2DEV(x2);
+    y2d = YLOG2DEV(y2);

 
 

-  if (m_autoSetting)
-    SetPen (m_pen);
+    if (m_autoSetting)
+        SetPen (m_pen);

 
 

-  XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, x1d, y1d, x2d, y2d);
+    XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, x1d, y1d, x2d, y2d);

 
 

-  if (m_window && m_window->GetBackingPixmap())
-    XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking, 
-           XLOG2DEV_2(x1), YLOG2DEV_2(y1),
-           XLOG2DEV_2(x2), YLOG2DEV_2(y2));
+    if (m_window && m_window->GetBackingPixmap())
+        XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
+        XLOG2DEV_2(x1), YLOG2DEV_2(y1),
+        XLOG2DEV_2(x2), YLOG2DEV_2(y2));

 
 

-  CalcBoundingBox(x1, y1);
-  CalcBoundingBox(x2, y2);
-};
+    CalcBoundingBox(x1, y1);
+    CalcBoundingBox(x2, y2);
+}

 
 

-void wxWindowDC::CrossHair( long x, long y )
+void wxWindowDC::DoCrossHair( wxCoord x, wxCoord y )

 {
 {

-  if (!Ok()) return;
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-  if (m_autoSetting)
-    SetPen (m_pen);
+    if (m_autoSetting)
+        SetPen (m_pen);

 
 

-  int xx = XLOG2DEV (x);
-  int yy = YLOG2DEV (y);
-  int ww, hh;
-  wxDisplaySize (&ww, &hh);
-  XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, 0, yy,
-         ww, yy);
-  XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xx, 0,
-         xx, hh);
+    int xx = XLOG2DEV (x);
+    int yy = YLOG2DEV (y);
+    int ww, hh;
+    wxDisplaySize (&ww, &hh);
+    XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, 0, yy,
+        ww, yy);
+    XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xx, 0,
+        xx, hh);

 
 

-  if (m_window && m_window->GetBackingPixmap())
+    if (m_window && m_window->GetBackingPixmap())

     {
     {

-      xx = XLOG2DEV_2 (x);
-      yy = YLOG2DEV_2 (y);
-      XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
-         0, yy,
-         ww, yy);
-      XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
-         xx, 0,
-         xx, hh);
+        xx = XLOG2DEV_2 (x);
+        yy = YLOG2DEV_2 (y);
+        XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
+            0, yy,
+            ww, yy);
+        XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
+            xx, 0,
+            xx, hh);

     }
     }

-};
+}

 
 

-void wxWindowDC::DrawArc( long x1, long y1, long x2, long y2, long xc, long yc )
+void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc )

 {
 {

-  if (!Ok()) return;
-  
-//  FreeGetPixelCache();
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-  int xx1 = XLOG2DEV (x1);
-  int yy1 = YLOG2DEV (y1);
-  int xx2 = XLOG2DEV (x2);
-  int yy2 = YLOG2DEV (y2);
-  int xxc = XLOG2DEV (xc);
-  int yyc = YLOG2DEV (yc);
-  int xxc_2 = XLOG2DEV_2 (xc);
-  int yyc_2 = YLOG2DEV_2 (yc);
+    //  FreeGetPixelCache();

 
 

-  long dx = xx1 - xxc;
-  long dy = yy1 - yyc;
-  double radius = sqrt (dx * dx + dy * dy);
-  long r = (long) radius;
+    int xx1 = XLOG2DEV (x1);
+    int yy1 = YLOG2DEV (y1);
+    int xx2 = XLOG2DEV (x2);
+    int yy2 = YLOG2DEV (y2);
+    int xxc = XLOG2DEV (xc);
+    int yyc = YLOG2DEV (yc);
+    int xxc_2 = XLOG2DEV_2 (xc);
+    int yyc_2 = YLOG2DEV_2 (yc);

 
 

-  double radius1, radius2;
+    wxCoord dx = xx1 - xxc;
+    wxCoord dy = yy1 - yyc;
+    double radius = sqrt ((double)(dx * dx + dy * dy));
+    wxCoord r = (wxCoord) radius;

 
 

-  if (xx1 == xx2 && yy1 == yy2)
+    double radius1, radius2;
+
+    if (xx1 == xx2 && yy1 == yy2)

     {
     {

-      radius1 = 0.0;
-      radius2 = 360.0;
+        radius1 = 0.0;
+        radius2 = 360.0;

     }
     }

-  else if (radius == 0.0)
-    radius1 = radius2 = 0.0;
-  else
-    {
-      if (xx1 - xxc == 0)
-    if (yy1 - yyc < 0)
-      radius1 = 90.0;
-    else
-      radius1 = -90.0;
-      else
-    radius1 = -atan2 ((double) (yy1 - yyc), (double) (xx1 - xxc)) * 360.0 / (2 * M_PI);
-
-      if (xx2 - xxc == 0)
-    if (yy2 - yyc < 0)
-      radius2 = 90.0;
+    else if (radius == 0.0)
+        radius1 = radius2 = 0.0;

     else
     else

-      radius2 = -90.0;
-      else
-    radius2 = -atan2 ((double) (yy2 - yyc), (double) (xx2 - xxc)) * 360.0 / (2 * M_PI);
+    {
+        if (xx1 - xxc == 0)
+            if (yy1 - yyc < 0)
+                radius1 = 90.0;
+            else
+                radius1 = -90.0;
+            else
+                radius1 = -atan2 ((double) (yy1 - yyc), (double) (xx1 - xxc)) * 360.0 / (2 * M_PI);
+
+            if (xx2 - xxc == 0)
+                if (yy2 - yyc < 0)
+                    radius2 = 90.0;
+                else
+                    radius2 = -90.0;
+                else
+                    radius2 = -atan2 ((double) (yy2 - yyc), (double) (xx2 - xxc)) * 360.0 / (2 * M_PI);

     }
     }

-  radius1 *= 64.0;
-  radius2 *= 64.0;
-  int alpha1 = (int) radius1;
-  int alpha2 = (int) (radius2 - radius1);
-  while (alpha2 <= 0)
-    alpha2 += 360 * 64;
-  while (alpha2 > 360 * 64)
-    alpha2 -= 360 * 64;
-
-  if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)
+    radius1 *= 64.0;
+    radius2 *= 64.0;
+    int alpha1 = (int) radius1;
+    int alpha2 = (int) (radius2 - radius1);
+    while (alpha2 <= 0)
+        alpha2 += 360 * 64;
+    while (alpha2 > 360 * 64)
+        alpha2 -= 360 * 64;
+
+    if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)

     {
     {

-      SetBrush (m_brush);
-      XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) (GC) m_gc,
-        xxc - r, yyc - r, 2 * r, 2 * r, alpha1, alpha2);
+        SetBrush (m_brush);
+        XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) (GC) m_gc,
+            xxc - r, yyc - r, 2 * r, 2 * r, alpha1, alpha2);

 
 

-      if (m_window && m_window->GetBackingPixmap())
-      XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
-         xxc_2 - r, yyc_2 - r, 2 * r, 2 * r, alpha1, alpha2);
+        if (m_window && m_window->GetBackingPixmap())
+            XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
+            xxc_2 - r, yyc_2 - r, 2 * r, 2 * r, alpha1, alpha2);

 
     }
 
 
     }
 

-  if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)

     {
         if (m_autoSetting)
             SetPen (m_pen);
     {
         if (m_autoSetting)
             SetPen (m_pen);

-      XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc,
-           xxc - r, yyc - r, 2 * r, 2 * r, alpha1, alpha2);
+        XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc,
+            xxc - r, yyc - r, 2 * r, 2 * r, alpha1, alpha2);

 
 

-      if (m_window && m_window->GetBackingPixmap())
-        XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
-           xxc_2 - r, yyc_2 - r, 2 * r, 2 * r, alpha1, alpha2);
+        if (m_window && m_window->GetBackingPixmap())
+            XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
+            xxc_2 - r, yyc_2 - r, 2 * r, 2 * r, alpha1, alpha2);

     }
     }

-  CalcBoundingBox (x1, y1);
-  CalcBoundingBox (x2, y2);
-};
+    CalcBoundingBox (x1, y1);
+    CalcBoundingBox (x2, y2);
+}

 
 

-void wxWindowDC::DrawEllipticArc( long x, long y, long width, long height, double sa, double ea )
+void wxWindowDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double sa, double ea )

 {
 {

-  if (!Ok()) return;
-  
-  int xd, yd, wd, hd;
-
-  xd = XLOG2DEV(x);
-  yd = YLOG2DEV(y);
-  wd = XLOG2DEVREL(width);
-  hd = YLOG2DEVREL(height);
-
-  if (sa>=360 || sa<=-360) sa=sa-int(sa/360)*360;
-  if (ea>=360 || ea<=-360) ea=ea-int(ea/360)*360;
-  int start = int(sa*64);
-  int end   = int(ea*64);
-  if (start<0) start+=360*64;
-  if (end  <0) end  +=360*64;
-  if (end>start) end-=start;
-  else end+=360*64-start;
-
-  if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)
+    wxCHECK_RET( Ok(), "invalid dc" );
+
+    int xd, yd, wd, hd;
+
+    xd = XLOG2DEV(x);
+    yd = YLOG2DEV(y);
+    wd = XLOG2DEVREL(width);
+    hd = YLOG2DEVREL(height);
+
+    if (sa>=360 || sa<=-360) sa=sa-int(sa/360)*360;
+    if (ea>=360 || ea<=-360) ea=ea-int(ea/360)*360;
+    int start = int(sa*64);
+    int end   = int(ea*64);
+    if (start<0) start+=360*64;
+    if (end  <0) end  +=360*64;
+    if (end>start) end-=start;
+    else end+=360*64-start;
+
+    if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)

     {
     {

-      m_autoSetting = TRUE;    // must be reset
+        m_autoSetting = TRUE;    // must be reset

 
 

-      SetBrush (m_brush);
-      XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, start, end);
+        SetBrush (m_brush);
+        XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, start, end);

 
 

-      if (m_window && m_window->GetBackingPixmap())
-       XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
-          XLOG2DEV_2 (x), YLOG2DEV_2 (y),wd,hd,start,end);
+        if (m_window && m_window->GetBackingPixmap())
+            XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
+            XLOG2DEV_2 (x), YLOG2DEV_2 (y),wd,hd,start,end);

     }
 
     }
 

-  if (!m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)

     {
     {

-      if (m_autoSetting)
-    SetPen (m_pen);
-      XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, start,end);
-      if (m_window && m_window->GetBackingPixmap())
-        XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
-          XLOG2DEV_2 (x), YLOG2DEV_2 (y),wd,hd,start,end);
+        if (m_autoSetting)
+            SetPen (m_pen);
+        XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, start,end);
+        if (m_window && m_window->GetBackingPixmap())
+            XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
+            XLOG2DEV_2 (x), YLOG2DEV_2 (y),wd,hd,start,end);

     }
     }

-  CalcBoundingBox (x, y);
-  CalcBoundingBox (x + width, y + height);
-};
+    CalcBoundingBox (x, y);
+    CalcBoundingBox (x + width, y + height);
+}

 
 

-void wxWindowDC::DrawPoint( long x, long y )
+void wxWindowDC::DoDrawPoint( wxCoord x, wxCoord y )

 {
 {

-  if (!Ok()) return;
-  
-//  FreeGetPixelCache();
+    wxCHECK_RET( Ok(), "invalid dc" );
+
+    //  FreeGetPixelCache();

 
 

-  if (m_pen.Ok() && m_autoSetting)
-    SetPen (m_pen);
+    if (m_pen.Ok() && m_autoSetting)
+        SetPen (m_pen);

 
 

-  XDrawPoint ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y));
-  if (m_window && m_window->GetBackingPixmap())
-    XDrawPoint ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, XLOG2DEV_2 (x), YLOG2DEV_2 (y));
+    XDrawPoint ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y));
+    if (m_window && m_window->GetBackingPixmap())
+        XDrawPoint ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, XLOG2DEV_2 (x), YLOG2DEV_2 (y));

 
 

-  CalcBoundingBox (x, y);
-};
+    CalcBoundingBox (x, y);
+}

 
 

-void wxWindowDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset )
+void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset )

 {
 {

-  if (!Ok()) return;
-  
-//  FreeGetPixelCache();
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-  if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)
+    //  FreeGetPixelCache();
+
+    if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)

     {
     {

-      if (m_autoSetting)
-    SetPen (m_pen);
+        if (m_autoSetting)
+            SetPen (m_pen);

 
 

-      XPoint *xpoints = new XPoint[n];
-      int i;
+        XPoint *xpoints = new XPoint[n];
+        int i;

 
 

-      for (i = 0; i < n; i++)
-    {
-      xpoints[i].x = XLOG2DEV (points[i].x + xoffset);
-      xpoints[i].y = YLOG2DEV (points[i].y + yoffset);
-    }
-      XDrawLines ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xpoints, n, 0);
+        for (i = 0; i < n; i++)
+        {
+            xpoints[i].x = XLOG2DEV (points[i].x + xoffset);
+            xpoints[i].y = YLOG2DEV (points[i].y + yoffset);
+        }
+        XDrawLines ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xpoints, n, 0);

 
 

-    if (m_window && m_window->GetBackingPixmap())
-    {
-      for (i = 0; i < n; i++)
+        if (m_window && m_window->GetBackingPixmap())

         {
         {

-          xpoints[i].x = XLOG2DEV_2 (points[i].x + xoffset);
-          xpoints[i].y = YLOG2DEV_2 (points[i].y + yoffset);
+            for (i = 0; i < n; i++)
+            {
+                xpoints[i].x = XLOG2DEV_2 (points[i].x + xoffset);
+                xpoints[i].y = YLOG2DEV_2 (points[i].y + yoffset);
+            }
+            XDrawLines ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xpoints, n, 0);

         }
         }

-      XDrawLines ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xpoints, n, 0);
+        delete[]xpoints;

     }
     }

-    delete[]xpoints;
-  }
-};
+}

 
 

-void wxWindowDC::DrawLines( wxList *list, long xoffset, long yoffset )
+void wxWindowDC::DoDrawPolygon( int n, wxPoint points[],
+                                wxCoord xoffset, wxCoord yoffset, int fillStyle )

 {
 {

-  if (!Ok()) return;
-  
-  if (m_pen.GetStyle() == wxTRANSPARENT) return;
-  
-  int n = list->Number();
-  wxPoint *points = new wxPoint[n];
-
-  int i = 0;
-  for(wxNode *node = list->First(); node; node = node->Next()) {
-    wxPoint *point = (wxPoint *)node->Data();
-    points[i].x = point->x;
-    points[i++].y = point->y;
-  }
-  DrawLines(n, points, xoffset, yoffset);
-  delete []points;
-};
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-void wxWindowDC::DrawPolygon( int n, wxPoint points[],
-  long xoffset, long yoffset, int fillStyle )
-{
-//  FreeGetPixelCache();
+    //  FreeGetPixelCache();

 
 

-  XPoint *xpoints1 = new XPoint[n + 1];
-  XPoint *xpoints2 = new XPoint[n + 1];
-  int i;
-  for (i = 0; i < n; i++)
+    XPoint *xpoints1 = new XPoint[n + 1];
+    XPoint *xpoints2 = new XPoint[n + 1];
+    int i;
+    for (i = 0; i < n; i++)

     {
     {

-      xpoints1[i].x = XLOG2DEV (points[i].x + xoffset);
-      xpoints1[i].y = YLOG2DEV (points[i].y + yoffset);
-      xpoints2[i].x = XLOG2DEV_2 (points[i].x + xoffset);
-      xpoints2[i].y = YLOG2DEV_2 (points[i].y + yoffset);
-      CalcBoundingBox (points[i].x + xoffset, points[i].y + yoffset);
+        xpoints1[i].x = XLOG2DEV (points[i].x + xoffset);
+        xpoints1[i].y = YLOG2DEV (points[i].y + yoffset);
+        xpoints2[i].x = XLOG2DEV_2 (points[i].x + xoffset);
+        xpoints2[i].y = YLOG2DEV_2 (points[i].y + yoffset);
+        CalcBoundingBox (points[i].x + xoffset, points[i].y + yoffset);

     }
 
     }
 

-  // Close figure for XDrawLines (not needed for XFillPolygon)
-  xpoints1[i].x = xpoints1[0].x;
-  xpoints1[i].y = xpoints1[0].y;
-  xpoints2[i].x = xpoints2[0].x;
-  xpoints2[i].y = xpoints2[0].y;
+    // Close figure for XDrawLines (not needed for XFillPolygon)
+    xpoints1[i].x = xpoints1[0].x;
+    xpoints1[i].y = xpoints1[0].y;
+    xpoints2[i].x = xpoints2[0].x;
+    xpoints2[i].y = xpoints2[0].y;

 
 

-  if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)
+    if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)

     {
     {

-      SetBrush (m_brush);
-      XSetFillRule ((Display*) m_display, (GC) m_gc, fillStyle == wxODDEVEN_RULE ? EvenOddRule : WindingRule);
-      XFillPolygon ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xpoints1, n, Complex, 0);
-      XSetFillRule ((Display*) m_display, (GC) m_gc, EvenOddRule);    // default mode
-      if (m_window && m_window->GetBackingPixmap())
-      {
-         XSetFillRule ((Display*) m_display,(GC) m_gcBacking,
-             fillStyle == wxODDEVEN_RULE ? EvenOddRule : WindingRule);
-         XFillPolygon ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xpoints2, n, Complex, 0);
-         XSetFillRule ((Display*) m_display,(GC) m_gcBacking, EvenOddRule);    // default mode
-      }
-  }
+        SetBrush (m_brush);
+        XSetFillRule ((Display*) m_display, (GC) m_gc, fillStyle == wxODDEVEN_RULE ? EvenOddRule : WindingRule);
+        XFillPolygon ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xpoints1, n, Complex, 0);
+        XSetFillRule ((Display*) m_display, (GC) m_gc, EvenOddRule);    // default mode
+        if (m_window && m_window->GetBackingPixmap())
+        {
+            XSetFillRule ((Display*) m_display,(GC) m_gcBacking,
+                fillStyle == wxODDEVEN_RULE ? EvenOddRule : WindingRule);
+            XFillPolygon ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xpoints2, n, Complex, 0);
+            XSetFillRule ((Display*) m_display,(GC) m_gcBacking, EvenOddRule);    // default mode
+        }
+    }

 
 

-  if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)

     {
     {

-      if (m_autoSetting)
-        SetPen (m_pen);
-      XDrawLines ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xpoints1, n + 1, 0);
+        if (m_autoSetting)
+            SetPen (m_pen);
+        XDrawLines ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xpoints1, n + 1, 0);

 
 

-      if (m_window && m_window->GetBackingPixmap())
-        XDrawLines ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xpoints2, n + 1, 0);
+        if (m_window && m_window->GetBackingPixmap())
+            XDrawLines ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xpoints2, n + 1, 0);

     }
 
     }
 

-  delete[]xpoints1;
-  delete[]xpoints2;
-};
-
-void wxWindowDC::DrawPolygon( wxList *list, long xoffset,
-                             long yoffset, int fillStyle )
-{
-  if (!Ok()) return;
-
-  int n = list->Number();
-  wxPoint *points = new wxPoint[n];
-
-  int i = 0;
-  for(wxNode *node = list->First(); node; node = node->Next()) {
-    wxPoint *point = (wxPoint *)node->Data();
-    points[i].x = point->x;
-    points[i++].y = point->y;
-  }
-  DrawPolygon(n, points, xoffset, yoffset,fillStyle);
-  delete[] points;
-};
+    delete[]xpoints1;
+    delete[]xpoints2;
+}

 
 

-void wxWindowDC::DrawRectangle( long x, long y, long width, long height )
+void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

-  if (!Ok()) return;
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-//  FreeGetPixelCache();
+    //  FreeGetPixelCache();

 
 

-  int xd, yd, wfd, hfd, wd, hd;
+    int xd, yd, wfd, hfd, wd, hd;

 
 

-  xd = XLOG2DEV(x);
-  yd = YLOG2DEV(y);
-  wfd = XLOG2DEVREL(width);
-  wd = wfd - WX_GC_CF;
-  hfd = YLOG2DEVREL(height);
-  hd = hfd - WX_GC_CF;
+    xd = XLOG2DEV(x);
+    yd = YLOG2DEV(y);
+    wfd = XLOG2DEVREL(width);
+    wd = wfd - WX_GC_CF;
+    hfd = YLOG2DEVREL(height);
+    hd = hfd - WX_GC_CF;

 
 

-  if (wfd == 0 || hfd == 0) return;
-  if (wd < 0) { wd = - wd; xd = xd - wd; }
-  if (hd < 0) { hd = - hd; yd = yd - hd; }
+    if (wfd == 0 || hfd == 0) return;
+    if (wd < 0) { wd = - wd; xd = xd - wd; }
+    if (hd < 0) { hd = - hd; yd = yd - hd; }

 
 

-  if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)
+    if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)

     {
     {

-      SetBrush (m_brush);
-      XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wfd, hfd);
+        SetBrush (m_brush);
+        XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wfd, hfd);

 
 

-      if (m_window && m_window->GetBackingPixmap())
-    XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+        if (m_window && m_window->GetBackingPixmap())
+            XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,

             XLOG2DEV_2 (x), YLOG2DEV_2 (y),
             wfd, hfd);
     }
 
             XLOG2DEV_2 (x), YLOG2DEV_2 (y),
             wfd, hfd);
     }
 

-  if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)

     {
     {

-      if (m_autoSetting)
-    SetPen (m_pen);
-      XDrawRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd);
+        if (m_autoSetting)
+            SetPen (m_pen);
+        XDrawRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd);

 
 

-      if (m_window && m_window->GetBackingPixmap())
-    XDrawRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+        if (m_window && m_window->GetBackingPixmap())
+            XDrawRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,

             XLOG2DEV_2 (x), YLOG2DEV_2 (y),
             wd, hd);
     }
             XLOG2DEV_2 (x), YLOG2DEV_2 (y),
             wd, hd);
     }

-  CalcBoundingBox (x, y);
-  CalcBoundingBox (x + width, y + height);
-};
+    CalcBoundingBox (x, y);
+    CalcBoundingBox (x + width, y + height);
+}

 
 

-void wxWindowDC::DrawRoundedRectangle( long x, long y, long width, long height, double radius )
+void wxWindowDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )

 {
 {

-  if (!Ok()) return;
-  
-//  FreeGetPixelCache();
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-  // If radius is negative, it's a proportion of the smaller dimension.
+    //  FreeGetPixelCache();

 
 

-  if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
+    // If radius is negative, it's a proportion of the smaller dimension.

 
 

-  int xd = XLOG2DEV (x);
-  int yd = YLOG2DEV (y);
-  int rd = XLOG2DEVREL ((long) radius);
-  int wd = XLOG2DEVREL (width) - WX_GC_CF;
-  int hd = YLOG2DEVREL (height) - WX_GC_CF;
+    if (radius < 0.0) radius = - radius * ((width < height) ? width : height);

 
 

-  int rw_d = rd * 2;
-  int rh_d = rw_d;
+    int xd = XLOG2DEV (x);
+    int yd = YLOG2DEV (y);
+    int rd = XLOG2DEVREL ((long) radius);
+    int wd = XLOG2DEVREL (width) - WX_GC_CF;
+    int hd = YLOG2DEVREL (height) - WX_GC_CF;

 
 

-  // If radius is zero use DrawRectangle() instead to avoid
-  // X drawing errors with small radii
-  if (rd == 0)
-  {
-    DrawRectangle( x, y, width, height );
-    return;
-  }
+    int rw_d = rd * 2;
+    int rh_d = rw_d;

 
 

-  // Draw nothing if transformed w or h is 0
-  if (wd == 0 || hd == 0) return;
+    // If radius is zero use DrawRectangle() instead to avoid
+    // X drawing errors with small radii
+    if (rd == 0)
+    {
+        DrawRectangle( x, y, width, height );
+        return;
+    }

 
 

-  // CMB: adjust size if outline is drawn otherwise the result is
-  // 1 pixel too wide and high
-  if (m_pen.GetStyle() != wxTRANSPARENT)
-  {
-    wd--;
-    hd--;
-  }
+    // Draw nothing if transformed w or h is 0
+    if (wd == 0 || hd == 0) return;

 
 

-  // CMB: ensure dd is not larger than rectangle otherwise we
-  // get an hour glass shape
-  if (rw_d > wd) rw_d = wd;
-  if (rw_d > hd) rw_d = hd;
-  rd = rw_d / 2;
+    // CMB: adjust size if outline is drawn otherwise the result is
+    // 1 pixel too wide and high
+    if (m_pen.GetStyle() != wxTRANSPARENT)
+    {
+        wd--;
+        hd--;
+    }

 
 

-  // For backing pixmap
-  int xd2 = XLOG2DEV_2 (x);
-  int yd2 = YLOG2DEV_2 (y);
-  int rd2 = XLOG2DEVREL ((long) radius);
-  int wd2 = XLOG2DEVREL (width) ;
-  int hd2 = YLOG2DEVREL (height) ;
+    // CMB: ensure dd is not larger than rectangle otherwise we
+    // get an hour glass shape
+    if (rw_d > wd) rw_d = wd;
+    if (rw_d > hd) rw_d = hd;
+    rd = rw_d / 2;

 
 

-  int rw_d2 = rd2 * 2;
-  int rh_d2 = rw_d2;
+    // For backing pixmap
+    int xd2 = XLOG2DEV_2 (x);
+    int yd2 = YLOG2DEV_2 (y);
+    int rd2 = XLOG2DEVREL ((long) radius);
+    int wd2 = XLOG2DEVREL (width) ;
+    int hd2 = YLOG2DEVREL (height) ;

 
 

-  if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)
-  {
-      SetBrush (m_brush);
-
-      XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + rd, yd,
-              wd - rw_d, hd);
-      XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd + rd,
-              wd, hd - rh_d);
-
-      // Arcs start from 3 o'clock, positive angles anticlockwise
-      // Top-left
-      XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd,
-        rw_d, rh_d, 90 * 64, 90 * 64);
-      // Top-right
-      XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + wd - rw_d, yd,
-//        rw_d, rh_d, 0, 90 * 64);
-        rw_d, rh_d, 0, 91 * 64);
-      // Bottom-right
-      XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + wd - rw_d,
-        yd + hd - rh_d,
-//        rw_d, rh_d, 270 * 64, 90 * 64);
-        rw_d, rh_d, 269 * 64, 92 * 64);
-      // Bottom-left
-      XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd + hd - rh_d,
-        rw_d, rh_d, 180 * 64, 90 * 64);
+    int rw_d2 = rd2 * 2;
+    int rh_d2 = rw_d2;

 
 

-    if (m_window && m_window->GetBackingPixmap())
+    if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)

     {
     {

-      XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-              xd2 + rd2, yd2, wd2 - rw_d2, hd2);
-      XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-              xd2, yd2 + rd2, wd2, hd2 - rh_d2);
-
-      XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-       xd2, yd2, rw_d2, rh_d2, 90 * 64, 90 * 64);
-      XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-            xd2 + wd2 - rw_d2, yd2,
-//            rw_d2, rh_d2, 0, 90 * 64);
-            rw_d2, rh_d2, 0, 91 * 64);
-      XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-            xd2 + wd2 - rw_d2,
-            yd2 + hd2 - rh_d2,
-//            rw_d2, rh_d2, 270 * 64, 90 * 64);
-            rw_d2, rh_d2, 269 * 64, 92 * 64);
-      XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-            xd2, yd2 + hd2 - rh_d2,
-            rw_d2, rh_d2, 180 * 64, 90 * 64);
-    }
-  }
+        SetBrush (m_brush);
+
+        XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + rd, yd,
+            wd - rw_d, hd);
+        XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd + rd,
+            wd, hd - rh_d);
+
+        // Arcs start from 3 o'clock, positive angles anticlockwise
+        // Top-left
+        XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd,
+            rw_d, rh_d, 90 * 64, 90 * 64);
+        // Top-right
+        XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + wd - rw_d, yd,
+            //        rw_d, rh_d, 0, 90 * 64);
+            rw_d, rh_d, 0, 91 * 64);
+        // Bottom-right
+        XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + wd - rw_d,
+            yd + hd - rh_d,
+            //        rw_d, rh_d, 270 * 64, 90 * 64);
+            rw_d, rh_d, 269 * 64, 92 * 64);
+        // Bottom-left
+        XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd + hd - rh_d,
+            rw_d, rh_d, 180 * 64, 90 * 64);

 
 

-  if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)
-  {
-      SetPen (m_pen);
-      XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + rd, yd,
-         xd + wd - rd + 1, yd);
-      XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + rd, yd + hd,
-         xd + wd - rd, yd + hd);
-
-      XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd + rd,
-         xd, yd + hd - rd);
-      XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + wd, yd + rd,
-         xd + wd, yd + hd - rd + 1);
-      XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd,
-        rw_d, rh_d, 90 * 64, 90 * 64);
-      XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + wd - rw_d, yd,
-//        rw_d, rh_d, 0, 90 * 64);
-        rw_d, rh_d, 0, 91 * 64);
-      XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + wd - rw_d,
-        yd + hd - rh_d,
-        rw_d, rh_d, 269 * 64, 92 * 64);
-      XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd + hd - rh_d,
-        rw_d, rh_d, 180 * 64, 90 * 64);
+        if (m_window && m_window->GetBackingPixmap())
+        {
+            XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2 + rd2, yd2, wd2 - rw_d2, hd2);
+            XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2, yd2 + rd2, wd2, hd2 - rh_d2);
+
+            XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2, yd2, rw_d2, rh_d2, 90 * 64, 90 * 64);
+            XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2 + wd2 - rw_d2, yd2,
+                //            rw_d2, rh_d2, 0, 90 * 64);
+                rw_d2, rh_d2, 0, 91 * 64);
+            XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2 + wd2 - rw_d2,
+                yd2 + hd2 - rh_d2,
+                //            rw_d2, rh_d2, 270 * 64, 90 * 64);
+                rw_d2, rh_d2, 269 * 64, 92 * 64);
+            XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2, yd2 + hd2 - rh_d2,
+                rw_d2, rh_d2, 180 * 64, 90 * 64);
+        }
+    }

 
 

-      if (m_window && m_window->GetBackingPixmap())
+    if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)

     {
     {

-      XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-             xd2 + rd2, yd2,
-             xd2 + wd2 - rd2 + 1, yd2);
-      XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-             xd2 + rd2, yd2 + hd2,
-          xd2 + wd2 - rd2, yd2 + hd2);
-
-      XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-             xd2, yd2 + rd2,
-             xd2, yd2 + hd2 - rd2);
-      XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-             xd2 + wd2, yd2 + rd2,
-          xd2 + wd2, yd2 + hd2 - rd2 + 1);
-      XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-            xd2, yd2,
-            rw_d2, rh_d2, 90 * 64, 90 * 64);
-      XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-            xd2 + wd2 - rw_d2, yd2,
-//            rw_d2, rh_d2, 0, 90 * 64);
-            rw_d2, rh_d2, 0, 91 * 64);
-      XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-            xd2 + wd2 - rw_d2,
-            yd2 + hd2 - rh_d2,
-            rw_d2, rh_d2, 269 * 64, 92 * 64);
-      XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-            xd2, yd2 + hd2 - rh_d2,
-            rw_d2, rh_d2, 180 * 64, 90 * 64);
+        SetPen (m_pen);
+        XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + rd, yd,
+            xd + wd - rd + 1, yd);
+        XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + rd, yd + hd,
+            xd + wd - rd, yd + hd);
+
+        XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd + rd,
+            xd, yd + hd - rd);
+        XDrawLine ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + wd, yd + rd,
+            xd + wd, yd + hd - rd + 1);
+        XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd,
+            rw_d, rh_d, 90 * 64, 90 * 64);
+        XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + wd - rw_d, yd,
+            //        rw_d, rh_d, 0, 90 * 64);
+            rw_d, rh_d, 0, 91 * 64);
+        XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd + wd - rw_d,
+            yd + hd - rh_d,
+            rw_d, rh_d, 269 * 64, 92 * 64);
+        XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd + hd - rh_d,
+            rw_d, rh_d, 180 * 64, 90 * 64);
+
+        if (m_window && m_window->GetBackingPixmap())
+        {
+            XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2 + rd2, yd2,
+                xd2 + wd2 - rd2 + 1, yd2);
+            XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2 + rd2, yd2 + hd2,
+                xd2 + wd2 - rd2, yd2 + hd2);
+
+            XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2, yd2 + rd2,
+                xd2, yd2 + hd2 - rd2);
+            XDrawLine ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2 + wd2, yd2 + rd2,
+                xd2 + wd2, yd2 + hd2 - rd2 + 1);
+            XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2, yd2,
+                rw_d2, rh_d2, 90 * 64, 90 * 64);
+            XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2 + wd2 - rw_d2, yd2,
+                //            rw_d2, rh_d2, 0, 90 * 64);
+                rw_d2, rh_d2, 0, 91 * 64);
+            XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2 + wd2 - rw_d2,
+                yd2 + hd2 - rh_d2,
+                rw_d2, rh_d2, 269 * 64, 92 * 64);
+            XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                xd2, yd2 + hd2 - rh_d2,
+                rw_d2, rh_d2, 180 * 64, 90 * 64);
+        }

     }
     }

-  }
-  CalcBoundingBox (x, y);
-  CalcBoundingBox (x + width, y + height);
+    CalcBoundingBox (x, y);
+    CalcBoundingBox (x + width, y + height);

 
 
 
 

-};
+}

 
 

-void wxWindowDC::DrawEllipse( long x, long y, long width, long height )
+void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

-  if (!Ok()) return;
-  
-  // Check for negative width and height
-  if (height < 0)
-  {
-    y = y + height;
-    height = - height ;
-  }
-
-  if (width < 0)
-  {
-    x = x + width;
-    width = - width ;
-  }
-
-//  FreeGetPixelCache();
-
-  static const int angle = 23040;
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-  int xd, yd, wd, hd;
-
-  xd = XLOG2DEV(x);
-  yd = YLOG2DEV(y);
-  wd = XLOG2DEVREL(width) ;
-  hd = YLOG2DEVREL(height) ;
-
-  if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)
+    // Check for negative width and height
+    if (height < 0)

     {
     {

-      SetBrush (m_brush);
-      XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, 0, angle);
-      if (m_window && m_window->GetBackingPixmap())
-        XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-          XLOG2DEV_2 (x), YLOG2DEV_2 (y),
-          XLOG2DEVREL (width) - WX_GC_CF,
-          YLOG2DEVREL (height) - WX_GC_CF, 0, angle);
+        y = y + height;
+        height = - height ;

     }
 
     }
 

-  if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)
+    if (width < 0)

     {
     {

-      if (m_autoSetting)
-    SetPen (m_pen);
-      XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, 0, angle);
-      if (m_window && m_window->GetBackingPixmap())
-        XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-          XLOG2DEV_2 (x), YLOG2DEV_2 (y),
-          XLOG2DEVREL (width) - WX_GC_CF,
-          YLOG2DEVREL (height) - WX_GC_CF, 0, angle);
+        x = x + width;
+        width = - width ;

     }
     }

-  CalcBoundingBox (x, y);
-  CalcBoundingBox (x + width, y + height);

 
 

-};
+    //  FreeGetPixelCache();

 
 

-bool wxWindowDC::CanDrawBitmap(void) const
-{
-  return TRUE;
-};
+    static const int angle = 23040;

 
 

-/* Used when copying between drawables on different (Display*) m_displays.
-   Not very fast, but better than giving up.
- */
+    int xd, yd, wd, hd;

 
 

-static void XCopyRemote(Display *src_display, Display *dest_display,
-            Drawable src, Drawable dest,
-            GC destgc,
-            int srcx, int srcy,
-            unsigned int w, unsigned int h,
-            int destx, int desty,
-            bool more, XImage **cache)
-{
-  XImage *image, *destimage;
-  Colormap destcm, srccm;
-#define CACHE_SIZE 256
-  unsigned int i, j;
-  unsigned long cachesrc[CACHE_SIZE], cachedest[CACHE_SIZE];
-  int k, cache_pos, all_cache;
-
-  if (!cache || !*cache)
-    image = XGetImage(src_display, src, srcx, srcy, w, h, AllPlanes, ZPixmap);
-  else
-    image = *cache;
-
-  destimage = XGetImage(dest_display, dest, destx, desty, w, h, AllPlanes, ZPixmap);
-
-  srccm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) src_display);
-  destcm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dest_display);
-
-  cache_pos = 0;
-  all_cache = FALSE;
-
-  for (i = 0; i < w; i++)
-    for (j = 0; j < h; j++) {
-      unsigned long pixel;
-      XColor xcol;
-
-      pixel = XGetPixel(image, i, j);
-      for (k = cache_pos; k--; )
-    if (cachesrc[k] == pixel) {
-      pixel = cachedest[k];
-      goto install;
-    }
-      if (all_cache)
-    for (k = CACHE_SIZE; k-- > cache_pos; )
-      if (cachesrc[k] == pixel) {
-        pixel = cachedest[k];
-        goto install;
-      }
-
-      cachesrc[cache_pos] = xcol.pixel = pixel;
-      XQueryColor(src_display, srccm, &xcol);
-      if (!XAllocColor(dest_display, destcm, &xcol))
-    xcol.pixel = 0;
-      cachedest[cache_pos] = pixel = xcol.pixel;
-      
-      if (++cache_pos >= CACHE_SIZE) {
-    cache_pos = 0;
-    all_cache = TRUE;
-      }
+    xd = XLOG2DEV(x);
+    yd = YLOG2DEV(y);
+    wd = XLOG2DEVREL(width) ;
+    hd = YLOG2DEVREL(height) ;

 
 

-    install:
-      XPutPixel(destimage, i, j, pixel);
+    if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)
+    {
+        SetBrush (m_brush);
+        XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, 0, angle);
+        if (m_window && m_window->GetBackingPixmap())
+            XFillArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+            XLOG2DEV_2 (x), YLOG2DEV_2 (y),
+            XLOG2DEVREL (width) - WX_GC_CF,
+            YLOG2DEVREL (height) - WX_GC_CF, 0, angle);

     }
 
     }
 

-  XPutImage(dest_display, dest, destgc, destimage, 0, 0, destx, desty, w, h);
-  XDestroyImage(destimage);
+    if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)
+    {
+        if (m_autoSetting)
+            SetPen (m_pen);
+        XDrawArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, 0, angle);
+        if (m_window && m_window->GetBackingPixmap())
+            XDrawArc ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+            XLOG2DEV_2 (x), YLOG2DEV_2 (y),
+            XLOG2DEVREL (width) - WX_GC_CF,
+            YLOG2DEVREL (height) - WX_GC_CF, 0, angle);
+    }
+    CalcBoundingBox (x, y);
+    CalcBoundingBox (x + width, y + height);

 
 

-  if (more)
-    *cache = image;
-  else
-    XDestroyImage(image);

 }
 
 }
 

-void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
+bool wxWindowDC::CanDrawBitmap() const

 {
 {

-  if (!Ok()) return;
-  
-  if (!icon.Ok()) return;
-  
-//  FreeGetPixelCache();
-
-  // Be sure that foreground pixels (1) of
-  // the Icon will be painted with pen colour. [m_pen.SetColour()]
-  // Background pixels (0) will be painted with
-  // last selected background color. [::SetBackground]
-  if (m_pen.Ok() && m_autoSetting)
-    SetPen (m_pen);
-
-  int width, height;
-  Pixmap iconPixmap = (Pixmap) icon.GetPixmap();
-  width = icon.GetWidth();
-  height = icon.GetHeight();
-  if (icon.GetDisplay() == m_display)
-  {
-   if (icon.GetDepth() <= 1)
-   {
-       XCopyPlane  ((Display*) m_display, iconPixmap, (Pixmap) m_pixmap, (GC) m_gc,
-                    0, 0, width, height,
-                    (int) XLOG2DEV (x), (int) YLOG2DEV (y), 1);
-   }
-   else
-   {
-       XCopyArea  ((Display*) m_display, iconPixmap, (Pixmap) m_pixmap, (GC) m_gc,
-                  0, 0, width, height,
-                  (int) XLOG2DEV (x), (int) YLOG2DEV (y));
-   }
-
-
-  if (m_window && m_window->GetBackingPixmap())
-  {
-     if (icon.GetDepth() <= 1)
-     {
-        XCopyPlane ((Display*) m_display, iconPixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-          0, 0, width, height, (int) XLOG2DEV_2 (x), (int) YLOG2DEV_2 (y), 1);
-     }
-     else
-     {
-       XCopyArea  ((Display*) m_display, iconPixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-                  0, 0, width, height,
-                  (int) XLOG2DEV_2 (x), (int) YLOG2DEV_2 (y));
-     }
-  }
-  } else { /* Remote copy (different (Display*) m_displays) */
-    XImage *cache = NULL;
-    if (m_window && m_window->GetBackingPixmap())
-      XCopyRemote((Display*) icon.GetDisplay(), (Display*) m_display, iconPixmap, (Pixmap) m_window->GetBackingPixmap(),
-         (GC) m_gcBacking, 0, 0, width, height,
-          (int) XLOG2DEV_2 (x), (int) YLOG2DEV_2 (y), TRUE, &cache);
-    XCopyRemote((Display*) icon.GetDisplay(), (Display*) m_display, iconPixmap, (Pixmap) m_pixmap, (GC) m_gc,
-        0, 0, width, height,
-        (int) XLOG2DEV (x), (int) YLOG2DEV (y), FALSE, &cache);
-  }
-  CalcBoundingBox (x, y);
+    wxCHECK_MSG( Ok(), FALSE, "invalid dc" );

 
 

-};
+    return TRUE;
+}

 
 

-bool wxWindowDC::Blit( long xdest, long ydest, long width, long height,
-       wxDC *source, long xsrc, long ysrc, int rop, bool useMask )
+#if 0
+void wxWindowDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y)

 {
 {

-  if (!Ok()) return FALSE;
-
-  wxASSERT_MSG( (source->IsKindOf(CLASSINFO(wxWindowDC))), "Blit source DC must be wxWindowDC or derived class." );
+    //  FreeGetPixelCache();

 
 

-  wxWindowDC* sourceDC = (wxWindowDC*) source;
-  
-//  FreeGetPixelCache();
-
-  // Be sure that foreground pixels (1) of
-  // the Icon will be painted with pen colour. [m_pen.SetColour()]
-  // Background pixels (0) will be painted with
-  // last selected background color. [::SetBackground]
-  if (m_pen.Ok() && m_autoSetting)
-    SetPen (m_pen);
+    // Be sure that foreground pixels (1) of
+    // the Icon will be painted with pen colour. [m_pen.SetColour()]
+    // Background pixels (0) will be painted with
+    // last selected background color. [::SetBackground]
+    if (m_pen.Ok() && m_autoSetting)
+        SetPen (m_pen);

 
 

-  if (m_pixmap && sourceDC->m_pixmap)
+    int width, height;
+    Pixmap iconPixmap = (Pixmap) icon.GetPixmap();
+    width = icon.GetWidth();
+    height = icon.GetHeight();
+    if (icon.GetDisplay() == m_display)

     {
     {

-      /* MATTHEW: [9] */
-      int orig = m_logicalFunction;
-
-      SetLogicalFunction (rop);
+        if (icon.GetDepth() <= 1)
+        {
+            XCopyPlane  ((Display*) m_display, iconPixmap, (Pixmap) m_pixmap, (GC) m_gc,
+                0, 0, width, height,
+                (int) XLOG2DEV (x), (int) YLOG2DEV (y), 1);
+        }
+        else
+        {
+            XCopyArea  ((Display*) m_display, iconPixmap, (Pixmap) m_pixmap, (GC) m_gc,
+                0, 0, width, height,
+                (int) XLOG2DEV (x), (int) YLOG2DEV (y));
+        }

 
 

-      if (m_display != sourceDC->m_display)
-      {
-        XImage *cache = NULL;

 
         if (m_window && m_window->GetBackingPixmap())
 
         if (m_window && m_window->GetBackingPixmap())

-            XCopyRemote((Display*) sourceDC->m_display, (Display*) m_display,
-              (Pixmap) sourceDC->m_pixmap, (Pixmap) m_window->GetBackingPixmap(),
-             (GC) m_gcBacking,
-              source->LogicalToDeviceX (xsrc),
-              source->LogicalToDeviceY (ysrc),
-              source->LogicalToDeviceXRel(width),
-              source->LogicalToDeviceYRel(height),
-              XLOG2DEV_2 (xdest), YLOG2DEV_2 (ydest),
-              TRUE, &cache);
-
-        if ( useMask && source->IsKindOf(CLASSINFO(wxMemoryDC)) )

         {
         {

-            wxMemoryDC *memDC = (wxMemoryDC *)source;
-            wxBitmap& sel = memDC->GetBitmap();
-            if ( sel.Ok() && sel.GetMask() && sel.GetMask()->GetPixmap() )
+            if (icon.GetDepth() <= 1)
+            {
+                XCopyPlane ((Display*) m_display, iconPixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                    0, 0, width, height, (int) XLOG2DEV_2 (x), (int) YLOG2DEV_2 (y), 1);
+            }
+            else

             {
             {

-                XSetClipMask   ((Display*) m_display, (GC) m_gc, (Pixmap) sel.GetMask()->GetPixmap());
-                XSetClipOrigin ((Display*) m_display, (GC) m_gc, XLOG2DEV (xdest), YLOG2DEV (ydest));
+                XCopyArea  ((Display*) m_display, iconPixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                    0, 0, width, height,
+                    (int) XLOG2DEV_2 (x), (int) YLOG2DEV_2 (y));

             }
         }
             }
         }

+    } else { /* Remote copy (different (Display*) m_displays) */
+        XImage *cache = NULL;
+        if (m_window && m_window->GetBackingPixmap())
+            XCopyRemote((Display*) icon.GetDisplay(), (Display*) m_display, iconPixmap, (Pixmap) m_window->GetBackingPixmap(),
+            (GC) m_gcBacking, 0, 0, width, height,
+            (int) XLOG2DEV_2 (x), (int) YLOG2DEV_2 (y), TRUE, &cache);
+        XCopyRemote((Display*) icon.GetDisplay(), (Display*) m_display, iconPixmap, (Pixmap) m_pixmap, (GC) m_gc,
+            0, 0, width, height,
+            (int) XLOG2DEV (x), (int) YLOG2DEV (y), FALSE, &cache);
+    }
+    CalcBoundingBox (x, y);
+}
+#endif // 0

 
 

-        XCopyRemote((Display*) sourceDC->m_display, (Display*) m_display, (Pixmap) sourceDC->m_pixmap, (Pixmap) m_pixmap, (GC) m_gc,
-            source->LogicalToDeviceX (xsrc),
-            source->LogicalToDeviceY (ysrc),
-            source->LogicalToDeviceXRel(width),
-            source->LogicalToDeviceYRel(height),
-            XLOG2DEV (xdest), YLOG2DEV (ydest),
-            FALSE, &cache);
+// TODO: use scaled Blit e.g. as per John Price's implementation in Contrib/Utilities
+bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+                         wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask,
+                         wxCoord xsrcMask, wxCoord ysrcMask )
+{
+    wxCHECK_MSG( Ok(), FALSE, "invalid dc" );

 
 

-        if ( useMask )
-        {
-            XSetClipMask   ((Display*) m_display, (GC) m_gc, None);
-            XSetClipOrigin ((Display*) m_display, (GC) m_gc, 0, 0);
-        }
-    
-    } else
-    {
-      if (m_window && m_window->GetBackingPixmap())
-      {
-// +++ MARKUS (mho@comnets.rwth-aachen): error on blitting bitmaps with depth 1
-        if (source->IsKindOf(CLASSINFO(wxMemoryDC)) && ((wxMemoryDC*) source)->GetBitmap().GetDepth() == 1)
-        {
-           XCopyPlane ((Display*) m_display, (Pixmap) sourceDC->m_pixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-                   source->LogicalToDeviceX (xsrc),
-                  source->LogicalToDeviceY (ysrc),
-                  source->LogicalToDeviceXRel(width),
-                  source->LogicalToDeviceYRel(height),
-                  XLOG2DEV_2 (xdest), YLOG2DEV_2 (ydest), 1);
-        }
-      else
-        {
-           XCopyArea ((Display*) m_display, (Pixmap) sourceDC->m_pixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-                  source->LogicalToDeviceX (xsrc),
-                 source->LogicalToDeviceY (ysrc),
-                 source->LogicalToDeviceXRel(width),
-                 source->LogicalToDeviceYRel(height),
-                 XLOG2DEV_2 (xdest), YLOG2DEV_2 (ydest));
-        }
-    }
-    if ( useMask && source->IsKindOf(CLASSINFO(wxMemoryDC)) )
-    {
-        wxMemoryDC *memDC = (wxMemoryDC *)source;
-        wxBitmap& sel = memDC->GetBitmap();
-        if ( sel.Ok() && sel.GetMask() && sel.GetMask()->GetPixmap() )
-        {
-            XSetClipMask   ((Display*) m_display, (GC) m_gc, (Pixmap) sel.GetMask()->GetPixmap());
-            XSetClipOrigin ((Display*) m_display, (GC) m_gc, XLOG2DEV (xdest), YLOG2DEV (ydest));
-        }
-    }
+    wxWindowDC* sourceDC = wxDynamicCast(source, wxWindowDC);

 
 

-      // Check if we're copying from a mono bitmap
-      if (source->IsKindOf(CLASSINFO(wxMemoryDC)) &&
-          ((wxMemoryDC*)source)->GetBitmap().Ok() && (((wxMemoryDC*)source)->GetBitmap().GetDepth () == 1))
-      {
-        XCopyPlane ((Display*) m_display, (Pixmap) sourceDC->m_pixmap, (Pixmap) m_pixmap, (GC) m_gc,
-              source->LogicalToDeviceX (xsrc),
-              source->LogicalToDeviceY (ysrc),
-              source->LogicalToDeviceXRel(width),
-              source->LogicalToDeviceYRel(height),
-              XLOG2DEV (xdest), YLOG2DEV (ydest), 1);
-      }
-      else
-      {
-        XCopyArea ((Display*) m_display, (Pixmap) sourceDC->m_pixmap, (Pixmap) m_pixmap, (GC) m_gc,
-             source->LogicalToDeviceX (xsrc),
-             source->LogicalToDeviceY (ysrc),
-             source->LogicalToDeviceXRel(width),
-             source->LogicalToDeviceYRel(height),
-             XLOG2DEV (xdest), YLOG2DEV (ydest));
-
-      }
-    if ( useMask )
-    {
-        XSetClipMask   ((Display*) m_display, (GC) m_gc, None);
-        XSetClipOrigin ((Display*) m_display, (GC) m_gc, 0, 0);
-    }
+    wxASSERT_MSG( sourceDC, "Blit source DC must be wxWindowDC or derived class." );

 
 

-    } /* Remote/local (Display*) m_display */
-    CalcBoundingBox (xdest, ydest);
-    CalcBoundingBox (xdest + width, ydest + height);
-    
-    SetLogicalFunction(orig);
+    //  FreeGetPixelCache();

 
 

-    return TRUE;
-  }
-  return FALSE;
-};
+    // Be sure that foreground pixels (1) of the Icon will be painted with
+    // foreground colour. [m_textForegroundColour] Background pixels (0)
+    // will be painted with backgound colour (m_textBackgroundColour)
+    // Using ::SetPen is horribly slow, so avoid doing it
+    int oldBackgroundPixel = -1;
+    int oldForegroundPixel = -1;

 
 

-/* Helper function for 16-bit fonts */
-static int str16len(const char *s)
-{
-  int count = 0;
+    if (m_textBackgroundColour.Ok())
+    {
+        oldBackgroundPixel = m_backgroundPixel;
+        int pixel = m_textBackgroundColour.AllocColour(m_display);

 
 

-  while (s[0] && s[1]) {
-    count++;
-    s += 2;
-  }
+        XSetBackground ((Display*) m_display, (GC) m_gc, pixel);
+        if (m_window && m_window->GetBackingPixmap())
+            XSetBackground ((Display*) m_display,(GC) m_gcBacking,
+                            pixel);
+    }
+    if (m_textForegroundColour.Ok())
+    {
+        oldForegroundPixel = m_currentColour.GetPixel();

 
 

-  return count;
-}
+        if( m_textForegroundColour.GetPixel() <= -1 )
+            CalculatePixel( m_textForegroundColour,
+                            m_textForegroundColour, TRUE);
+ 
+        int pixel = m_textForegroundColour.GetPixel();
+        if (pixel > -1)
+            SetForegroundPixelWithLogicalFunction(pixel);
+    }

 
 

-void wxWindowDC::DrawText( const wxString &text, long x, long y, bool use16 )
-{
-  if (!Ok()) return;
-
-  // Since X draws from the baseline of the text, must
-  // add the text height
-  int cx = 0;
-  int cy = 0;
-  int ascent = 0;
-  int slen;
-
-  if (use16)
-    slen = str16len(text);
-  else
-    slen = strlen(text);
+    // Do bitmap scaling if necessary
+
+    wxBitmap *scaledBitmap = (wxBitmap*) NULL;
+    Pixmap sourcePixmap = (Pixmap) NULL;
+    double scaleX, scaleY;
+    GetUserScale(& scaleX, & scaleY);
+    bool retVal = FALSE;

 
 

-  if (m_font.Ok())
+    /* TODO: use the mask origin when drawing transparently */
+    if (xsrcMask == -1 && ysrcMask == -1)

     {
     {

-      WXFontStructPtr pFontStruct = m_font.FindOrCreateFontStruct(m_userScaleY*m_logicalScaleY);
-      int direction, descent;
-      XCharStruct overall_return;
-      if (use16)
-        (void)XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *)(const char*) text, slen, &direction,
-                 &ascent, &descent, &overall_return);
-      else
-        (void)XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) text, slen, &direction,
-               &ascent, &descent, &overall_return);
-      cx = overall_return.width;
-      cy = ascent + descent;
+        xsrcMask = xsrc; ysrcMask = ysrc;

     }
 
     }
 

-  // First draw a rectangle representing the text background,
-  // if a text background is specified
-  if (m_textBackgroundColour.Ok () && (m_backgroundMode != wxTRANSPARENT))
+    // Sorry, can't scale masks just yet
+    if (!useMask && (scaleX != 1.0 || scaleY != 1.0) && sourceDC->IsKindOf(CLASSINFO(wxMemoryDC)))

     {
     {

-      wxColour oldPenColour = m_currentColour;
-      m_currentColour = m_textBackgroundColour;
-      bool sameColour = (oldPenColour.Ok () && m_textBackgroundColour.Ok () &&
-        (oldPenColour.Red () == m_textBackgroundColour.Red ()) &&
-          (oldPenColour.Blue () == m_textBackgroundColour.Blue ()) &&
-        (oldPenColour.Green () == m_textBackgroundColour.Green ()));
-
-      // This separation of the big && test required for gcc2.7/HP UX 9.02
-      // or pixel value can be corrupted!
-      sameColour = (sameColour &&
-           (oldPenColour.GetPixel() == m_textBackgroundColour.GetPixel()));
-
-      if (!sameColour || !GetOptimization())
-      {
-        int pixel = m_textBackgroundColour.AllocColour(m_display);
-        m_currentColour = m_textBackgroundColour;
+        wxMemoryDC* memDC = (wxMemoryDC*) sourceDC;
+        wxBitmap& bitmap = memDC->GetBitmap();

 
 

-        // Set the GC to the required colour
-        if (pixel > -1)
-        {
-          XSetForeground ((Display*) m_display, (GC) m_gc, pixel);
-          if (m_window && m_window->GetBackingPixmap())
-            XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel);
-        }
-      }
-      else
-        m_textBackgroundColour = oldPenColour ;
-
-      XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y), cx, cy);
-      if (m_window && m_window->GetBackingPixmap())
-        XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-            XLOG2DEV_2 (x), YLOG2DEV_2 (y), cx, cy);
-    }
+        wxASSERT_MSG( (bitmap.Ok()), "Bad source bitmap in wxWindowDC::Blit");

 
 

-  // Now set the text foreground and draw the text
-  if (m_textForegroundColour.Ok ())
-  {
-      wxColour oldPenColour = m_currentColour;
-      m_currentColour = m_textForegroundColour;
-      bool sameColour = (oldPenColour.Ok () && m_currentColour.Ok () &&
-              (oldPenColour.Red () == m_currentColour.Red ()) &&
-               (oldPenColour.Blue () == m_currentColour.Blue ()) &&
-             (oldPenColour.Green () == m_currentColour.Green ()) &&
-              (oldPenColour.GetPixel() == m_currentColour.GetPixel()));
-
-      if (!sameColour || !GetOptimization())
-      {
-        int pixel = -1;
-        if (!m_colour) // Mono display
+        wxImage image = bitmap.ConvertToImage();
+        if (!image.Ok())

         {
         {

-          // Unless foreground is really white, draw it in black
-          unsigned char red = m_textForegroundColour.Red ();
-          unsigned char blue = m_textForegroundColour.Blue ();
-          unsigned char green = m_textForegroundColour.Green ();
-          if (red == (unsigned char) 255 && blue == (unsigned char) 255
-                && green == (unsigned char) 255)
-          {
-            m_currentColour = *wxWHITE;
-            pixel = (int) WhitePixel ((Display*) m_display, DefaultScreen ((Display*) m_display));
-            m_currentColour.SetPixel(pixel);
-            m_textForegroundColour.SetPixel(pixel);
-          }
-          else
-          {
-            m_currentColour = *wxBLACK;
-            pixel = (int) BlackPixel ((Display*) m_display, DefaultScreen ((Display*) m_display));
-            m_currentColour.SetPixel(pixel);
-            m_textForegroundColour.SetPixel(pixel);
-          }
+            sourcePixmap = (Pixmap) bitmap.GetPixmap();

         }
         else
         {
         }
         else
         {

-            pixel = m_textForegroundColour.AllocColour((Display*) m_display);
-            m_currentColour.SetPixel(pixel);
-        }
+            int scaledW = (int) (bitmap.GetWidth() * scaleX);
+            int scaledH = (int) (bitmap.GetHeight() * scaleY);

 
 

-        // Set the GC to the required colour
-        if (pixel > -1)
-        {
-            XSetForeground ((Display*) m_display, (GC) m_gc, pixel);
-            if (m_window && m_window->GetBackingPixmap())
-              XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel);
+            image = image.Scale(scaledW, scaledH);
+            scaledBitmap = new wxBitmap(image);
+            sourcePixmap = (Pixmap) scaledBitmap->GetPixmap();

         }
         }

-      }
-      else
-        m_textForegroundColour = oldPenColour;
-  }
-
-  // We need to add the ascent, not the whole height, since X draws
-  // at the point above the descender.
-  if (use16)
-    XDrawString16((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, 
-          (XChar2b *)(char*) (const char*) text, slen);
-  else
-    XDrawString((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, 
-        text, slen);
-
-  if (m_window && m_window->GetBackingPixmap()) {
-    if (use16)
-      XDrawString16((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
-            XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent,
-            (XChar2b *)(char*) (const char*) text, slen);
+    }

     else
     else

-      XDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
-          XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent, (char*) (const char*) text, slen);
-  }
+        sourcePixmap = (Pixmap) sourceDC->m_pixmap;

 
 

-  long w, h;
-  GetTextExtent (text, &w, &h);
-  CalcBoundingBox (x + w, y + h);
-  CalcBoundingBox (x, y);
-};
+    if (m_pixmap && sourcePixmap)
+    {
+        /* MATTHEW: [9] */
+        int orig = m_logicalFunction;

 
 

-bool wxWindowDC::CanGetTextExtent(void) const
-{
-  return TRUE;
-};
+        SetLogicalFunction (rop);

 
 

-void wxWindowDC::GetTextExtent( const wxString &string, long *width, long *height,
-                     long *descent, long *externalLeading,
-                     wxFont *font, bool use16 )
-{
-  if (!Ok()) return;
+        if (m_display != sourceDC->m_display)
+        {
+            XImage *cache = NULL;

 
 

-  wxFont* theFont = font;
-  if (!theFont)
-     theFont = & m_font;
-  
-  if (!theFont->Ok())
+            if (m_window && m_window->GetBackingPixmap())
+                XCopyRemote((Display*) sourceDC->m_display, (Display*) m_display,
+                (Pixmap) sourcePixmap, (Pixmap) m_window->GetBackingPixmap(),
+                (GC) m_gcBacking,
+                source->LogicalToDeviceX (xsrc),
+                source->LogicalToDeviceY (ysrc),
+                source->LogicalToDeviceXRel(width),
+                source->LogicalToDeviceYRel(height),
+                XLOG2DEV_2 (xdest), YLOG2DEV_2 (ydest),
+                TRUE, &cache);
+
+            if ( useMask && source->IsKindOf(CLASSINFO(wxMemoryDC)) )
+            {
+                wxMemoryDC *memDC = (wxMemoryDC *)source;
+                wxBitmap& sel = memDC->GetBitmap();
+                if ( sel.Ok() && sel.GetMask() && sel.GetMask()->GetPixmap() )
+                {
+                    XSetClipMask   ((Display*) m_display, (GC) m_gc, (Pixmap) sel.GetMask()->GetPixmap());
+                    XSetClipOrigin ((Display*) m_display, (GC) m_gc, XLOG2DEV (xdest), YLOG2DEV (ydest));
+                }
+            }
+
+            XCopyRemote((Display*) sourceDC->m_display, (Display*) m_display, (Pixmap) sourcePixmap, (Pixmap) m_pixmap, (GC) m_gc,
+                source->LogicalToDeviceX (xsrc),
+                source->LogicalToDeviceY (ysrc),
+                source->LogicalToDeviceXRel(width),
+                source->LogicalToDeviceYRel(height),
+                XLOG2DEV (xdest), YLOG2DEV (ydest),
+                FALSE, &cache);
+
+            if ( useMask )
+            {
+                XSetClipMask   ((Display*) m_display, (GC) m_gc, None);
+                XSetClipOrigin ((Display*) m_display, (GC) m_gc, 0, 0);
+            }
+
+        } else
+        {        //XGCValues values;
+        //XGetGCValues((Display*)m_display, (GC)m_gc, GCForeground, &values);   
+
+            if (m_window && m_window->GetBackingPixmap())
+            {
+                // +++ MARKUS (mho@comnets.rwth-aachen): error on blitting bitmaps with depth 1
+                if (source->IsKindOf(CLASSINFO(wxMemoryDC)) && ((wxMemoryDC*) source)->GetBitmap().GetDepth() == 1)
+                {
+                    XCopyPlane ((Display*) m_display, (Pixmap) sourcePixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                        source->LogicalToDeviceX (xsrc),
+                        source->LogicalToDeviceY (ysrc),
+                        source->LogicalToDeviceXRel(width),
+                        source->LogicalToDeviceYRel(height),
+                        XLOG2DEV_2 (xdest), YLOG2DEV_2 (ydest), 1);
+                }
+                else
+                {
+                    XCopyArea ((Display*) m_display, (Pixmap) sourcePixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                        source->LogicalToDeviceX (xsrc),
+                        source->LogicalToDeviceY (ysrc),
+                        source->LogicalToDeviceXRel(width),
+                        source->LogicalToDeviceYRel(height),
+                        XLOG2DEV_2 (xdest), YLOG2DEV_2 (ydest));
+                }
+            }
+            if ( useMask && source->IsKindOf(CLASSINFO(wxMemoryDC)) )
+            {
+                wxMemoryDC *memDC = (wxMemoryDC *)source;
+                wxBitmap& sel = memDC->GetBitmap();
+                if ( sel.Ok() && sel.GetMask() && sel.GetMask()->GetPixmap() )
+                {
+                    XSetClipMask   ((Display*) m_display, (GC) m_gc, (Pixmap) sel.GetMask()->GetPixmap());
+                    XSetClipOrigin ((Display*) m_display, (GC) m_gc, XLOG2DEV (xdest), YLOG2DEV (ydest));
+                }
+            }
+
+            // Check if we're copying from a mono bitmap
+            if (source->IsKindOf(CLASSINFO(wxMemoryDC)) &&
+                ((wxMemoryDC*)source)->GetBitmap().Ok() && (((wxMemoryDC*)source)->GetBitmap().GetDepth () == 1))
+            {
+                XCopyPlane ((Display*) m_display, (Pixmap) sourcePixmap, (Pixmap) m_pixmap, (GC) m_gc,
+                    source->LogicalToDeviceX (xsrc),
+                    source->LogicalToDeviceY (ysrc),
+                    source->LogicalToDeviceXRel(width),
+                    source->LogicalToDeviceYRel(height),
+                    XLOG2DEV (xdest), YLOG2DEV (ydest), 1);
+            }
+            else
+            {
+                XCopyArea ((Display*) m_display, (Pixmap) sourcePixmap, (Pixmap) m_pixmap, (GC) m_gc,
+                    source->LogicalToDeviceX (xsrc),
+                    source->LogicalToDeviceY (ysrc),
+                    source->LogicalToDeviceXRel(width),
+                    source->LogicalToDeviceYRel(height),
+                    XLOG2DEV (xdest), YLOG2DEV (ydest));
+
+            }
+            if ( useMask )
+            {
+                XSetClipMask   ((Display*) m_display, (GC) m_gc, None);
+                XSetClipOrigin ((Display*) m_display, (GC) m_gc, 0, 0);
+            }
+
+        } /* Remote/local (Display*) m_display */
+        CalcBoundingBox (xdest, ydest);
+        CalcBoundingBox (xdest + width, ydest + height);
+
+        SetLogicalFunction(orig);
+
+        retVal = TRUE;
+  }
+  if (scaledBitmap) delete scaledBitmap;
+
+  if (oldBackgroundPixel > -1)
+  {
+      XSetBackground ((Display*) m_display, (GC) m_gc, oldBackgroundPixel);
+      if (m_window && m_window->GetBackingPixmap())
+          XSetBackground ((Display*) m_display,(GC) m_gcBacking,
+                          oldBackgroundPixel);
+  }
+  if (oldForegroundPixel > -1)

   {
   {

-    // TODO: this should be an error log function
-    cerr << "wxWindows warning - set a valid font before calling GetTextExtent!\n";
-    *width = -1;
-    *height = -1;
-    return;
+      XSetForeground ((Display*) m_display, (GC) m_gc, oldForegroundPixel);
+      if (m_window && m_window->GetBackingPixmap())
+          XSetForeground ((Display*) m_display,(GC) m_gcBacking,
+                          oldForegroundPixel);

   }
 
   }
 

-  WXFontStructPtr pFontStruct = theFont->FindOrCreateFontStruct(m_userScaleY*m_logicalScaleY);
+  return retVal;
+}

 
 

-  int direction, ascent, descent2;
-  XCharStruct overall;
-  int slen;
-  
-  if (use16) slen = str16len(string); else slen = strlen(string);
-
-  if (use16)
-    XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction,
-           &ascent, &descent2, &overall);
-  else
-     XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) string, slen, &direction,
-         &ascent, &descent2, &overall);
-
-  *width = XDEV2LOGREL (overall.width);
-  *height = YDEV2LOGREL (ascent + descent2);
-  if (descent)
-    *descent = descent2;
-  if (externalLeading)
-    *externalLeading = 0;
-};
-
-long wxWindowDC::GetCharWidth(void)
+void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )

 {
 {

-  if (!Ok()) return 0;
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-  if (!m_font.Ok())
-    return 0;
+    // Since X draws from the baseline of the text, must add the text height
+    int cx = 0;
+    int cy = 0;
+    int ascent = 0;
+    int slen;

 
 

-  WXFontStructPtr pFontStruct = m_font.FindOrCreateFontStruct(m_userScaleY * m_logicalScaleY);
+    slen = strlen(text);

 
 

-  int direction, ascent, descent;
-  XCharStruct overall;
-  XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
-        &descent, &overall);
-  return XDEV2LOGREL(overall.width);
-};
+    if (m_font.Ok())
+    {
+        WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
+        int direction, descent;
+        XCharStruct overall_return;
+#if 0
+        if (use16)
+            (void)XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *)(const char*) text, slen, &direction,
+            &ascent, &descent, &overall_return);
+        else
+#endif // 0
+            (void)XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) text, slen, &direction,
+                               &ascent, &descent, &overall_return);
+
+        cx = overall_return.width;
+        cy = ascent + descent;
+    }
+
+    // First draw a rectangle representing the text background, if a text
+    // background is specified
+    if (m_textBackgroundColour.Ok () && (m_backgroundMode != wxTRANSPARENT))
+    {
+        wxColour oldPenColour = m_currentColour;
+        m_currentColour = m_textBackgroundColour;
+        bool sameColour = (oldPenColour.Ok () && m_textBackgroundColour.Ok () &&
+            (oldPenColour.Red () == m_textBackgroundColour.Red ()) &&
+            (oldPenColour.Blue () == m_textBackgroundColour.Blue ()) &&
+            (oldPenColour.Green () == m_textBackgroundColour.Green ()));
+
+        // This separation of the big && test required for gcc2.7/HP UX 9.02
+        // or pixel value can be corrupted!
+        sameColour = (sameColour &&
+            (oldPenColour.GetPixel() == m_textBackgroundColour.GetPixel()));

 
 

-long wxWindowDC::GetCharHeight(void)
+        if (!sameColour || !GetOptimization())
+        {
+            int pixel = m_textBackgroundColour.AllocColour(m_display);
+            m_currentColour = m_textBackgroundColour;
+
+            // Set the GC to the required colour
+            if (pixel > -1)
+            {
+                XSetForeground ((Display*) m_display, (GC) m_gc, pixel);
+                if (m_window && m_window->GetBackingPixmap())
+                    XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel);
+            }
+        }
+        else
+            m_textBackgroundColour = oldPenColour ;
+
+        XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y), cx, cy);
+        if (m_window && m_window->GetBackingPixmap())
+            XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+            XLOG2DEV_2 (x), YLOG2DEV_2 (y), cx, cy);
+    }
+
+    // Now set the text foreground and draw the text
+    if (m_textForegroundColour.Ok ())
+    {
+        wxColour oldPenColour = m_currentColour;
+        m_currentColour = m_textForegroundColour;
+        bool sameColour = (oldPenColour.Ok () && m_currentColour.Ok () &&
+            (oldPenColour.Red () == m_currentColour.Red ()) &&
+            (oldPenColour.Blue () == m_currentColour.Blue ()) &&
+            (oldPenColour.Green () == m_currentColour.Green ()) &&
+            (oldPenColour.GetPixel() == m_currentColour.GetPixel()));
+
+        if (!sameColour || !GetOptimization())
+        {
+            int pixel = CalculatePixel(m_textForegroundColour,
+                                       m_currentColour, FALSE);
+
+            // Set the GC to the required colour
+            if (pixel > -1)
+            {
+                XSetForeground ((Display*) m_display, (GC) m_gc, pixel);
+                if (m_window && m_window->GetBackingPixmap())
+                    XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel);
+            }
+        }
+        else
+            m_textForegroundColour = oldPenColour;
+    }
+
+    // We need to add the ascent, not the whole height, since X draws at the
+    // point above the descender.
+#if 0
+    if (use16)
+        XDrawString16((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent,
+        (XChar2b *)(char*) (const char*) text, slen);
+    else
+#endif // 0
+        XDrawString((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, text, slen);
+
+    if (m_window && m_window->GetBackingPixmap()) {
+#if 0
+        if (use16)
+            XDrawString16((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
+            XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent,
+            (XChar2b *)(char*) (const char*) text, slen);
+        else
+#endif // 0
+            XDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
+            XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent, (char*) (const char*) text, slen);
+    }
+
+    wxCoord w, h;
+    GetTextExtent (text, &w, &h);
+    CalcBoundingBox (x + w, y + h);
+    CalcBoundingBox (x, y);
+}
+
+void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )

 {
 {

-  if (!Ok()) return 0;
+    if (angle == 0.0)
+    {
+        DrawText(text, x, y);
+        return;
+    }

 
 

-  if (!m_font.Ok())
-    return 0;
+    wxCHECK_RET( Ok(), "invalid dc" );
+
+    // Since X draws from the baseline of the text, must add the text height
+    int cx = 0;
+    int cy = 0;
+    int ascent = 0;
+    int slen;
+
+    slen = strlen(text);

 
 

-  WXFontStructPtr pFontStruct = m_font.FindOrCreateFontStruct(m_userScaleY*m_logicalScaleY);
+    if (m_font.Ok())
+    {
+        // Calculate text extent.
+        WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
+        int direction, descent;
+        XCharStruct overall_return;
+#if 0
+        if (use16)
+            (void)XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *)(const char*) text, slen, &direction,
+            &ascent, &descent, &overall_return);
+        else
+#endif // 0
+            (void)XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) text, slen, &direction,
+                               &ascent, &descent, &overall_return);
+
+        cx = overall_return.width;
+        cy = ascent + descent;
+    }
+
+    wxBitmap src(cx, cy);
+    wxMemoryDC dc;
+    dc.SelectObject(src);
+    dc.SetFont(GetFont());
+    dc.SetBackground(*wxWHITE_BRUSH);
+    dc.SetBrush(*wxBLACK_BRUSH);
+    dc.Clear();
+    dc.DrawText(text, 0, 0);
+    dc.SetFont(wxNullFont);
+
+    // Calculate the size of the rotated bounding box.
+    double dx = cos(angle / 180.0 * M_PI);
+    double dy = sin(angle / 180.0 * M_PI);
+    double x4 = -cy * dy;
+    double y4 = cy * dx;
+    double x3 = cx * dx;
+    double y3 = cx * dy;
+    double x2 = x3 + x4;
+    double y2 = y3 + y4;
+    double x1 = x;
+    double y1 = y;
+
+    // Create image from the source bitmap after writing the text into it.
+    wxImage  image = src.ConvertToImage();
+
+    int minx = roundmin(0, roundmin(x4, roundmin(x2, x3)));
+    int miny = roundmin(0, roundmin(y4, roundmin(y2, y3)));
+    int maxx = roundmax(0, roundmax(x4, roundmax(x2, x3)));
+    int maxy = roundmax(0, roundmax(y4, roundmax(y2, y3)));
+
+    // This rotates counterclockwise around the top left corner.
+    for (int rx = minx; rx < maxx; rx++)
+    {
+        for (int ry = miny; ry < maxy; ry++)
+        {
+            // transform dest coords to source coords
+            int sx = (int) (rx * dx + ry * dy + 0.5);
+            int sy = (int) (ry * dx - rx * dy + 0.5);
+            if (sx >= 0 && sx < cx && sy >= 0 && sy < cy)
+            {
+                // draw black pixels, ignore white ones (i.e. transparent b/g)
+                if (image.GetRed(sx, sy) == 0)
+                {
+                    DrawPoint((wxCoord) (x1 + maxx - rx), (wxCoord) (cy + y1 - ry));
+                }
+                else
+                {
+                    // Background
+                    //DrawPoint(x1 + maxx - rx, cy + y1 + maxy - ry);
+                }
+            }
+        }
+    }

 
 

-  int direction, ascent, descent;
-  XCharStruct overall;
-  XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
+#if 0
+    // First draw a rectangle representing the text background, if a text
+    // background is specified
+    if (m_textBackgroundColour.Ok () && (m_backgroundMode != wxTRANSPARENT))
+    {
+        wxColour oldPenColour = m_currentColour;
+        m_currentColour = m_textBackgroundColour;
+        bool sameColour = (oldPenColour.Ok () && m_textBackgroundColour.Ok () &&
+            (oldPenColour.Red () == m_textBackgroundColour.Red ()) &&
+            (oldPenColour.Blue () == m_textBackgroundColour.Blue ()) &&
+            (oldPenColour.Green () == m_textBackgroundColour.Green ()));
+
+        // This separation of the big && test required for gcc2.7/HP UX 9.02
+        // or pixel value can be corrupted!
+        sameColour = (sameColour &&
+            (oldPenColour.GetPixel() == m_textBackgroundColour.GetPixel()));
+
+        if (!sameColour || !GetOptimization())
+        {
+            int pixel = m_textBackgroundColour.AllocColour(m_display);
+            m_currentColour = m_textBackgroundColour;
+
+            // Set the GC to the required colour
+            if (pixel > -1)
+            {
+                XSetForeground ((Display*) m_display, (GC) m_gc, pixel);
+                if (m_window && m_window->GetBackingPixmap())
+                    XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel);
+            }
+        }
+        else
+            m_textBackgroundColour = oldPenColour ;
+
+        XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y), cx, cy);
+        if (m_window && m_window->GetBackingPixmap())
+            XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+            XLOG2DEV_2 (x), YLOG2DEV_2 (y), cx, cy);
+    }
+#endif
+
+    long w, h;
+    // XXX use pixmap size
+    GetTextExtent (text, &w, &h);
+    CalcBoundingBox (x + w, y + h);
+    CalcBoundingBox (x, y);
+}
+
+bool wxWindowDC::CanGetTextExtent() const
+{
+    return TRUE;
+}
+
+void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
+                                wxCoord *descent, wxCoord *externalLeading,
+                                wxFont *font ) const
+{
+    wxCHECK_RET( Ok(), "invalid dc" );
+
+    wxFont* theFont = font;
+    if (!theFont)
+        theFont = (wxFont *)&m_font; // const_cast
+
+    if (!theFont->Ok())
+    {
+        // TODO: this should be an error log function
+        wxFAIL_MSG("set a valid font before calling GetTextExtent!");
+
+        if (width) *width = -1;
+        if (height) *height = -1;
+        return;
+    }
+
+    WXFontStructPtr pFontStruct = theFont->GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
+
+    int direction, ascent, descent2;
+    XCharStruct overall;
+    int slen;
+
+#if 0
+    if (use16)
+        slen = str16len(string);
+    else
+#endif // 0
+        slen = strlen(string);
+
+#if 0
+    if (use16)
+        XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction,
+        &ascent, &descent2, &overall);
+    else
+#endif // 0
+        XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) string, slen, &direction,
+        &ascent, &descent2, &overall);
+
+    if (width) *width = XDEV2LOGREL (overall.width);
+    if (height) *height = YDEV2LOGREL (ascent + descent2);
+    if (descent)
+        *descent = descent2;
+    if (externalLeading)
+        *externalLeading = 0;
+}
+
+wxCoord wxWindowDC::GetCharWidth() const
+{
+    wxCHECK_MSG( Ok(), 0, "invalid dc" );
+    wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
+
+    WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY * m_logicalScaleY, m_display);
+
+    int direction, ascent, descent;
+    XCharStruct overall;
+    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,

         &descent, &overall);
         &descent, &overall);

-//  return XDEV2LOGREL(overall.ascent + overall.descent);
-  return XDEV2LOGREL(ascent + descent);
-};
+    return XDEV2LOGREL(overall.width);
+}

 
 

-void wxWindowDC::Clear(void)
+wxCoord wxWindowDC::GetCharHeight() const

 {
 {

-  if (!Ok()) return;
-  
-  int w, h;
-  if (m_window)
+    wxCHECK_MSG( Ok(), 0, "invalid dc" );
+    wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
+
+    WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
+
+    int direction, ascent, descent;
+    XCharStruct overall;
+    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
+        &descent, &overall);
+    //  return XDEV2LOGREL(overall.ascent + overall.descent);
+    return XDEV2LOGREL(ascent + descent);
+}
+
+void wxWindowDC::Clear()
+{
+    wxCHECK_RET( Ok(), "invalid dc" );
+
+    int w, h;
+    if (m_window)

     {
     {

-      // TODO: should we get the virtual size?
-      m_window->GetSize(&w, &h);
+        m_window->GetSize(&w, &h);

 
 

-      if (m_window && m_window->GetBackingPixmap())
-      {
-        w = m_window->GetPixmapWidth();
-        h = m_window->GetPixmapHeight();
-      }
+        if (m_window && m_window->GetBackingPixmap())
+        {
+            w = m_window->GetPixmapWidth();
+            h = m_window->GetPixmapHeight();
+        }

     }
     }

-  else
+    else

     {
         if (this->IsKindOf(CLASSINFO(wxMemoryDC)))
         {
     {
         if (this->IsKindOf(CLASSINFO(wxMemoryDC)))
         {

-           wxMemoryDC* memDC = (wxMemoryDC*) this;
-           w = memDC->GetBitmap().GetWidth();
-           h = memDC->GetBitmap().GetHeight();
-       }
+            wxMemoryDC* memDC = (wxMemoryDC*) this;
+            w = memDC->GetBitmap().GetWidth();
+            h = memDC->GetBitmap().GetHeight();
+        }

         else
         else

-          return;
+            return;

     }
 
     }
 

-  wxBrush saveBrush = m_brush;
-  SetBrush (m_backgroundBrush);
+    wxBrush saveBrush = m_brush;
+    SetBrush (m_backgroundBrush);

 
 

-  XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, 0, 0, w, h);
+    XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, 0, 0, w, h);

 
 

-  if (m_window && m_window->GetBackingPixmap())
-    XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, 0, 0, w, h);
+    if (m_window && m_window->GetBackingPixmap())
+        XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, 0, 0, w, h);

 
 

-  m_brush = saveBrush;
-};
+    m_brush = saveBrush;
+}
+
+void wxWindowDC::Clear(const wxRect& rect)
+{
+    wxCHECK_RET( Ok(), "invalid dc" );
+
+    int x = rect.x; int y = rect.y;
+    int w = rect.width; int h = rect.height;
+
+    wxBrush saveBrush = m_brush;
+    SetBrush (m_backgroundBrush);
+
+    XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, x, y, w, h);
+
+    if (m_window && m_window->GetBackingPixmap())
+        XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, x, y, w, h);
+
+    m_brush = saveBrush;
+}

 
 void wxWindowDC::SetFont( const wxFont &font )
 {
 
 void wxWindowDC::SetFont( const wxFont &font )
 {

-  if (!Ok()) return;
-  
-  m_font = font;
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-  if (!m_font.Ok())
-  {
-    if ((m_oldFont != (WXFont) 0) && ((long) m_oldFont != -1))
+    m_font = font;
+
+    if (!m_font.Ok())

     {
     {

-      XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont);
+        if ((m_oldFont != (WXFont) 0) && ((wxCoord) m_oldFont != -1))
+        {
+            XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont);

 
 

-      if (m_window && m_window->GetBackingPixmap())
-          XSetFont ((Display*) m_display,(GC) m_gcBacking, (Font) m_oldFont);
+            if (m_window && m_window->GetBackingPixmap())
+                XSetFont ((Display*) m_display,(GC) m_gcBacking, (Font) m_oldFont);
+        }
+        return;

     }
     }

-    return;
-  }

 
 

-  WXFontStructPtr pFontStruct = m_font.FindOrCreateFontStruct(m_userScaleY*m_logicalScaleY);
+    WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
+
+    Font fontId = ((XFontStruct*)pFontStruct)->fid;
+    XSetFont ((Display*) m_display, (GC) m_gc, fontId);
+
+    if (m_window && m_window->GetBackingPixmap())
+        XSetFont ((Display*) m_display,(GC) m_gcBacking, fontId);
+}
+
+void wxWindowDC::SetForegroundPixelWithLogicalFunction(int pixel)
+{
+    if (m_logicalFunction == wxXOR)
+    {
+        XGCValues values;
+        XGetGCValues ((Display*) m_display, (GC) m_gc, GCBackground, &values);
+        XSetForeground ((Display*) m_display, (GC) m_gc,
+                        pixel ^ values.background);
+        if (m_window && m_window->GetBackingPixmap())
+            XSetForeground ((Display*) m_display,(GC) m_gcBacking,
+                            pixel ^ values.background);
+    }
+    else
+    {
+        XSetForeground ((Display*) m_display, (GC) m_gc, pixel);
+        if (m_window && m_window->GetBackingPixmap())
+            XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel);
+    }
+}

 
 

-  Font fontId = ((XFontStruct*)pFontStruct)->fid;
-  XSetFont ((Display*) m_display, (GC) m_gc, fontId);
+int wxWindowDC::CalculatePixel(wxColour& colour, wxColour& curCol,
+                               bool roundToWhite) const
+{
+    const unsigned char wp = (unsigned char)255;
+        
+    int pixel = -1;
+    if(!m_colour) // Mono display
+    {
+        unsigned char red = colour.Red ();
+        unsigned char blue = colour.Blue ();
+        unsigned char green = colour.Green ();
+        // white
+        if((red == wp && blue == wp && green == wp) ||
+           // not black and roundToWhite was specified
+           ((red != 0 || blue != 0 || green != 0) && roundToWhite))
+        {
+            curCol = *wxWHITE;
+            pixel = (int)WhitePixel((Display*) m_display,
+                                    DefaultScreen((Display*) m_display));
+            curCol.SetPixel(pixel);
+            colour.SetPixel(pixel);
+        }
+        else
+        {
+            curCol = *wxBLACK;
+            pixel = (int)BlackPixel((Display*) m_display,
+                                    DefaultScreen((Display*) m_display));
+            curCol.SetPixel(pixel);
+            colour.SetPixel(pixel);
+        }
+    }
+    else
+    {
+        curCol = colour;
+        pixel = colour.AllocColour((Display*) m_display);
+        curCol.SetPixel(pixel);
+    }

 
 

-  if (m_window && m_window->GetBackingPixmap())
-      XSetFont ((Display*) m_display,(GC) m_gcBacking, fontId);
-};
+    return pixel;
+}

 
 void wxWindowDC::SetPen( const wxPen &pen )
 {
 
 void wxWindowDC::SetPen( const wxPen &pen )
 {

-  if (!Ok()) return;
-
-  m_pen = pen;
-  if (!m_pen.Ok())
-    return;
-
-  wxBitmap oldStipple = m_currentStipple;
-  int oldStyle = m_currentStyle;
-  int oldFill = m_currentFill;
-  int old_pen_width = m_currentPenWidth;
-  int old_pen_join = m_currentPenJoin;
-  int old_pen_cap = m_currentPenCap;
-  int old_pen_nb_dash = m_currentPenDashCount;
-  char *old_pen_dash = m_currentPenDash;
-
-  wxColour oldPenColour = m_currentColour;
-  m_currentColour = m_pen.GetColour ();
-  m_currentStyle = m_pen.GetStyle ();
-  m_currentFill = m_pen.GetStyle (); // TODO?
-  m_currentPenWidth = m_pen.GetWidth ();
-  m_currentPenJoin = m_pen.GetJoin ();
-  m_currentPenCap = m_pen.GetCap ();
-  m_currentPenDashCount = m_pen.GetDashCount();
-  m_currentPenDash = m_pen.GetDash();
-
-  if (m_currentStyle == wxSTIPPLE)
-    m_currentStipple = m_pen.GetStipple ();
-
-  bool sameStyle = (oldStyle == m_currentStyle &&
-             oldFill == m_currentFill &&
-             old_pen_join == m_currentPenJoin &&
-             old_pen_cap == m_currentPenCap &&
-             old_pen_nb_dash == m_currentPenDashCount &&
-             old_pen_dash == m_currentPenDash &&
-             old_pen_width == m_currentPenWidth);
-
-  bool sameColour = (oldPenColour.Ok () &&
-              (oldPenColour.Red () == m_currentColour.Red ()) &&
-              (oldPenColour.Blue () == m_currentColour.Blue ()) &&
-              (oldPenColour.Green () == m_currentColour.Green ()) &&
-              (oldPenColour.GetPixel() == m_currentColour.GetPixel()));
-
-  if (!sameStyle || !GetOptimization())
+    wxCHECK_RET( Ok(), "invalid dc" );
+
+    m_pen = pen;
+    if (!m_pen.Ok())
+        return;
+
+    wxBitmap oldStipple = m_currentStipple;
+    int oldStyle = m_currentStyle;
+    int oldFill = m_currentFill;
+    int old_pen_width = m_currentPenWidth;
+    int old_pen_join = m_currentPenJoin;
+    int old_pen_cap = m_currentPenCap;
+    int old_pen_nb_dash = m_currentPenDashCount;
+    wxMOTIFDash *old_pen_dash = m_currentPenDash;
+
+    wxColour oldPenColour = m_currentColour;
+    m_currentColour = m_pen.GetColour ();
+    m_currentStyle = m_pen.GetStyle ();
+    m_currentFill = m_pen.GetStyle (); // TODO?
+    m_currentPenWidth = m_pen.GetWidth ();
+    m_currentPenJoin = m_pen.GetJoin ();
+    m_currentPenCap = m_pen.GetCap ();
+    m_currentPenDashCount = m_pen.GetDashCount();
+    m_currentPenDash = (wxMOTIFDash*)m_pen.GetDash();
+
+    if (m_currentStyle == wxSTIPPLE)
+        m_currentStipple = * m_pen.GetStipple ();
+
+    bool sameStyle = (oldStyle == m_currentStyle &&
+        oldFill == m_currentFill &&
+        old_pen_join == m_currentPenJoin &&
+        old_pen_cap == m_currentPenCap &&
+        old_pen_nb_dash == m_currentPenDashCount &&
+        old_pen_dash == m_currentPenDash &&
+        old_pen_width == m_currentPenWidth);
+
+    bool sameColour = (oldPenColour.Ok () &&
+        (oldPenColour.Red () == m_currentColour.Red ()) &&
+        (oldPenColour.Blue () == m_currentColour.Blue ()) &&
+        (oldPenColour.Green () == m_currentColour.Green ()) &&
+        (oldPenColour.GetPixel() == m_currentColour.GetPixel()));
+
+    if (!sameStyle || !GetOptimization())

     {
     {

-      int scaled_width = (int) XLOG2DEVREL (m_pen.GetWidth ());
-      if (scaled_width < 0)
-        scaled_width = 0;
-
-      int style;
-      int join;
-      int cap;
-      static char dotted[] =
-      {2, 5};
-      static char short_dashed[] =
-      {4, 4};
-      static char long_dashed[] =
-      {4, 8};
-      static char dotted_dashed[] =
-      {6, 6, 2, 6};
-
-      // We express dash pattern in pen width unit, so we are
-      // independent of zoom factor and so on...
-      int req_nb_dash;
-      char *req_dash;
-
-      switch (m_pen.GetStyle ())
-      {
+        int scaled_width = (int) XLOG2DEVREL (m_pen.GetWidth ());
+        if (scaled_width < 0)
+            scaled_width = 0;
+
+        int style;
+        int join;
+        int cap;
+        static const wxMOTIFDash dotted[] = {2, 5};
+        static const wxMOTIFDash short_dashed[] = {4, 4};
+        static const wxMOTIFDash long_dashed[] = {4, 8};
+        static const wxMOTIFDash dotted_dashed[] = {6, 6, 2, 6};
+
+        // We express dash pattern in pen width unit, so we are
+        // independent of zoom factor and so on...
+        int req_nb_dash;
+        const wxMOTIFDash *req_dash;
+
+        switch (m_pen.GetStyle ())
+        {

         case wxUSER_DASH:
         case wxUSER_DASH:

-          req_nb_dash = m_currentPenDashCount;
-          req_dash = m_currentPenDash;
-          style = LineOnOffDash;
-          break;
+            req_nb_dash = m_currentPenDashCount;
+            req_dash = m_currentPenDash;
+            style = LineOnOffDash;
+            break;

         case wxDOT:
         case wxDOT:

-          req_nb_dash = 2;
-          req_dash = dotted;
-          style = LineOnOffDash;
-          break;
+            req_nb_dash = 2;
+            req_dash = dotted;
+            style = LineOnOffDash;
+            break;

         case wxSHORT_DASH:
         case wxSHORT_DASH:

-          req_nb_dash = 2;
-          req_dash = short_dashed;
-          style = LineOnOffDash;
-          break;
+            req_nb_dash = 2;
+            req_dash = short_dashed;
+            style = LineOnOffDash;
+            break;

         case wxLONG_DASH:
         case wxLONG_DASH:

-          req_nb_dash = 2;
-          req_dash = long_dashed;
-          style = LineOnOffDash;
-          break;
+            req_nb_dash = 2;
+            req_dash = long_dashed;
+            style = LineOnOffDash;
+            break;

         case wxDOT_DASH:
         case wxDOT_DASH:

-          req_nb_dash = 4;
-          req_dash = dotted_dashed;
-          style = LineOnOffDash;
-          break;
+            req_nb_dash = 4;
+            req_dash = dotted_dashed;
+            style = LineOnOffDash;
+            break;

         case wxSTIPPLE:
         case wxSOLID:
         case wxTRANSPARENT:
         default:
         case wxSTIPPLE:
         case wxSOLID:
         case wxTRANSPARENT:
         default:

-          style = LineSolid;
-          req_dash = NULL;
-          req_nb_dash = 0;
-      }
-
-      if (req_dash && req_nb_dash)
-      {
-        char *real_req_dash = new char[req_nb_dash];
-        if (real_req_dash)
-        {
-          int factor = scaled_width == 0 ? 1 : scaled_width;
-          for (int i = 0; i < req_nb_dash; i++)
-          real_req_dash[i] = req_dash[i] * factor;
-          XSetDashes ((Display*) m_display, (GC) m_gc, 0, real_req_dash, req_nb_dash);
-
-          if (m_window && m_window->GetBackingPixmap())
-          XSetDashes ((Display*) m_display,(GC) m_gcBacking, 0, real_req_dash, req_nb_dash);
-          delete[]real_req_dash;
+            style = LineSolid;
+            req_dash = (wxMOTIFDash*)NULL;
+            req_nb_dash = 0;

         }
         }

-        else
+
+        if (req_dash && req_nb_dash)

         {
         {

-          // No Memory. We use non-scaled dash pattern...
-          XSetDashes ((Display*) m_display, (GC) m_gc, 0, req_dash, req_nb_dash);
+            wxMOTIFDash *real_req_dash = new wxMOTIFDash[req_nb_dash];
+            if (real_req_dash)
+            {
+                int factor = scaled_width == 0 ? 1 : scaled_width;
+                for (int i = 0; i < req_nb_dash; i++)
+                    real_req_dash[i] = req_dash[i] * factor;
+                XSetDashes ((Display*) m_display, (GC) m_gc, 0, real_req_dash, req_nb_dash);
+
+                if (m_window && m_window->GetBackingPixmap())
+                    XSetDashes ((Display*) m_display,(GC) m_gcBacking, 0, real_req_dash, req_nb_dash);
+                delete[]real_req_dash;
+            }
+            else
+            {
+                // No Memory. We use non-scaled dash pattern...
+                XSetDashes ((Display*) m_display, (GC) m_gc, 0, req_dash, req_nb_dash);

 
 

-          if (m_window && m_window->GetBackingPixmap())
-          XSetDashes ((Display*) m_display,(GC) m_gcBacking, 0, req_dash, req_nb_dash);
+                if (m_window && m_window->GetBackingPixmap())
+                    XSetDashes ((Display*) m_display,(GC) m_gcBacking, 0, req_dash, req_nb_dash);
+            }

         }
         }

-      }

 
 

-      switch (m_pen.GetCap ())
-      {
+        switch (m_pen.GetCap ())
+        {

         case wxCAP_PROJECTING:
         case wxCAP_PROJECTING:

-          cap = CapProjecting;
-          break;
+            cap = CapProjecting;
+            break;

         case wxCAP_BUTT:
         case wxCAP_BUTT:

-          cap = CapButt;
-          break;
+            cap = CapButt;
+            break;

         case wxCAP_ROUND:
         default:
         case wxCAP_ROUND:
         default:

-          cap = CapRound;
-          break;
-      }
+            cap = (scaled_width <= 1) ? CapNotLast : CapRound;
+            break;
+        }

 
 

-      switch (m_pen.GetJoin ())
-      {
+        switch (m_pen.GetJoin ())
+        {

         case wxJOIN_BEVEL:
         case wxJOIN_BEVEL:

-          join = JoinBevel;
-          break;
+            join = JoinBevel;
+            break;

         case wxJOIN_MITER:
         case wxJOIN_MITER:

-          join = JoinMiter;
-          break;
+            join = JoinMiter;
+            break;

         case wxJOIN_ROUND:
         default:
         case wxJOIN_ROUND:
         default:

-          join = JoinRound;
-          break;
-      }
+            join = JoinRound;
+            break;
+        }

 
 

-      XSetLineAttributes ((Display*) m_display, (GC) m_gc, scaled_width, style, cap, join);
+        XSetLineAttributes ((Display*) m_display, (GC) m_gc, scaled_width, style, cap, join);

 
 

-      if (m_window && m_window->GetBackingPixmap())
-        XSetLineAttributes ((Display*) m_display,(GC) m_gcBacking, scaled_width, style, cap, join);
+        if (m_window && m_window->GetBackingPixmap())
+            XSetLineAttributes ((Display*) m_display,(GC) m_gcBacking, scaled_width, style, cap, join);

     }
 
     if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GetOptimization()))
     {
     }
 
     if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GetOptimization()))
     {

-      Pixmap myStipple;
+        Pixmap myStipple;

 
 

-      oldStipple = NULL;    // For later reset!!
+        oldStipple = wxNullBitmap;    // For later reset!!

 
 

-      switch (m_currentFill)
-      {
+        switch (m_currentFill)
+        {

         case wxBDIAGONAL_HATCH:
         case wxBDIAGONAL_HATCH:

-          if (bdiag == (Pixmap) 0)
-            bdiag = XCreateBitmapFromData ((Display*) m_display,
-                      RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
-                         bdiag_bits, bdiag_width, bdiag_height);
-          myStipple = bdiag;
-          break;
+            if (bdiag == (Pixmap) 0)
+                bdiag = XCreateBitmapFromData ((Display*) m_display,
+                RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
+                bdiag_bits, bdiag_width, bdiag_height);
+            myStipple = bdiag;
+            break;

         case wxFDIAGONAL_HATCH:
         case wxFDIAGONAL_HATCH:

-          if (fdiag == (Pixmap) 0)
-            fdiag = XCreateBitmapFromData ((Display*) m_display,
-                      RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
-                         fdiag_bits, fdiag_width, fdiag_height);
-          myStipple = fdiag;
-          break;
+            if (fdiag == (Pixmap) 0)
+                fdiag = XCreateBitmapFromData ((Display*) m_display,
+                RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
+                fdiag_bits, fdiag_width, fdiag_height);
+            myStipple = fdiag;
+            break;

         case wxCROSS_HATCH:
         case wxCROSS_HATCH:

-          if (cross == (Pixmap) 0)
-            cross = XCreateBitmapFromData ((Display*) m_display,
-                      RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
-                         cross_bits, cross_width, cross_height);
-          myStipple = cross;
-          break;
+            if (cross == (Pixmap) 0)
+                cross = XCreateBitmapFromData ((Display*) m_display,
+                RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
+                cross_bits, cross_width, cross_height);
+            myStipple = cross;
+            break;

         case wxHORIZONTAL_HATCH:
         case wxHORIZONTAL_HATCH:

-          if (horiz == (Pixmap) 0)
-            horiz = XCreateBitmapFromData ((Display*) m_display,
-                      RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
-                         horiz_bits, horiz_width, horiz_height);
-          myStipple = horiz;
-          break;
+            if (horiz == (Pixmap) 0)
+                horiz = XCreateBitmapFromData ((Display*) m_display,
+                RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
+                horiz_bits, horiz_width, horiz_height);
+            myStipple = horiz;
+            break;

         case wxVERTICAL_HATCH:
         case wxVERTICAL_HATCH:

-          if (verti == (Pixmap) 0)
-            verti = XCreateBitmapFromData ((Display*) m_display,
-                      RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
-                         verti_bits, verti_width, verti_height);
-          myStipple = verti;
-          break;
+            if (verti == (Pixmap) 0)
+                verti = XCreateBitmapFromData ((Display*) m_display,
+                RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
+                verti_bits, verti_width, verti_height);
+            myStipple = verti;
+            break;

         case wxCROSSDIAG_HATCH:
         default:
         case wxCROSSDIAG_HATCH:
         default:

-          if (cdiag == (Pixmap) 0)
-            cdiag = XCreateBitmapFromData ((Display*) m_display,
-                      RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
-                         cdiag_bits, cdiag_width, cdiag_height);
-          myStipple = cdiag;
-          break;
-      }
-      XSetStipple ((Display*) m_display, (GC) m_gc, myStipple);
+            if (cdiag == (Pixmap) 0)
+                cdiag = XCreateBitmapFromData ((Display*) m_display,
+                RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
+                cdiag_bits, cdiag_width, cdiag_height);
+            myStipple = cdiag;
+            break;
+        }
+        XSetStipple ((Display*) m_display, (GC) m_gc, myStipple);

 
 

-      if (m_window && m_window->GetBackingPixmap())
-        XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple);
+        if (m_window && m_window->GetBackingPixmap())
+            XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple);

     }
     else if (m_currentStipple.Ok()
     }
     else if (m_currentStipple.Ok()

-       && ((m_currentStipple != oldStipple) || !GetOptimization()))
+        && ((m_currentStipple != oldStipple) || !GetOptimization()))

     {
     {

-      XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetPixmap());
+        XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetPixmap());

 
 

-      if (m_window && m_window->GetBackingPixmap())
-        XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetPixmap());
+        if (m_window && m_window->GetBackingPixmap())
+            XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetPixmap());

     }
 
     if ((m_currentFill != oldFill) || !GetOptimization())
     {
     }
 
     if ((m_currentFill != oldFill) || !GetOptimization())
     {

-      int fill_style;
-
-      if (m_currentFill == wxSTIPPLE)
-        fill_style = FillStippled;
-      else if (IS_HATCH (m_currentFill))
-        fill_style = FillStippled;
-      else
-        fill_style = FillSolid;
-      XSetFillStyle ((Display*) m_display, (GC) m_gc, fill_style);
-      if (m_window && m_window->GetBackingPixmap())
-        XSetFillStyle ((Display*) m_display,(GC) m_gcBacking, fill_style);
+        int fill_style;
+
+        if (m_currentFill == wxSTIPPLE)
+            fill_style = FillStippled;
+        else if (IS_HATCH (m_currentFill))
+            fill_style = FillStippled;
+        else
+            fill_style = FillSolid;
+        XSetFillStyle ((Display*) m_display, (GC) m_gc, fill_style);
+        if (m_window && m_window->GetBackingPixmap())
+            XSetFillStyle ((Display*) m_display,(GC) m_gcBacking, fill_style);

     }
 
     // must test m_logicalFunction, because it involves background!
     if (!sameColour || !GetOptimization()
     }
 
     // must test m_logicalFunction, because it involves background!
     if (!sameColour || !GetOptimization()

-      || ((m_logicalFunction == wxXOR) || (m_autoSetting & 0x2)))
+        || ((m_logicalFunction == wxXOR) || (m_autoSetting & 0x2)))

     {
     {

-      int pixel = -1;
-      if (m_pen.GetStyle () == wxTRANSPARENT)
-        pixel = m_backgroundPixel;
-      else if (!m_colour)
-      {
-        unsigned char red = m_pen.GetColour ().Red ();
-        unsigned char blue = m_pen.GetColour ().Blue ();
-        unsigned char green = m_pen.GetColour ().Green ();
-        if (red == (unsigned char) 255 && blue == (unsigned char) 255
-            && green == (unsigned char) 255)
-        {
-          pixel = (int) WhitePixel ((Display*) m_display, DefaultScreen ((Display*) m_display));
-          m_currentColour = *wxWHITE;
-          m_pen.GetColour().SetPixel(pixel);
-          m_currentColour.SetPixel(pixel);
-        }
+        int pixel = -1;
+        if (m_pen.GetStyle () == wxTRANSPARENT)
+            pixel = m_backgroundPixel;

         else
         {
         else
         {

-          pixel = (int) BlackPixel ((Display*) m_display, DefaultScreen ((Display*) m_display));
-          m_currentColour = *wxBLACK;
-          m_pen.GetColour().SetPixel(pixel);
-        }
-      }
-      else
-      {
-        pixel = m_pen.GetColour ().AllocColour(m_display);
-        m_currentColour.SetPixel(pixel);
-      }
-
-      // Finally, set the GC to the required colour
-      if (pixel > -1)
-      {
-        if (m_logicalFunction == wxXOR)
-        {
-          XGCValues values;
-          XGetGCValues ((Display*) m_display, (GC) m_gc, GCBackground, &values);
-          XSetForeground ((Display*) m_display, (GC) m_gc, pixel ^ values.background);
-          if (m_window && m_window->GetBackingPixmap())
-            XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel ^ values.background);
-        }
-      else
-        {
-          XSetForeground ((Display*) m_display, (GC) m_gc, pixel);
-          if (m_window && m_window->GetBackingPixmap())
-            XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel);
+            pixel = CalculatePixel(m_pen.GetColour(), m_currentColour, FALSE);

         }
         }

+
+        // Finally, set the GC to the required colour
+        if (pixel > -1)
+            SetForegroundPixelWithLogicalFunction(pixel);

     }
     }

-  }
-  else
-    m_pen.GetColour().SetPixel(oldPenColour.GetPixel());
+    else
+        m_pen.GetColour().SetPixel(oldPenColour.GetPixel());

 
 

-  m_autoSetting = 0;
-};
+    m_autoSetting = 0;
+}

 
 void wxWindowDC::SetBrush( const wxBrush &brush )
 {
 
 void wxWindowDC::SetBrush( const wxBrush &brush )
 {

-  if (!Ok()) return;
-  
-  m_brush = brush;
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-  if (!m_brush.Ok() || m_brush.GetStyle () == wxTRANSPARENT)
-    return;
+    m_brush = brush;

 
 

-  int oldFill = m_currentFill;
-  wxBitmap oldStipple = m_currentStipple;
+    if (!m_brush.Ok() || m_brush.GetStyle () == wxTRANSPARENT)
+        return;

 
 

-  m_autoSetting |= 0x1;
+    int oldFill = m_currentFill;
+    wxBitmap oldStipple = m_currentStipple;

 
 

-  m_currentFill = m_brush.GetStyle ();
-  if (m_currentFill == wxSTIPPLE)
-    m_currentStipple = m_brush.GetStipple ();
+    m_autoSetting |= 0x1;

 
 

-  wxColour oldBrushColour(m_currentColour);
-  m_currentColour = m_brush.GetColour ();
+    m_currentFill = m_brush.GetStyle ();
+    if (m_currentFill == wxSTIPPLE)
+        m_currentStipple = * m_brush.GetStipple ();

 
 

-  bool sameColour = (oldBrushColour.Ok () &&
-              (oldBrushColour.Red () == m_currentColour.Red ()) &&
-              (oldBrushColour.Blue () == m_currentColour.Blue ()) &&
-           (oldBrushColour.Green () == m_currentColour.Green ()) &&
-              (oldBrushColour.GetPixel() == m_currentColour.GetPixel()));
+    wxColour oldBrushColour(m_currentColour);
+    m_currentColour = m_brush.GetColour ();

 
 

-  if ((oldFill != m_brush.GetStyle ()) || !GetOptimization())
-  {
-      switch (brush.GetStyle ())
-      {
+    bool sameColour = (oldBrushColour.Ok () &&
+        (oldBrushColour.Red () == m_currentColour.Red ()) &&
+        (oldBrushColour.Blue () == m_currentColour.Blue ()) &&
+        (oldBrushColour.Green () == m_currentColour.Green ()) &&
+        (oldBrushColour.GetPixel() == m_currentColour.GetPixel()));
+
+    if ((oldFill != m_brush.GetStyle ()) || !GetOptimization())
+    {
+        switch (brush.GetStyle ())
+        {

         case wxTRANSPARENT:
         case wxTRANSPARENT:

-          break;
+            break;

         case wxBDIAGONAL_HATCH:
         case wxCROSSDIAG_HATCH:
         case wxFDIAGONAL_HATCH:
         case wxBDIAGONAL_HATCH:
         case wxCROSSDIAG_HATCH:
         case wxFDIAGONAL_HATCH:


@@ -1697,529 +1885,514 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
         case wxHORIZONTAL_HATCH:
         case wxVERTICAL_HATCH:
         case wxSTIPPLE:
         case wxHORIZONTAL_HATCH:
         case wxVERTICAL_HATCH:
         case wxSTIPPLE:

-          {
-            // Chris Breeze 23/07/97: use background mode to determine whether
-            // fill style should be solid or transparent
-            int style = (m_backgroundMode == wxSOLID ? FillOpaqueStippled : FillStippled);
-            XSetFillStyle ((Display*) m_display, (GC) m_gc, style);
-            if (m_window && m_window->GetBackingPixmap())
-              XSetFillStyle ((Display*) m_display,(GC) m_gcBacking, style);
-          }
-          break;
+            {
+                // Chris Breeze 23/07/97: use background mode to determine whether
+                // fill style should be solid or transparent
+                int style = (m_backgroundMode == wxSOLID ? FillOpaqueStippled : FillStippled);
+                XSetFillStyle ((Display*) m_display, (GC) m_gc, style);
+                if (m_window && m_window->GetBackingPixmap())
+                    XSetFillStyle ((Display*) m_display,(GC) m_gcBacking, style);
+            }
+            break;

         case wxSOLID:
         default:
         case wxSOLID:
         default:

-          XSetFillStyle ((Display*) m_display, (GC) m_gc, FillSolid);
-          if (m_window && m_window->GetBackingPixmap())
-            XSetFillStyle ((Display*) m_display,(GC) m_gcBacking, FillSolid);
-      }
-  }
+            XSetFillStyle ((Display*) m_display, (GC) m_gc, FillSolid);
+            if (m_window && m_window->GetBackingPixmap())
+                XSetFillStyle ((Display*) m_display,(GC) m_gcBacking, FillSolid);
+        }
+    }

 
 

-  if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GetOptimization()))
+    if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GetOptimization()))

     {
     {

-      Pixmap myStipple;
+        Pixmap myStipple;

 
 

-      switch (m_currentFill)
-      {
+        switch (m_currentFill)
+        {

         case wxBDIAGONAL_HATCH:
         case wxBDIAGONAL_HATCH:

-          if (bdiag == (Pixmap) 0)
-            bdiag = XCreateBitmapFromData ((Display*) m_display,
-                      RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
-                         bdiag_bits, bdiag_width, bdiag_height);
-          myStipple = bdiag;
-          break;
+            if (bdiag == (Pixmap) 0)
+                bdiag = XCreateBitmapFromData ((Display*) m_display,
+                RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
+                bdiag_bits, bdiag_width, bdiag_height);
+            myStipple = bdiag;
+            break;

         case wxFDIAGONAL_HATCH:
         case wxFDIAGONAL_HATCH:

-          if (fdiag == (Pixmap) 0)
-            fdiag = XCreateBitmapFromData ((Display*) m_display,
-                      RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
-                         fdiag_bits, fdiag_width, fdiag_height);
-          myStipple = fdiag;
-          break;
+            if (fdiag == (Pixmap) 0)
+                fdiag = XCreateBitmapFromData ((Display*) m_display,
+                RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
+                fdiag_bits, fdiag_width, fdiag_height);
+            myStipple = fdiag;
+            break;

         case wxCROSS_HATCH:
         case wxCROSS_HATCH:

-          if (cross == (Pixmap) 0)
-            cross = XCreateBitmapFromData ((Display*) m_display,
-                      RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
-                         cross_bits, cross_width, cross_height);
-          myStipple = cross;
-          break;
+            if (cross == (Pixmap) 0)
+                cross = XCreateBitmapFromData ((Display*) m_display,
+                RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
+                cross_bits, cross_width, cross_height);
+            myStipple = cross;
+            break;

         case wxHORIZONTAL_HATCH:
         case wxHORIZONTAL_HATCH:

-          if (horiz == (Pixmap) 0)
-            horiz = XCreateBitmapFromData ((Display*) m_display,
-                      RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
-                         horiz_bits, horiz_width, horiz_height);
-          myStipple = horiz;
-          break;
+            if (horiz == (Pixmap) 0)
+                horiz = XCreateBitmapFromData ((Display*) m_display,
+                RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
+                horiz_bits, horiz_width, horiz_height);
+            myStipple = horiz;
+            break;

         case wxVERTICAL_HATCH:
         case wxVERTICAL_HATCH:

-          if (verti == (Pixmap) 0)
-            verti = XCreateBitmapFromData ((Display*) m_display,
-                      RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
-                         verti_bits, verti_width, verti_height);
-          myStipple = verti;
-          break;
+            if (verti == (Pixmap) 0)
+                verti = XCreateBitmapFromData ((Display*) m_display,
+                RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
+                verti_bits, verti_width, verti_height);
+            myStipple = verti;
+            break;

         case wxCROSSDIAG_HATCH:
         default:
         case wxCROSSDIAG_HATCH:
         default:

-          if (cdiag == (Pixmap) 0)
-            cdiag = XCreateBitmapFromData ((Display*) m_display,
-                      RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
-                         cdiag_bits, cdiag_width, cdiag_height);
-          myStipple = cdiag;
-          break;
-      }
-      XSetStipple ((Display*) m_display, (GC) m_gc, myStipple);
+            if (cdiag == (Pixmap) 0)
+                cdiag = XCreateBitmapFromData ((Display*) m_display,
+                RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)),
+                cdiag_bits, cdiag_width, cdiag_height);
+            myStipple = cdiag;
+            break;
+        }
+        XSetStipple ((Display*) m_display, (GC) m_gc, myStipple);

 
 

-      if (m_window && m_window->GetBackingPixmap())
-        XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple);
+        if (m_window && m_window->GetBackingPixmap())
+            XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple);

     }
     // X can forget the stipple value when resizing a window (apparently)
     // so always set the stipple.
     else if (m_currentStipple.Ok()) // && m_currentStipple != oldStipple)
     {
     }
     // X can forget the stipple value when resizing a window (apparently)
     // so always set the stipple.
     else if (m_currentStipple.Ok()) // && m_currentStipple != oldStipple)
     {

-      XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetPixmap());
-      if (m_window && m_window->GetBackingPixmap())
-        XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetPixmap());
+        XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetPixmap());
+        if (m_window && m_window->GetBackingPixmap())
+            XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetPixmap());

     }
 
     // must test m_logicalFunction, because it involves background!
     if (!sameColour || !GetOptimization() || m_logicalFunction == wxXOR)
     {
     }
 
     // must test m_logicalFunction, because it involves background!
     if (!sameColour || !GetOptimization() || m_logicalFunction == wxXOR)
     {

-      int pixel = -1;
-      if (!m_colour)
-      {
-          // Policy - on a monochrome screen, all brushes are white,
-          // except when they're REALLY black!!!
-          unsigned char red = m_brush.GetColour ().Red ();
-          unsigned char blue = m_brush.GetColour ().Blue ();
-          unsigned char green = m_brush.GetColour ().Green ();
-
-          if (red == (unsigned char) 0 && blue == (unsigned char) 0
-              && green == (unsigned char) 0)
-            {
-              pixel = (int) BlackPixel ((Display*) m_display, DefaultScreen ((Display*) m_display));
-              m_currentColour = *wxBLACK;
-              m_brush.GetColour().SetPixel(pixel);
-              m_currentColour.SetPixel(pixel);
-            }
-          else
-            {
-              pixel = (int) WhitePixel ((Display*) m_display, DefaultScreen ((Display*) m_display));
-              m_currentColour = *wxWHITE;
-              m_brush.GetColour().SetPixel(pixel);
-              m_currentColour.SetPixel(pixel);
-            }
-
-          // N.B. comment out the above line and uncomment the following lines
-          // if you want non-white colours to be black on a monochrome display.
-          /*
-             if (red == (unsigned char )255 && blue == (unsigned char)255
-             && green == (unsigned char)255)
-             pixel = (int)WhitePixel((Display*) m_display, DefaultScreen((Display*) m_display));
-             else
-             pixel = (int)BlackPixel((Display*) m_display, DefaultScreen((Display*) m_display));
-           */
-      }
-      else if (m_brush.GetStyle () != wxTRANSPARENT)
-      {
-        pixel = m_brush.GetColour().AllocColour(m_display);
-        m_currentColour.SetPixel(pixel);
-      }
-      if (pixel > -1)
-      {
-        // Finally, set the GC to the required colour
-        if (m_logicalFunction == wxXOR)
-        {
-          XGCValues values;
-          XGetGCValues ((Display*) m_display, (GC) m_gc, GCBackground, &values);
-          XSetForeground ((Display*) m_display, (GC) m_gc, pixel ^ values.background);
-          if (m_window && m_window->GetBackingPixmap())
-            XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel ^ values.background);
-        }
-        else
-        {
-          XSetForeground ((Display*) m_display, (GC) m_gc, pixel);
-          if (m_window && m_window->GetBackingPixmap())
-            XSetForeground ((Display*) m_display,(GC) m_gcBacking, pixel);
-        }
-      }
+        int pixel = CalculatePixel(m_brush.GetColour(), m_currentColour, TRUE);
+ 
+        if (pixel > -1)
+            SetForegroundPixelWithLogicalFunction(pixel);

     }
     }

-  else
-    m_brush.GetColour().SetPixel(oldBrushColour.GetPixel());
-};
+    else
+        m_brush.GetColour().SetPixel(oldBrushColour.GetPixel());
+}

 
 void wxWindowDC::SetBackground( const wxBrush &brush )
 {
 
 void wxWindowDC::SetBackground( const wxBrush &brush )
 {

-  if (!Ok()) return;
-  
-  m_backgroundBrush = brush;
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-  if (!m_backgroundBrush.Ok())
-    return;
+    m_backgroundBrush = brush;

 
 

-  int pixel = m_backgroundBrush.GetColour().AllocColour(m_display);
+    if (!m_backgroundBrush.Ok())
+        return;

 
 

-  XSetWindowBackground ((Display*) m_display, (Pixmap) m_pixmap, pixel);
+    m_backgroundPixel = m_backgroundBrush.GetColour().AllocColour(m_display);

 
 

-  // Necessary for ::DrawIcon, which use fg/bg pixel or the GC.
-  // And Blit,... (Any fct that use XCopyPlane, in fact.)
-  XSetBackground ((Display*) m_display, (GC) m_gc, pixel);
-  if (m_window && m_window->GetBackingPixmap())
-     XSetBackground ((Display*) m_display,(GC) m_gcBacking, pixel);
-};
+    // New behaviour, 10/2/99: setting the background brush of a DC
+    // doesn't affect the window background colour.
+/*
+    // XSetWindowBackground doesn't work for non-Window pixmaps
+    if (!this->IsKindOf(CLASSINFO(wxMemoryDC)))
+        XSetWindowBackground ((Display*) m_display, (Pixmap) m_pixmap, pixel);
+*/
+
+    // Necessary for ::DrawIcon, which use fg/bg pixel or the GC.
+    // And Blit,... (Any fct that use XCopyPlane, in fact.)
+    XSetBackground ((Display*) m_display, (GC) m_gc, m_backgroundPixel);
+    if (m_window && m_window->GetBackingPixmap())
+        XSetBackground ((Display*) m_display,(GC) m_gcBacking,
+                        m_backgroundPixel);
+}

 
 void wxWindowDC::SetLogicalFunction( int function )
 {
 
 void wxWindowDC::SetLogicalFunction( int function )
 {

-  int x_function;
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-  /* MATTHEW: [9] */
-  if (m_logicalFunction == function)
-    return;
+    int x_function;

 
 

-  switch (function)
+    /* MATTHEW: [9] */
+    if (m_logicalFunction == function)
+        return;
+
+    switch (function)

     {
     case wxCLEAR:
     {
     case wxCLEAR:

-      x_function = GXclear;
-      break;
+        x_function = GXclear;
+        break;

     case wxXOR:
     case wxXOR:

-      x_function = GXxor;
-      break;
+        x_function = GXxor;
+        break;

     case wxINVERT:
     case wxINVERT:

-      x_function = GXinvert;
-      break;
+        x_function = GXinvert;
+        break;

     case wxOR_REVERSE:
     case wxOR_REVERSE:

-      x_function = GXorReverse;
-      break;
+        x_function = GXorReverse;
+        break;

     case wxAND_REVERSE:
     case wxAND_REVERSE:

-      x_function = GXandReverse;
-      break;
+        x_function = GXandReverse;
+        break;

     case wxAND:
     case wxAND:

-      x_function = GXand;
-      break;
+        x_function = GXand;
+        break;

     case wxOR:
     case wxOR:

-      x_function = GXor;
-      break;
+        x_function = GXor;
+        break;

     case wxAND_INVERT:
     case wxAND_INVERT:

-      x_function = GXandInverted;
-      break;
+        x_function = GXandInverted;
+        break;

     case wxNO_OP:
     case wxNO_OP:

-      x_function = GXnoop;
-      break;
+        x_function = GXnoop;
+        break;

     case wxNOR:
     case wxNOR:

-      x_function = GXnor;
-      break;
+        x_function = GXnor;
+        break;

     case wxEQUIV:
     case wxEQUIV:

-      x_function = GXequiv;
-      break;
+        x_function = GXequiv;
+        break;

     case wxSRC_INVERT:
     case wxSRC_INVERT:

-      x_function = GXcopyInverted;
-      break;
+        x_function = GXcopyInverted;
+        break;

     case wxOR_INVERT:
     case wxOR_INVERT:

-      x_function = GXorInverted;
-      break;
+        x_function = GXorInverted;
+        break;

     case wxNAND:
     case wxNAND:

-      x_function = GXnand;
-      break;
+        x_function = GXnand;
+        break;

     case wxSET:
     case wxSET:

-      x_function = GXset;
-      break;
+        x_function = GXset;
+        break;

     case wxCOPY:
     default:
     case wxCOPY:
     default:

-      x_function = GXcopy;
-      break;
+        x_function = GXcopy;
+        break;

     }
 
     }
 

-  XSetFunction((Display*) m_display, (GC) m_gc, x_function);
-  if (m_window && m_window->GetBackingPixmap())
-    XSetFunction((Display*) m_display, (GC) m_gcBacking, x_function);
+    XSetFunction((Display*) m_display, (GC) m_gc, x_function);
+    if (m_window && m_window->GetBackingPixmap())
+        XSetFunction((Display*) m_display, (GC) m_gcBacking, x_function);

 
 

-  if ((m_logicalFunction == wxXOR) != (function == wxXOR))
-    /* MATTHEW: [9] Need to redo pen simply */
-    m_autoSetting |= 0x2;
+    if ((m_logicalFunction == wxXOR) != (function == wxXOR))
+        /* MATTHEW: [9] Need to redo pen simply */
+        m_autoSetting |= 0x2;

 
 

-  m_logicalFunction = function;
+    m_logicalFunction = function;

 
 

-};
+}

 
 void wxWindowDC::SetTextForeground( const wxColour &col )
 {
 
 void wxWindowDC::SetTextForeground( const wxColour &col )
 {

-  if (!Ok()) return;
-  
-  if (m_textForegroundColour == col) return;
-  
-  m_textForegroundColour = col;
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-};
+    if (m_textForegroundColour == col)
+        return;
+
+    m_textForegroundColour = col;
+
+}

 
 void wxWindowDC::SetTextBackground( const wxColour &col )
 {
 
 void wxWindowDC::SetTextBackground( const wxColour &col )
 {

-  if (!Ok()) return;
-  
-  if (m_textBackgroundColour == col) return;
-  
-  m_textBackgroundColour = col;
-  if (!m_textBackgroundColour.Ok()) return;
-};
+    wxCHECK_RET( Ok(), "invalid dc" );
+
+    if (m_textBackgroundColour == col)
+        return;
+
+    m_textBackgroundColour = col;
+    if (!m_textBackgroundColour.Ok())
+        return;
+}

 
 void wxWindowDC::SetBackgroundMode( int mode )
 {
 
 void wxWindowDC::SetBackgroundMode( int mode )
 {

-  m_backgroundMode = mode;
-
-};
+    m_backgroundMode = mode;
+}

 
 void wxWindowDC::SetPalette( const wxPalette& palette )
 {
 
 void wxWindowDC::SetPalette( const wxPalette& palette )
 {

-  if (m_window)
-  {
-    if (palette.Ok())
-      /* Use GetXColormap */
-      XSetWindowColormap ((Display*) m_display, (Window) m_window->GetXWindow(),
-              (Colormap) palette.GetXColormap());
-    else
-      /* Use wxGetMainColormap */
-      XSetWindowColormap ((Display*) m_display, (Window) m_window->GetXWindow(),
-              (Colormap) wxTheApp->GetMainColormap(m_display));
-  }
-};
+    if (m_window)
+    {
+        if (palette.Ok())
+            /* Use GetXColormap */
+            XSetWindowColormap ((Display*) m_display, (Window) m_window->GetXWindow(),
+            (Colormap) palette.GetXColormap());
+        else
+            /* Use wxGetMainColormap */
+            XSetWindowColormap ((Display*) m_display, (Window) m_window->GetXWindow(),
+            (Colormap) wxTheApp->GetMainColormap(m_display));
+    }
+}

 
 // Helper function
 
 // Helper function

-void wxWindowDC:: SetDCClipping ()
+void wxWindowDC::SetDCClipping()

 {
 {

-  // m_userRegion is the region set by calling SetClippingRegion
-
-  if (m_currentRegion)
-    XDestroyRegion ((Region) m_currentRegion);
-
-  // We need to take into account
-  // clipping imposed on a window by a repaint.
-  // We'll combine it with the user region. But for now,
-  // just use the currently-defined user clipping region.
-  if (m_userRegion || (m_window && m_window->GetPaintRegion()) )
-    m_currentRegion = (WXRegion) XCreateRegion ();
-  else
-    m_currentRegion = (WXRegion) NULL;
-
-  if ((m_window && m_window->GetPaintRegion()) && m_userRegion)
-    XIntersectRegion ((Region) m_window->GetPaintRegion(), (Region) m_userRegion, (Region) m_currentRegion);
-  else if (m_userRegion)
-    XIntersectRegion ((Region) m_userRegion, (Region) m_userRegion, (Region) m_currentRegion);
-  else if (m_window && m_window->GetPaintRegion())
-    XIntersectRegion ((Region) m_window->GetPaintRegion(), (Region) m_window->GetPaintRegion(), 
-(Region) m_currentRegion);
-
-  if (m_currentRegion)
+    // m_userRegion is the region set by calling SetClippingRegion
+
+    if (m_currentRegion)
+        XDestroyRegion ((Region) m_currentRegion);
+
+    // We need to take into account
+    // clipping imposed on a window by a repaint.
+    // We'll combine it with the user region. But for now,
+    // just use the currently-defined user clipping region.
+    if (m_userRegion || (m_window && m_window->GetUpdateRegion().Ok()) )
+        m_currentRegion = (WXRegion) XCreateRegion ();
+    else
+        m_currentRegion = (WXRegion) NULL;
+
+    if ((m_window && m_window->GetUpdateRegion().Ok()) && m_userRegion)
+        XIntersectRegion ((Region) m_window->GetUpdateRegion().GetXRegion(), (Region) m_userRegion, (Region) m_currentRegion);
+    else if (m_userRegion)
+        XIntersectRegion ((Region) m_userRegion, (Region) m_userRegion, (Region) m_currentRegion);
+    else if (m_window && m_window->GetUpdateRegion().Ok())
+        XIntersectRegion ((Region) m_window->GetUpdateRegion().GetXRegion(), (Region) m_window->GetUpdateRegion().GetXRegion(),
+        (Region) m_currentRegion);
+
+    if (m_currentRegion)

     {
     {

-      XSetRegion ((Display*) m_display, (GC) m_gc, (Region) m_currentRegion);
+        XSetRegion ((Display*) m_display, (GC) m_gc, (Region) m_currentRegion);

     }
     }

-  else
+    else

     {
     {

-      XSetClipMask ((Display*) m_display, (GC) m_gc, None);
+        XSetClipMask ((Display*) m_display, (GC) m_gc, None);

     }
 
 }
 
     }
 
 }
 

-void wxWindowDC::SetClippingRegion( long x, long y, long width, long height )
+void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

-  wxDC::SetClippingRegion( x, y, width, height );
-
-  if (m_userRegion)
-    XDestroyRegion ((Region) m_userRegion);
-  m_userRegion = (WXRegion) XCreateRegion ();
-  XRectangle r;
-  r.x = XLOG2DEV (x);
-  r.y = YLOG2DEV (y);
-  r.width = XLOG2DEVREL(width);
-  r.height = YLOG2DEVREL(height);
-  XUnionRectWithRegion (&r, (Region) m_userRegion, (Region) m_userRegion);
-
-  SetDCClipping ();
-
-  // Needs to work differently for Pixmap: without this,
-  // there's a nasty (Display*) m_display bug. 8/12/94
-  if (m_window && m_window->GetBackingPixmap())
-  {
-    XRectangle rects[1];
-    rects[0].x = XLOG2DEV_2(x); 
-    rects[0].y = YLOG2DEV_2(y);
-    rects[0].width = XLOG2DEVREL(width);
-    rects[0].height = YLOG2DEVREL(height);
-    XSetClipRectangles((Display*) m_display, (GC) m_gcBacking, 0, 0, rects, 1, Unsorted);
-  }
-};
-
-void wxWindowDC::DestroyClippingRegion(void)
-{
-  wxDC::DestroyClippingRegion();
-  
-  if (m_userRegion)
-    XDestroyRegion ((Region) m_userRegion);
-  m_userRegion = NULL;
-
-  SetDCClipping ();
+    wxDC::DoSetClippingRegion( x, y, width, height );

 
 

-  XGCValues gc_val;
-  gc_val.clip_mask = None;
-  if (m_window && m_window->GetBackingPixmap())
-    XChangeGC((Display*) m_display, (GC) m_gcBacking, GCClipMask, &gc_val);
-};
+    if (m_userRegion)
+        XDestroyRegion ((Region) m_userRegion);
+    m_userRegion = (WXRegion) XCreateRegion ();
+    XRectangle r;
+    r.x = XLOG2DEV (x);
+    r.y = YLOG2DEV (y);
+    r.width = XLOG2DEVREL(width);
+    r.height = YLOG2DEVREL(height);
+    XUnionRectWithRegion (&r, (Region) m_userRegion, (Region) m_userRegion);
+
+    SetDCClipping ();
+
+    // Needs to work differently for Pixmap: without this,
+    // there's a nasty (Display*) m_display bug. 8/12/94
+    if (m_window && m_window->GetBackingPixmap())
+    {
+        XRectangle rects[1];
+        rects[0].x = XLOG2DEV_2(x);
+        rects[0].y = YLOG2DEV_2(y);
+        rects[0].width = XLOG2DEVREL(width);
+        rects[0].height = YLOG2DEVREL(height);
+        XSetClipRectangles((Display*) m_display, (GC) m_gcBacking, 0, 0, rects, 1, Unsorted);
+    }
+}

 
 

-// ----------------------------------- spline code ----------------------------------------
+void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion& region )
+{
+    wxRect box = region.GetBox();

 
 

-void wx_quadratic_spline(double a1, double b1, double a2, double b2,
-                         double a3, double b3, double a4, double b4);
-void wx_clear_stack(void);
-int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, double *x3,
-        double *y3, double *x4, double *y4);
-void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3,
-          double x4, double y4);
-static bool wx_spline_add_point(double x, double y);
-static void wx_spline_draw_point_array(wxDC *dc);
+    wxDC::DoSetClippingRegion( box.x, box.y, box.width, box.height );

 
 

-wxList wx_spline_point_list;
+    if (m_userRegion)
+        XDestroyRegion ((Region) m_userRegion);
+    m_userRegion = (WXRegion) XCreateRegion ();

 
 

-#define        half(z1, z2)    ((z1+z2)/2.0)
-#define        THRESHOLD    5
+    XUnionRegion((Region) m_userRegion, (Region) region.GetXRegion(), (Region) m_userRegion);

 
 

-/* iterative version */
+    SetDCClipping ();

 
 

-void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4,
-                 double b4)
-{
-    register double  xmid, ymid;
-    double           x1, y1, x2, y2, x3, y3, x4, y4;
-
-    wx_clear_stack();
-    wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);
-
-    while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) {
-        xmid = (double)half(x2, x3);
-        ymid = (double)half(y2, y3);
-    if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD &&
-        fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) {
-            wx_spline_add_point( x1, y1 );
-            wx_spline_add_point( xmid, ymid );
-    } else {
-            wx_spline_push(xmid, ymid, (double)half(xmid, x3), (double)half(ymid, y3),
-                 (double)half(x3, x4), (double)half(y3, y4), x4, y4);
-            wx_spline_push(x1, y1, (double)half(x1, x2), (double)half(y1, y2),
-                 (double)half(x2, xmid), (double)half(y2, ymid), xmid, ymid);
-    }
+    // Needs to work differently for Pixmap: without this,
+    // there's a nasty (Display*) m_display bug. 8/12/94
+    if (m_window && m_window->GetBackingPixmap())
+    {
+        XRectangle rects[1];
+        rects[0].x = XLOG2DEV_2(box.x);
+        rects[0].y = YLOG2DEV_2(box.y);
+        rects[0].width = XLOG2DEVREL(box.width);
+        rects[0].height = YLOG2DEVREL(box.height);
+        XSetClipRectangles((Display*) m_display, (GC) m_gcBacking, 0, 0, rects, 1, Unsorted);

     }
 }
 
     }
 }
 

-/* utilities used by spline drawing routines */

 
 

-typedef struct wx_spline_stack_struct {
-    double           x1, y1, x2, y2, x3, y3, x4, y4;
-} Stack;
+void wxWindowDC::DestroyClippingRegion()
+{
+    wxDC::DestroyClippingRegion();

 
 

-#define         SPLINE_STACK_DEPTH             20
-static Stack    wx_spline_stack[SPLINE_STACK_DEPTH];
-static Stack   *wx_stack_top;
-static int      wx_stack_count;
+    if (m_userRegion)
+        XDestroyRegion ((Region) m_userRegion);
+    m_userRegion = NULL;

 
 

-void wx_clear_stack(void)
-{
-    wx_stack_top = wx_spline_stack;
-    wx_stack_count = 0;
+    SetDCClipping ();
+
+    XGCValues gc_val;
+    gc_val.clip_mask = None;
+    if (m_window && m_window->GetBackingPixmap())
+        XChangeGC((Display*) m_display, (GC) m_gcBacking, GCClipMask, &gc_val);

 }
 
 }
 

-void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
+// Resolution in pixels per logical inch
+wxSize wxWindowDC::GetPPI() const

 {
 {

-    wx_stack_top->x1 = x1;
-    wx_stack_top->y1 = y1;
-    wx_stack_top->x2 = x2;
-    wx_stack_top->y2 = y2;
-    wx_stack_top->x3 = x3;
-    wx_stack_top->y3 = y3;
-    wx_stack_top->x4 = x4;
-    wx_stack_top->y4 = y4;
-    wx_stack_top++;
-    wx_stack_count++;
+    return wxSize(100, 100);

 }
 
 }
 

-int wx_spline_pop(double *x1, double *y1, double *x2, double *y2,
-                  double *x3, double *y3, double *x4, double *y4)
+int wxWindowDC::GetDepth() const

 {
 {

-    if (wx_stack_count == 0)
-    return (0);
-    wx_stack_top--;
-    wx_stack_count--;
-    *x1 = wx_stack_top->x1;
-    *y1 = wx_stack_top->y1;
-    *x2 = wx_stack_top->x2;
-    *y2 = wx_stack_top->y2;
-    *x3 = wx_stack_top->x3;
-    *y3 = wx_stack_top->y3;
-    *x4 = wx_stack_top->x4;
-    *y4 = wx_stack_top->y4;
-    return (1);
+    // TODO
+    return 24;

 }
 
 }
 

-static bool wx_spline_add_point(double x, double y)
+
+
+
+// ----------------------------------------------------------------------------
+// wxPaintDC
+// ----------------------------------------------------------------------------
+
+wxPaintDC::wxPaintDC(wxWindow* win) : wxWindowDC(win)

 {
 {

-  wxPoint *point = new wxPoint ;
-  point->x = (int) x;
-  point->y = (int) y;
-  wx_spline_point_list.Append((wxObject*)point);
-  return TRUE;
+    wxRegion* region = NULL;
+
+    // Combine all the update rects into a region
+    const wxRectList& updateRects(win->GetUpdateRects());
+    if ( updateRects.GetCount() != 0 )
+    {
+        for ( wxRectList::Node *node = updateRects.GetFirst();
+              node;
+              node = node->GetNext() )
+        {
+            wxRect* rect = node->GetData();
+
+            if (!region)
+                region = new wxRegion(*rect);
+            else
+                // TODO: is this correct? In SetDCClipping above,
+                // XIntersectRegion is used to combine paint and user
+                // regions. XIntersectRegion appears to work in that case...
+                region->Union(*rect);
+        }
+    }
+    else
+    {
+        int cw, ch;
+        win->GetClientSize(&cw, &ch);
+        region = new wxRegion(wxRect(0, 0, cw, ch));
+    }
+
+    win->SetUpdateRegion(*region);
+
+    wxRegion& theRegion(win->GetUpdateRegion());
+    theRegion.SetRects(updateRects); // We also store in terms of rects, for iteration to work.
+
+    // Set the clipping region. Any user-defined region will be combined with this
+    // one in SetDCClipping.
+    XSetRegion ((Display*) m_display, (GC) m_gc, (Region) region->GetXRegion());
+
+    delete region;

 }
 
 }
 

-static void wx_spline_draw_point_array(wxDC *dc)
+wxPaintDC::~wxPaintDC()

 {
 {

-  dc->DrawLines(&wx_spline_point_list, 0, 0 );
-  wxNode *node = wx_spline_point_list.First();
-  while (node)
-  {
-    wxPoint *point = (wxPoint *)node->Data();
-    delete point;
-    delete node;
-    node = wx_spline_point_list.First();
-  }
+    XSetClipMask ((Display*) m_display, (GC) m_gc, None);
+    if (m_window)
+        m_window->ClearUpdateRegion();

 }
 
 }
 

-void wxWindowDC::DrawOpenSpline( wxList *points )
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+/*
+   Used when copying between drawables on different (Display*) m_displays. Not
+   very fast, but better than giving up.
+*/
+
+static void XCopyRemote(Display *src_display, Display *dest_display,
+                        Drawable src, Drawable dest,
+                        GC destgc,
+                        int srcx, int srcy,
+                        unsigned int w, unsigned int h,
+                        int destx, int desty,
+                        bool more, XImage **cache)

 {
 {

-    wxPoint *p;
-    double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
-    double           x1, y1, x2, y2;
+    XImage *image, *destimage;
+    Colormap destcm, srccm;
+    static const int CACHE_SIZE = 256;
+
+    unsigned int i, j;
+    unsigned long cachesrc[CACHE_SIZE], cachedest[CACHE_SIZE];
+    int k, cache_pos, all_cache;
+
+    if (!cache || !*cache)
+        image = XGetImage(src_display, src, srcx, srcy, w, h, AllPlanes, ZPixmap);
+    else
+        image = *cache;

 
 

-    wxNode *node = points->First();
-    p = (wxPoint *)node->Data();
+    destimage = XGetImage(dest_display, dest, destx, desty, w, h, AllPlanes, ZPixmap);

 
 

-    x1 = p->x;
-    y1 = p->y;
+    srccm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) src_display);
+    destcm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dest_display);

 
 

-    node = node->Next();
-    p = (wxPoint *)node->Data();
+    cache_pos = 0;
+    all_cache = FALSE;
+
+    for (i = 0; i < w; i++)
+        for (j = 0; j < h; j++) {
+            unsigned long pixel;
+            XColor xcol;
+
+            pixel = XGetPixel(image, i, j);
+            for (k = cache_pos; k--; )
+                if (cachesrc[k] == pixel) {
+                    pixel = cachedest[k];
+                    goto install;
+                }
+                if (all_cache)
+                    for (k = CACHE_SIZE; k-- > cache_pos; )
+                        if (cachesrc[k] == pixel) {
+                            pixel = cachedest[k];
+                            goto install;
+                        }
+
+                        cachesrc[cache_pos] = xcol.pixel = pixel;
+                        XQueryColor(src_display, srccm, &xcol);
+                        if (!XAllocColor(dest_display, destcm, &xcol))
+                            xcol.pixel = 0;
+                        cachedest[cache_pos] = pixel = xcol.pixel;
+
+                        if (++cache_pos >= CACHE_SIZE) {
+                            cache_pos = 0;
+                            all_cache = TRUE;
+                        }
+
+install:
+                        XPutPixel(destimage, i, j, pixel);
+        }
+
+        XPutImage(dest_display, dest, destgc, destimage, 0, 0, destx, desty, w, h);
+        XDestroyImage(destimage);

 
 

-    x2 = p->x;
-    y2 = p->y;
-    cx1 = (double)((x1 + x2) / 2);
-    cy1 = (double)((y1 + y2) / 2);
-    cx2 = (double)((cx1 + x2) / 2);
-    cy2 = (double)((cy1 + y2) / 2);
+        if (more)
+            *cache = image;
+        else
+            XDestroyImage(image);
+}

 
 

-    wx_spline_add_point(x1, y1);
+#if 0

 
 

-    while ((node = node->Next()) != NULL)
-    {
-        p = (wxPoint *)node->Data();
-    x1 = x2;
-    y1 = y2;
-    x2 = p->x;
-    y2 = p->y;
-        cx4 = (double)(x1 + x2) / 2;
-        cy4 = (double)(y1 + y2) / 2;
-        cx3 = (double)(x1 + cx4) / 2;
-        cy3 = (double)(y1 + cy4) / 2;
-
-        wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);
-
-    cx1 = cx4;
-    cy1 = cy4;
-        cx2 = (double)(cx1 + x2) / 2;
-        cy2 = (double)(cy1 + y2) / 2;
+/* Helper function for 16-bit fonts */
+static int str16len(const char *s)
+{
+    int count = 0;
+
+    while (s[0] && s[1]) {
+        count++;
+        s += 2;

     }
 
     }
 

-    wx_spline_add_point( cx1, cy1 );
-    wx_spline_add_point( x2, y2 );
+    return count;
+}

 
 

-    wx_spline_draw_point_array( this );
-};
+#endif // 0