Disable symbols visibility support for the Clang compiler.

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

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index ee102dc06a446b54107a1f38e0db1705ba22fde2..bff8a142c0f45b931da33c2228011c1a0230999c 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1,19 +1,42 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.cpp
+// Name:        src/gtk1/dcclient.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling, Chris Breeze
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dcclient.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XCopyPlane XCOPYPLANE
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/math.h" // for floating-point functions
+    #include "wx/image.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/dcclient.h"
-#include "wx/dcmemory.h"
+#include "wx/fontutil.h"
+
+#include "wx/gtk1/win_gtk.h"
+#include "wx/gtk1/dcclient.h"
+#include "wx/gtk1/dcmemory.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkprivate.h>
+#include <gtk/gtk.h>
+
+//-----------------------------------------------------------------------------
+// local defines
+//-----------------------------------------------------------------------------
+
+#define USE_PAINT_REGION 1

 
 //-----------------------------------------------------------------------------
 // local data
 
 //-----------------------------------------------------------------------------
 // local data


@@ -27,869 +50,2185 @@
 #include "cross.xbm"
 #define  num_hatches 6
 
 #include "cross.xbm"
 #define  num_hatches 6
 

+#define IS_15_PIX_HATCH(s) ((s)==wxCROSSDIAG_HATCH || (s)==wxHORIZONTAL_HATCH || (s)==wxVERTICAL_HATCH)
+#define IS_16_PIX_HATCH(s) ((s)!=wxCROSSDIAG_HATCH && (s)!=wxHORIZONTAL_HATCH && (s)!=wxVERTICAL_HATCH)
+
+

 static GdkPixmap  *hatches[num_hatches];
 static GdkPixmap  *hatches[num_hatches];

-static GdkPixmap **hatch_bitmap = NULL;
+static GdkPixmap **hatch_bitmap = (GdkPixmap **) NULL;
+
+extern GtkWidget *wxGetRootWindow();

 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 

-#define RAD2DEG 57.2957795131
+const double RAD2DEG  = 180.0 / M_PI;
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+static inline double dmax(double a, double b) { return a > b ? a : b; }
+static inline double dmin(double a, double b) { return a < b ? a : b; }
+
+static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }

 
 //-----------------------------------------------------------------------------
 // temporary implementation of the missing GDK function
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // temporary implementation of the missing GDK function
 //-----------------------------------------------------------------------------

+

 #include "gdk/gdkprivate.h"
 #include "gdk/gdkprivate.h"

-void gdk_draw_bitmap    (GdkDrawable  *drawable,
-                         GdkGC        *gc,
-                         GdkDrawable  *src,
-                         gint          xsrc,
-                         gint          ysrc,
-                         gint          xdest,
-                         gint          ydest,
-                         gint          width,
-                         gint          height)
-{
-  GdkWindowPrivate *drawable_private;
-  GdkWindowPrivate *src_private;
-  GdkGCPrivate *gc_private;
-
-  g_return_if_fail (drawable != NULL);
-  g_return_if_fail (src != NULL);
-  g_return_if_fail (gc != NULL);
-
-  drawable_private = (GdkWindowPrivate*) drawable;
-  src_private = (GdkWindowPrivate*) src;
-  if (drawable_private->destroyed || src_private->destroyed)
-    return;
-  gc_private = (GdkGCPrivate*) gc;
-
-  if (width == -1)
-    width = src_private->width;
-  if (height == -1)
-    height = src_private->height;
-
-  XCopyPlane (drawable_private->xdisplay,
-            src_private->xwindow,
-            drawable_private->xwindow,
-            gc_private->xgc,
-            xsrc, ysrc,
-            width, height,
-            xdest, ydest,
-            1);
+
+void gdk_wx_draw_bitmap(GdkDrawable  *drawable,
+                        GdkGC        *gc,
+                        GdkDrawable  *src,
+                        gint         xsrc,
+                        gint         ysrc,
+                        gint         xdest,
+                        gint         ydest,
+                        gint         width,
+                        gint         height)
+{
+    wxCHECK_RET( drawable, wxT("NULL drawable in gdk_wx_draw_bitmap") );
+    wxCHECK_RET( src, wxT("NULL src in gdk_wx_draw_bitmap") );
+    wxCHECK_RET( gc, wxT("NULL gc in gdk_wx_draw_bitmap") );
+
+    GdkWindowPrivate *drawable_private;
+    GdkWindowPrivate *src_private;
+    GdkGCPrivate *gc_private;
+
+    drawable_private = (GdkWindowPrivate*) drawable;
+    src_private = (GdkWindowPrivate*) src;
+    if (drawable_private->destroyed || src_private->destroyed)
+        return;
+
+    gint src_width = src_private->width;
+    gint src_height = src_private->height;
+
+    gc_private = (GdkGCPrivate*) gc;
+
+    if (width == -1) width = src_width;
+    if (height == -1) height = src_height;
+
+    XCopyPlane( drawable_private->xdisplay,
+                src_private->xwindow,
+                drawable_private->xwindow,
+                gc_private->xgc,
+                xsrc, ysrc,
+                width, height,
+                xdest, ydest,
+                1 );

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxPaintDC
+// Implement Pool of Graphic contexts. Creating them takes too much time.

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC,wxDC)
-
-wxPaintDC::wxPaintDC(void)
+enum wxPoolGCType

 {
 {

+   wxGC_ERROR = 0,
+   wxTEXT_MONO,
+   wxBG_MONO,
+   wxPEN_MONO,
+   wxBRUSH_MONO,
+   wxTEXT_COLOUR,
+   wxBG_COLOUR,
+   wxPEN_COLOUR,
+   wxBRUSH_COLOUR,
+   wxTEXT_SCREEN,
+   wxBG_SCREEN,
+   wxPEN_SCREEN,
+   wxBRUSH_SCREEN

 };
 
 };
 

-wxPaintDC::wxPaintDC( wxWindow *window )
-{
-  if (!window) return;
-  GtkWidget *widget = window->m_wxwindow;
-  if (!widget) return;
-  m_window = widget->window;
-  if (!m_window) return;
-  if (window->m_wxwindow)
-    m_cmap = gtk_widget_get_colormap( window->m_wxwindow );
-  else
-    m_cmap = gtk_widget_get_colormap( window->m_widget );
-  SetUpDC();
-  
-  long x = 0;
-  long y = 0;
-  window->GetDrawingOffset( &x, &y );
-  SetInternalDeviceOrigin( -x, -y );
+struct wxGC
+{
+    GdkGC        *m_gc;
+    wxPoolGCType  m_type;
+    bool          m_used;

 };
 
 };
 

-wxPaintDC::~wxPaintDC(void)
+#define GC_POOL_ALLOC_SIZE 100
+
+static int wxGCPoolSize = 0;
+
+static wxGC *wxGCPool = NULL;
+
+static void wxInitGCPool()

 {
 {

-};
+    // This really could wait until the first call to
+    // wxGetPoolGC, but we will make the first allocation
+    // now when other initialization is being performed.
+
+    // Set initial pool size.
+    wxGCPoolSize = GC_POOL_ALLOC_SIZE;
+
+    // Allocate initial pool.
+    wxGCPool = (wxGC *)malloc(wxGCPoolSize * sizeof(wxGC));
+    if (wxGCPool == NULL)
+    {
+        // If we cannot malloc, then fail with error
+        // when debug is enabled.  If debug is not enabled,
+        // the problem will eventually get caught
+        // in wxGetPoolGC.
+        wxFAIL_MSG( wxT("Cannot allocate GC pool") );
+        return;
+    }
+
+    // Zero initial pool.
+    memset(wxGCPool, 0, wxGCPoolSize * sizeof(wxGC));
+}

 
 

-void wxPaintDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1), 
-  wxColour *WXUNUSED(col), int WXUNUSED(style) )
+static void wxCleanUpGCPool()

 {
 {

-};
+    for (int i = 0; i < wxGCPoolSize; i++)
+    {
+        if (wxGCPool[i].m_gc)
+            gdk_gc_unref( wxGCPool[i].m_gc );
+    }
+
+    free(wxGCPool);
+    wxGCPool = NULL;
+    wxGCPoolSize = 0;
+}

 
 

-bool wxPaintDC::GetPixel( long WXUNUSED(x1), long WXUNUSED(y1), wxColour *WXUNUSED(col) ) const
+static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )

 {
 {

-  return FALSE;
-};
+    wxGC *pptr;
+
+    // Look for an available GC.
+    for (int i = 0; i < wxGCPoolSize; i++)
+    {
+        if (!wxGCPool[i].m_gc)
+        {
+            wxGCPool[i].m_gc = gdk_gc_new( window );
+            gdk_gc_set_exposures( wxGCPool[i].m_gc, FALSE );
+            wxGCPool[i].m_type = type;
+            wxGCPool[i].m_used = false;
+        }
+        if ((!wxGCPool[i].m_used) && (wxGCPool[i].m_type == type))
+        {
+            wxGCPool[i].m_used = true;
+            return wxGCPool[i].m_gc;
+        }
+    }
+
+    // We did not find an available GC.
+    // We need to grow the GC pool.
+    pptr = (wxGC *)realloc(wxGCPool,
+        (wxGCPoolSize + GC_POOL_ALLOC_SIZE)*sizeof(wxGC));
+    if (pptr != NULL)
+    {
+        // Initialize newly allocated pool.
+        wxGCPool = pptr;
+        memset(&wxGCPool[wxGCPoolSize], 0,
+            GC_POOL_ALLOC_SIZE*sizeof(wxGC));
+
+        // Initialize entry we will return.
+        wxGCPool[wxGCPoolSize].m_gc = gdk_gc_new( window );
+        gdk_gc_set_exposures( wxGCPool[wxGCPoolSize].m_gc, FALSE );
+        wxGCPool[wxGCPoolSize].m_type = type;
+        wxGCPool[wxGCPoolSize].m_used = true;
+
+        // Set new value of pool size.
+        wxGCPoolSize += GC_POOL_ALLOC_SIZE;
+
+        // Return newly allocated entry.
+        return wxGCPool[wxGCPoolSize-GC_POOL_ALLOC_SIZE].m_gc;
+    }
+
+    // The realloc failed.  Fall through to error.
+    wxFAIL_MSG( wxT("No GC available") );
+
+    return NULL;
+}

 
 

-void wxPaintDC::DrawLine( long x1, long y1, long x2, long y2 )
+static void wxFreePoolGC( GdkGC *gc )

 {
 {

-  if (!Ok()) return;
-  
-  if (m_pen.GetStyle() != wxTRANSPARENT)
-  {
-    gdk_draw_line( m_window, m_penGC, 
-      XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2) );
-  };
-};
+    for (int i = 0; i < wxGCPoolSize; i++)
+    {
+        if (wxGCPool[i].m_gc == gc)
+        {
+            wxGCPool[i].m_used = false;
+            return;
+        }
+    }

 
 

-void wxPaintDC::CrossHair( long x, long y )
-{
-  if (!Ok()) return;
-  
-  if (m_pen.GetStyle() != wxTRANSPARENT)
-  {
-    int w = 0;
-    int h = 0;
-    GetSize( &w, &h );
-    long xx = XLOG2DEV(x);
-    long yy = YLOG2DEV(y);
-    gdk_draw_line( m_window, m_penGC,
-      0, yy, XLOG2DEVREL(w), yy );
-    gdk_draw_line( m_window, m_penGC,
-      xx, 0, xx, YLOG2DEVREL(h) );
-  };
-};
+    wxFAIL_MSG( wxT("Wrong GC") );
+}

 
 

-void wxPaintDC::DrawArc( long x1, long y1, long x2, long y2, double xc, double yc )
-{
-  if (!Ok()) return;
-  
-  long xx1 = XLOG2DEV(x1); 
-  long yy1 = YLOG2DEV(y1);
-  long xx2 = XLOG2DEV(x2); 
-  long yy2 = YLOG2DEV(y2);
-  long xxc = XLOG2DEV((long)xc); 
-  long yyc = YLOG2DEV((long)yc);
-  double dx = xx1 - xxc; 
-  double dy = yy1 - yyc;
-  double radius = sqrt(dx*dx+dy*dy);
-  long   r      = (long)radius;
-  double radius1, radius2;
-
-  if (xx1 == xx2 && yy1 == yy2) 
-  {
-    radius1 = 0.0;
-    radius2 = 360.0;
-  } 
-  else 
-  if (radius == 0.0) 
-  {
-    radius1 = radius2 = 0.0;
-  } 
-  else 
-  {
-    radius1 = (xx1 - xxc == 0) ?
-           (yy1 - yyc < 0) ? 90.0 : -90.0 :
-           -atan2(double(yy1-yyc), double(xx1-xxc)) * RAD2DEG;
-    radius2 = (xx2 - xxc == 0) ?
-           (yy2 - yyc < 0) ? 90.0 : -90.0 :
-           -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG;
-  };
-  long alpha1 = long(radius1 * 64.0);
-  long alpha2 = long((radius2 - radius1) * 64.0);
-  while (alpha2 <= 0) alpha2 += 360*64;
-  while (alpha1 > 360*64) alpha1 -= 360*64;
-
-  if (m_brush.GetStyle() != wxTRANSPARENT)
-    gdk_draw_arc( m_window, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
-    
-  if (m_pen.GetStyle() != wxTRANSPARENT)
-    gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
-  
-};
+//-----------------------------------------------------------------------------
+// wxWindowDCImpl
+//-----------------------------------------------------------------------------

 
 

-void wxPaintDC::DrawEllipticArc( long x, long y, long width, long height, double sa, double ea )
-{
-  if (!Ok()) return;
-  
-  long xx = XLOG2DEV(x);    
-  long yy = YLOG2DEV(y);
-  long ww = m_signX * XLOG2DEVREL(width); 
-  long hh = m_signY * YLOG2DEVREL(height);
-  
-  // CMB: handle -ve width and/or height
-  if (ww < 0) { ww = -ww; xx = xx - ww; }
-  if (hh < 0) { hh = -hh; yy = yy - hh; }
-  
-  long start = long(sa * 64.0);
-  long end = long(ea * 64.0);
-  if (m_brush.GetStyle() != wxTRANSPARENT)
-    gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
-  
-  if (m_pen.GetStyle() != wxTRANSPARENT)
-    gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, ww, hh, start, end );
-};
+IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxDC)

 
 

-void wxPaintDC::DrawPoint( long x, long y )
+wxWindowDCImpl::wxWindowDCImpl(wxDC *owner)
+              : wxGTKDCImpl(owner)

 {
 {

-  if (!Ok()) return;
-  
-  if (m_pen.GetStyle() != wxTRANSPARENT)
-    gdk_draw_point( m_window, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );
-};
+    m_penGC = NULL;
+    m_brushGC = NULL;
+    m_textGC = NULL;
+    m_bgGC = NULL;
+    m_cmap = NULL;
+    m_isMemDC = false;
+    m_isScreenDC = false;
+    m_owner = NULL;
+}

 
 

-void wxPaintDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset )
-{
-  if (!Ok()) return;
-  
-  if (m_pen.GetStyle() == wxTRANSPARENT) return;
-  
-  for (int i = 0; i < n-1; i++)
-  {
-    long x1 = XLOG2DEV(points[i].x + xoffset);
-    long x2 = XLOG2DEV(points[i+1].x + xoffset);
-    long y1 = YLOG2DEV(points[i].y + yoffset);     // oh, what a waste
-    long y2 = YLOG2DEV(points[i+1].y + yoffset);
-    gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );
-  };
-};
+wxWindowDCImpl::wxWindowDCImpl(wxDC *owner, wxWindow *window)
+              : wxGTKDCImpl(owner)
+{
+    wxASSERT_MSG( window, wxT("DC needs a window") );
+
+    m_penGC = NULL;
+    m_brushGC = NULL;
+    m_textGC = NULL;
+    m_bgGC = NULL;
+    m_cmap = NULL;
+    m_owner = NULL;
+    m_isMemDC = false;
+    m_isScreenDC = false;
+    m_font = window->GetFont();
+
+    GtkWidget *widget = window->m_wxwindow;
+
+    // Some controls don't have m_wxwindow - like wxStaticBox, but the user
+    // code should still be able to create wxClientDCs for them, so we will
+    // use the parent window here then.
+    if ( !widget )
+    {
+        window = window->GetParent();
+        widget = window->m_wxwindow;
+    }

 
 

-void wxPaintDC::DrawLines( wxList *points, long xoffset, long yoffset )
-{
-  if (!Ok()) return;
-  
-  if (m_pen.GetStyle() == wxTRANSPARENT) return;
-  
-  wxNode *node = points->First();
-  while (node->Next())
-  {
-    wxPoint *point = (wxPoint*)node->Data();
-    wxPoint *npoint = (wxPoint*)node->Next()->Data();
-    long x1 = XLOG2DEV(point->x + xoffset);
-    long x2 = XLOG2DEV(npoint->x + xoffset);
-    long y1 = YLOG2DEV(point->y + yoffset);    // and again...
-    long y2 = YLOG2DEV(npoint->y + yoffset);
-    gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );
-    node = node->Next();
-  };
-};
+    wxASSERT_MSG( widget, wxT("DC needs a widget") );
+
+    GtkPizza *pizza = GTK_PIZZA( widget );
+    m_window = pizza->bin_window;
+
+    // Window not realized ?
+    if (!m_window)
+    {
+         // Don't report problems as per MSW.
+         m_ok = true;
+
+         return;
+    }
+
+    m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );

 
 

-void wxPaintDC::DrawPolygon( int WXUNUSED(n), wxPoint WXUNUSED(points)[], 
-  long WXUNUSED(xoffset), long WXUNUSED(yoffset), int WXUNUSED(fillStyle) )
+    SetUpDC();
+
+    /* this must be done after SetUpDC, bacause SetUpDC calls the
+       repective SetBrush, SetPen, SetBackground etc functions
+       to set up the DC. SetBackground call m_owner->SetBackground
+       and this might not be desired as the standard dc background
+       is white whereas a window might assume gray to be the
+       standard (as e.g. wxStatusBar) */
+
+    m_owner = window;
+}
+
+wxWindowDCImpl::~wxWindowDCImpl()

 {
 {

-  if (!Ok()) return;
-};
+    Destroy();
+}

 
 

-void wxPaintDC::DrawPolygon( wxList *WXUNUSED(lines), long WXUNUSED(xoffset), 
-                             long WXUNUSED(yoffset), int WXUNUSED(fillStyle) )
+void wxWindowDCImpl::SetUpDC()

 {
 {

-  if (!Ok()) return;
-};
+    m_ok = true;
+
+    wxASSERT_MSG( !m_penGC, wxT("GCs already created") );
+
+    if (m_isScreenDC)
+    {
+        m_penGC = wxGetPoolGC( m_window, wxPEN_SCREEN );
+        m_brushGC = wxGetPoolGC( m_window, wxBRUSH_SCREEN );
+        m_textGC = wxGetPoolGC( m_window, wxTEXT_SCREEN );
+        m_bgGC = wxGetPoolGC( m_window, wxBG_SCREEN );
+    }
+    else if (m_isMemDC && (((wxMemoryDCImpl*)this)->m_selected.GetDepth() == 1))
+    {
+        m_penGC = wxGetPoolGC( m_window, wxPEN_MONO );
+        m_brushGC = wxGetPoolGC( m_window, wxBRUSH_MONO );
+        m_textGC = wxGetPoolGC( m_window, wxTEXT_MONO );
+        m_bgGC = wxGetPoolGC( m_window, wxBG_MONO );
+    }
+    else
+    {
+        m_penGC = wxGetPoolGC( m_window, wxPEN_COLOUR );
+        m_brushGC = wxGetPoolGC( m_window, wxBRUSH_COLOUR );
+        m_textGC = wxGetPoolGC( m_window, wxTEXT_COLOUR );
+        m_bgGC = wxGetPoolGC( m_window, wxBG_COLOUR );
+    }
+
+    /* background colour */
+    m_backgroundBrush = *wxWHITE_BRUSH;
+    m_backgroundBrush.GetColour().CalcPixel( m_cmap );
+    GdkColor *bg_col = m_backgroundBrush.GetColour().GetColor();
+
+    /* m_textGC */
+    m_textForegroundColour.CalcPixel( m_cmap );
+    gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
+
+    m_textBackgroundColour.CalcPixel( m_cmap );
+    gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
+
+    gdk_gc_set_fill( m_textGC, GDK_SOLID );
+
+    /* m_penGC */
+    m_pen.GetColour().CalcPixel( m_cmap );
+    gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() );
+    gdk_gc_set_background( m_penGC, bg_col );
+
+    gdk_gc_set_line_attributes( m_penGC, 0, GDK_LINE_SOLID, GDK_CAP_NOT_LAST, GDK_JOIN_ROUND );

 
 

-void wxPaintDC::DrawRectangle( long x, long y, long width, long height )
+    /* m_brushGC */
+    m_brush.GetColour().CalcPixel( m_cmap );
+    gdk_gc_set_foreground( m_brushGC, m_brush.GetColour().GetColor() );
+    gdk_gc_set_background( m_brushGC, bg_col );
+
+    gdk_gc_set_fill( m_brushGC, GDK_SOLID );
+
+    /* m_bgGC */
+    gdk_gc_set_background( m_bgGC, bg_col );
+    gdk_gc_set_foreground( m_bgGC, bg_col );
+
+    gdk_gc_set_fill( m_bgGC, GDK_SOLID );
+
+    /* ROPs */
+    gdk_gc_set_function( m_textGC, GDK_COPY );
+    gdk_gc_set_function( m_brushGC, GDK_COPY );
+    gdk_gc_set_function( m_penGC, GDK_COPY );
+
+    /* clipping */
+    gdk_gc_set_clip_rectangle( m_penGC, NULL );
+    gdk_gc_set_clip_rectangle( m_brushGC, NULL );
+    gdk_gc_set_clip_rectangle( m_textGC, NULL );
+    gdk_gc_set_clip_rectangle( m_bgGC, NULL );
+
+    if (!hatch_bitmap)
+    {
+        hatch_bitmap    = hatches;
+        hatch_bitmap[0] = gdk_bitmap_create_from_data( NULL, bdiag_bits, bdiag_width, bdiag_height );
+        hatch_bitmap[1] = gdk_bitmap_create_from_data( NULL, cdiag_bits, cdiag_width, cdiag_height );
+        hatch_bitmap[2] = gdk_bitmap_create_from_data( NULL, fdiag_bits, fdiag_width, fdiag_height );
+        hatch_bitmap[3] = gdk_bitmap_create_from_data( NULL, cross_bits, cross_width, cross_height );
+        hatch_bitmap[4] = gdk_bitmap_create_from_data( NULL, horiz_bits, horiz_width, horiz_height );
+        hatch_bitmap[5] = gdk_bitmap_create_from_data( NULL, verti_bits, verti_width, verti_height );
+    }
+}
+
+void wxWindowDCImpl::DoGetSize( int* width, int* height ) const

 {
 {

-  if (!Ok()) return;
+    wxCHECK_RET( m_owner, wxT("GetSize() doesn't work without window") );

 
 

-  long xx = XLOG2DEV(x);
-  long yy = YLOG2DEV(y);
-  long ww = m_signX * XLOG2DEVREL(width);
-  long hh = m_signY * YLOG2DEVREL(height);
-    
-  // CMB: draw nothing if transformed w or h is 0
-  if (ww == 0 || hh == 0) return;
+    m_owner->GetSize(width, height);
+}

 
 

-  // CMB: handle -ve width and/or height
-  if (ww < 0) { ww = -ww; xx = xx - ww; }
-  if (hh < 0) { hh = -hh; yy = yy - hh; }
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+                          const wxColour & col, wxFloodFillStyle style);

 
 

-  if (m_brush.GetStyle() != wxTRANSPARENT)
-    gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy, ww, hh );
-    
-  if (m_pen.GetStyle() != wxTRANSPARENT)
-    gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
-};
+bool wxWindowDCImpl::DoFloodFill(wxCoord x, wxCoord y,
+                             const wxColour& col, wxFloodFillStyle style)
+{
+    return wxDoFloodFill(GetOwner(), x, y, col, style);
+}

 
 

-void wxPaintDC::DrawRoundedRectangle( long x, long y, long width, long height, double radius )
-{
-  if (!Ok()) return;
-  
-  if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
-  
-  long xx = XLOG2DEV(x);    
-  long yy = YLOG2DEV(y);
-  long ww = m_signX * XLOG2DEVREL(width); 
-  long hh = m_signY * YLOG2DEVREL(height);
-  long rr = XLOG2DEVREL((long)radius);
-
-  // CMB: handle -ve width and/or height
-  if (ww < 0) { ww = -ww; xx = xx - ww; }
-  if (hh < 0) { hh = -hh; yy = yy - hh; }
-
-  // CMB: if radius is zero use DrawRectangle() instead to avoid
-  // X drawing errors with small radii
-  if (rr == 0)
-  {
-    DrawRectangle( x, y, width, height );
-    return;
-  }
-
-  // CMB: draw nothing if transformed w or h is 0
-  if (ww == 0 || hh == 0) return;
-
-  // CMB: adjust size if outline is drawn otherwise the result is
-  // 1 pixel too wide and high
-  if (m_pen.GetStyle() != wxTRANSPARENT)
-  {
-    ww--;
-    hh--;
-  }
-
-  // CMB: ensure dd is not larger than rectangle otherwise we
-  // get an hour glass shape
-  long dd = 2 * rr;
-  if (dd > ww) dd = ww;
-  if (dd > hh) dd = hh;
-  rr = dd / 2;
-
-  if (m_brush.GetStyle() != wxTRANSPARENT)
-  {
-    gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
-    gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
-    gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
-    gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
-    gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
-    gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
-  };
-  
-  if (m_pen.GetStyle() != wxTRANSPARENT)
-  {
-    gdk_draw_line( m_window, m_penGC, xx+rr, yy, xx+ww-rr, yy );
-    gdk_draw_line( m_window, m_penGC, xx+rr, yy+hh, xx+ww-rr, yy+hh );
-    gdk_draw_line( m_window, m_penGC, xx, yy+rr, xx, yy+hh-rr );
-    gdk_draw_line( m_window, m_penGC, xx+ww, yy+rr, xx+ww, yy+hh-rr );
-    gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, dd, dd, 90*64, 90*64 );
-    gdk_draw_arc( m_window, m_penGC, FALSE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
-    gdk_draw_arc( m_window, m_penGC, FALSE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
-    gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
-  };
-};
+bool wxWindowDCImpl::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, GetOwner(), 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 wxPaintDC::DrawEllipse( long x, long y, long width, long height )
-{
-  if (!Ok()) return;
-  
-  long xx = XLOG2DEV(x);    
-  long yy = YLOG2DEV(y);
-  long ww = m_signX * XLOG2DEVREL(width); 
-  long hh = m_signY * YLOG2DEVREL(height);
-
-  // CMB: handle -ve width and/or height
-  if (ww < 0) { ww = -ww; xx = xx - ww; }
-  if (hh < 0) { hh = -hh; yy = yy - hh; }
-  
-  if (m_brush.GetStyle() != wxTRANSPARENT)
-    gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
-  
-  if (m_pen.GetStyle() != wxTRANSPARENT)
-    gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, ww, hh, 0, 360*64 );
-};
+void wxWindowDCImpl::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
+{
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if (m_pen.GetStyle() != wxTRANSPARENT)
+    {
+        if (m_window)
+            gdk_draw_line( m_window, m_penGC, XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2) );
+
+        CalcBoundingBox(x1, y1);
+        CalcBoundingBox(x2, y2);
+    }
+}

 
 

-bool wxPaintDC::CanDrawBitmap(void) const
+void wxWindowDCImpl::DoCrossHair( wxCoord x, wxCoord y )

 {
 {

-  return TRUE;
-};
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
 

-void wxPaintDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
-{
-  if (!Ok()) return;
-  
-  if (!icon.Ok()) return;
-  
-  int xx = XLOG2DEV(x);
-  int yy = YLOG2DEV(y);
-  
-  GdkBitmap *mask = NULL;
-  if (icon.GetMask()) mask = icon.GetMask()->GetBitmap();
-    
-  if (useMask && mask) 
-  {
-    gdk_gc_set_clip_mask( m_penGC, mask );
-    gdk_gc_set_clip_origin( m_penGC, xx, yy );
-  };
-  
-  GdkPixmap *pm = icon.GetPixmap();
-  gdk_draw_pixmap( m_window, m_penGC, pm, 0, 0, xx, yy, -1, -1 );
-  
-  if (useMask && mask) 
-  {
-    gdk_gc_set_clip_mask( m_penGC, NULL );
-    gdk_gc_set_clip_origin( m_penGC, 0, 0 );
-  };
-};
+    if (m_pen.GetStyle() != wxTRANSPARENT)
+    {
+        int w = 0;
+        int h = 0;
+        GetSize( &w, &h );
+        wxCoord xx = XLOG2DEV(x);
+        wxCoord yy = YLOG2DEV(y);
+        if (m_window)
+        {
+            gdk_draw_line( m_window, m_penGC, 0, yy, XLOG2DEVREL(w), yy );
+            gdk_draw_line( m_window, m_penGC, xx, 0, xx, YLOG2DEVREL(h) );
+        }
+    }
+}

 
 

-bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
-       wxDC *source, long xsrc, long ysrc, int WXUNUSED(logical_func), bool WXUNUSED(useMask) )
-{
-  if (!Ok()) return FALSE;
-  
-  // CMB 20/5/98: add blitting of bitmaps
-  if (source->IsKindOf(CLASSINFO(wxMemoryDC)))
-  {
-    wxMemoryDC* srcDC = (wxMemoryDC*)source;
-       GdkBitmap* bmap = srcDC->m_selected.GetBitmap();
-    if (bmap)
-    {
-      gdk_draw_bitmap (
-          m_window,
-          m_textGC,
-          bmap,
-          source->DeviceToLogicalX(xsrc), source->DeviceToLogicalY(ysrc),
-          XLOG2DEV(xdest), YLOG2DEV(ydest),
-          source->DeviceToLogicalXRel(width), source->DeviceToLogicalYRel(height)
-          );
-      return TRUE;
-    }
-  }
-
-  wxClientDC *csrc = (wxClientDC*)source;
-  gdk_window_copy_area ( m_window, m_penGC,
-    XLOG2DEV(xdest), YLOG2DEV(ydest),
-    csrc->GetWindow(),
-    source->DeviceToLogicalX(xsrc), source->DeviceToLogicalY(ysrc),
-    source->DeviceToLogicalXRel(width), source->DeviceToLogicalYRel(height) );
-
-/*    
-  gdk_window_copy_area ( m_window, m_penGC,
-    XLOG2DEV(xdest), YLOG2DEV(ydest),
-    csrc->GetWindow(),
-    xsrc, ysrc,
-    width, height );
-*/
-    
-  return TRUE;
-};
+void wxWindowDCImpl::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
+                            wxCoord xc, wxCoord yc )
+{
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    wxCoord xx1 = XLOG2DEV(x1);
+    wxCoord yy1 = YLOG2DEV(y1);
+    wxCoord xx2 = XLOG2DEV(x2);
+    wxCoord yy2 = YLOG2DEV(y2);
+    wxCoord xxc = XLOG2DEV(xc);
+    wxCoord yyc = YLOG2DEV(yc);
+    double dx = xx1 - xxc;
+    double dy = yy1 - yyc;
+    double radius = sqrt((double)(dx*dx+dy*dy));
+    wxCoord   r      = (wxCoord)radius;
+    double radius1, radius2;
+
+    if (xx1 == xx2 && yy1 == yy2)
+    {
+        radius1 = 0.0;
+        radius2 = 360.0;
+    }
+    else if ( wxIsNullDouble(radius) )
+    {
+        radius1 =
+        radius2 = 0.0;
+    }
+    else
+    {
+        radius1 = (xx1 - xxc == 0) ?
+            (yy1 - yyc < 0) ? 90.0 : -90.0 :
+            -atan2(double(yy1-yyc), double(xx1-xxc)) * RAD2DEG;
+        radius2 = (xx2 - xxc == 0) ?
+            (yy2 - yyc < 0) ? 90.0 : -90.0 :
+            -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG;
+    }
+    wxCoord alpha1 = wxCoord(radius1 * 64.0);
+    wxCoord alpha2 = wxCoord((radius2 - radius1) * 64.0);
+    while (alpha2 <= 0) alpha2 += 360*64;
+    while (alpha1 > 360*64) alpha1 -= 360*64;

 
 

-void wxPaintDC::DrawText( const wxString &text, long x, long y, bool WXUNUSED(use16) )
+    if (m_window)
+    {
+        if (m_brush.GetStyle() != wxTRANSPARENT)
+        {
+            if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+            {
+                gdk_gc_set_ts_origin( m_textGC,
+                                      m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                      m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+                gdk_draw_arc( m_window, m_textGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+                gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+            } else
+            if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+            {
+                gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            } else
+            if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+            {
+                gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            } else
+            if (m_brush.GetStyle() == wxSTIPPLE)
+            {
+                gdk_gc_set_ts_origin( m_brushGC,
+                                      m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                      m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            }
+            else
+            {
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+            }
+        }
+
+        if (m_pen.GetStyle() != wxTRANSPARENT)
+        {
+            gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+
+            gdk_draw_line( m_window, m_penGC, xx1, yy1, xxc, yyc );
+            gdk_draw_line( m_window, m_penGC, xxc, yyc, xx2, yy2 );
+        }
+    }
+
+    CalcBoundingBox (x1, y1);
+    CalcBoundingBox (x2, y2);
+}
+
+void wxWindowDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double sa, double ea )

 {
 {

-  if (!Ok()) return;
-  
-  GdkFont *font = m_font.GetInternalFont( m_scaleY );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
 

-  // CMB 21/5/98: draw text background if mode is wxSOLID
-  if (m_backgroundMode == wxSOLID)
-  {
-    long width = gdk_string_width( font, text );
-    long height = font->ascent + font->descent;
-    gdk_gc_set_foreground( m_textGC, m_textBackgroundColour.GetColor() );
-    gdk_draw_rectangle( m_window, m_textGC, TRUE, x, y, width, height );
-    gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
-  }
-  gdk_draw_string( m_window, font, m_textGC, 
-    XLOG2DEV(x), 
-    YLOG2DEV(y) + font->ascent, text );
-};
+    wxCoord xx = XLOG2DEV(x);
+    wxCoord yy = YLOG2DEV(y);
+    wxCoord ww = m_signX * XLOG2DEVREL(width);
+    wxCoord hh = m_signY * YLOG2DEVREL(height);

 
 

-bool wxPaintDC::CanGetTextExtent(void) const
+    // CMB: handle -ve width and/or height
+    if (ww < 0) { ww = -ww; xx = xx - ww; }
+    if (hh < 0) { hh = -hh; yy = yy - hh; }
+
+    if (m_window)
+    {
+        wxCoord start = wxCoord(sa * 64.0);
+        wxCoord end = wxCoord((ea-sa) * 64.0);
+
+        if (m_brush.GetStyle() != wxTRANSPARENT)
+        {
+            if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+            {
+                gdk_gc_set_ts_origin( m_textGC,
+                                      m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                      m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+                gdk_draw_arc( m_window, m_textGC, TRUE, xx, yy, ww, hh, start, end );
+                gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+            } else
+            if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+            {
+                gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            } else
+            if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+            {
+                gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            } else
+            if (m_brush.GetStyle() == wxSTIPPLE)
+            {
+                gdk_gc_set_ts_origin( m_brushGC,
+                                      m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                      m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            }
+            else
+            {
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
+            }
+        }
+
+        if (m_pen.GetStyle() != wxTRANSPARENT)
+            gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, ww, hh, start, end );
+    }
+
+    CalcBoundingBox (x, y);
+    CalcBoundingBox (x + width, y + height);
+}
+
+void wxWindowDCImpl::DoDrawPoint( wxCoord x, wxCoord y )

 {
 {

-  return TRUE;
-};
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if ((m_pen.GetStyle() != wxTRANSPARENT) && m_window)
+        gdk_draw_point( m_window, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );

 
 

-void wxPaintDC::GetTextExtent( const wxString &string, long *width, long *height,
-                     long *WXUNUSED(descent), long *WXUNUSED(externalLeading),
-                     wxFont *WXUNUSED(theFont), bool WXUNUSED(use16) )
+    CalcBoundingBox (x, y);
+}
+
+void wxWindowDCImpl::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset )

 {
 {

-  if (!Ok()) return;
-  
-  GdkFont *font = m_font.GetInternalFont( m_scaleY );
-  if (width) (*width) = long(gdk_string_width( font, string ) / m_scaleX);
-  if (height) (*height) = long((font->ascent + font->descent) / m_scaleY);
-};
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if (m_pen.GetStyle() == wxTRANSPARENT) return;
+    if (n <= 0) return;

 
 

-long wxPaintDC::GetCharWidth(void)
+
+    GdkPoint * const gpts = new GdkPoint[n];
+    if ( !gpts )
+    {
+        wxFAIL_MSG( wxT("Cannot allocate PolyLine") );
+        return;
+    }
+
+    for (int i = 0; i < n; i++)
+    {
+        wxCoord x = points[i].x + xoffset,
+                y = points[i].y + yoffset;
+
+        CalcBoundingBox(x + xoffset, y + yoffset);
+
+        gpts[i].x = XLOG2DEV(x);
+        gpts[i].y = YLOG2DEV(y);
+    }
+
+    gdk_draw_lines( m_window, m_penGC, gpts, n);
+
+    delete[] gpts;
+}
+
+void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode WXUNUSED(fillStyle) )

 {
 {

-  if (!Ok()) return 0;
-  
-  GdkFont *font = m_font.GetInternalFont( m_scaleY );
-  return gdk_string_width( font, "H" );
-};
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if (n <= 0) return;
+
+    GdkPoint * const gpts = new GdkPoint[n];
+
+    for (int i = 0 ; i < n ; i++)
+    {
+        wxCoord x = points[i].x + xoffset,
+                y = points[i].y + yoffset;
+
+        CalcBoundingBox(x + xoffset, y + yoffset);

 
 

-long wxPaintDC::GetCharHeight(void)
+        gpts[i].x = XLOG2DEV(x);
+        gpts[i].y = YLOG2DEV(y);
+    }
+
+    if (m_brush.GetStyle() == wxSOLID)
+    {
+        gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+    }
+    else if (m_brush.GetStyle() != wxTRANSPARENT)
+    {
+        if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+        {
+            gdk_gc_set_ts_origin( m_textGC,
+                                  m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                  m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+            gdk_draw_polygon( m_window, m_textGC, TRUE, gpts, n );
+            gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+        } else
+        if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+        {
+            gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
+            gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+            gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+        } else
+        if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+        {
+            gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+            gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+            gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+        } else
+        if (m_brush.GetStyle() == wxSTIPPLE)
+        {
+            gdk_gc_set_ts_origin( m_brushGC,
+                                  m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                  m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+            gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+            gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+        }
+        else
+        {
+            gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+        }
+    }
+
+    if (m_pen.GetStyle() != wxTRANSPARENT)
+    {
+        gdk_draw_polygon( m_window, m_penGC, FALSE, gpts, n );
+
+    }
+
+    delete[] gpts;
+}
+
+void wxWindowDCImpl::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

-  if (!Ok()) return 0;
-  
-  GdkFont *font = m_font.GetInternalFont( m_scaleY );
-  return font->ascent + font->descent;
-};
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
 

-void wxPaintDC::Clear(void)
+    wxCoord xx = XLOG2DEV(x);
+    wxCoord yy = YLOG2DEV(y);
+    wxCoord ww = m_signX * XLOG2DEVREL(width);
+    wxCoord hh = m_signY * YLOG2DEVREL(height);
+
+    // CMB: draw nothing if transformed w or h is 0
+    if (ww == 0 || hh == 0) return;
+
+    // CMB: handle -ve width and/or height
+    if (ww < 0) { ww = -ww; xx = xx - ww; }
+    if (hh < 0) { hh = -hh; yy = yy - hh; }
+
+    if (m_window)
+    {
+        if (m_brush.GetStyle() != wxTRANSPARENT)
+        {
+            if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+            {
+                gdk_gc_set_ts_origin( m_textGC,
+                                      m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                      m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+                gdk_draw_rectangle( m_window, m_textGC, TRUE, xx, yy, ww, hh );
+                gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+            } else
+            if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+            {
+                gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
+                gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy, ww, hh );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            } else
+            if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+            {
+                gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+                gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy, ww, hh );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            } else
+            if (m_brush.GetStyle() == wxSTIPPLE)
+            {
+                gdk_gc_set_ts_origin( m_brushGC,
+                                      m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                      m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+                gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy, ww, hh );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            }
+            else
+            {
+                gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy, ww, hh );
+            }
+        }
+
+        if (m_pen.GetStyle() != wxTRANSPARENT)
+            gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
+    }
+
+    CalcBoundingBox( x, y );
+    CalcBoundingBox( x + width, y + height );
+}
+
+void wxWindowDCImpl::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )

 {
 {

-  if (!Ok()) return;
-  
-  DestroyClippingRegion();
-  gdk_window_clear( m_window );
-};
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
+
+    wxCoord xx = XLOG2DEV(x);
+    wxCoord yy = YLOG2DEV(y);
+    wxCoord ww = m_signX * XLOG2DEVREL(width);
+    wxCoord hh = m_signY * YLOG2DEVREL(height);
+    wxCoord rr = XLOG2DEVREL((wxCoord)radius);
+
+    // CMB: handle -ve width and/or height
+    if (ww < 0) { ww = -ww; xx = xx - ww; }
+    if (hh < 0) { hh = -hh; yy = yy - hh; }
+
+    // CMB: if radius is zero use DrawRectangle() instead to avoid
+    // X drawing errors with small radii
+    if (rr == 0)
+    {
+        DoDrawRectangle( x, y, width, height );
+        return;
+    }

 
 

-void wxPaintDC::SetFont( const wxFont &font )
+    // CMB: draw nothing if transformed w or h is 0
+    if (ww == 0 || hh == 0) return;
+
+    // CMB: adjust size if outline is drawn otherwise the result is
+    // 1 pixel too wide and high
+    if (m_pen.GetStyle() != wxTRANSPARENT)
+    {
+        ww--;
+        hh--;
+    }
+
+    if (m_window)
+    {
+        // CMB: ensure dd is not larger than rectangle otherwise we
+        // get an hour glass shape
+        wxCoord dd = 2 * rr;
+        if (dd > ww) dd = ww;
+        if (dd > hh) dd = hh;
+        rr = dd / 2;
+
+        if (m_brush.GetStyle() != wxTRANSPARENT)
+        {
+            if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+            {
+                gdk_gc_set_ts_origin( m_textGC,
+                                      m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                      m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+                gdk_draw_rectangle( m_window, m_textGC, TRUE, xx+rr, yy, ww-dd+1, hh );
+                gdk_draw_rectangle( m_window, m_textGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
+                gdk_draw_arc( m_window, m_textGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
+                gdk_draw_arc( m_window, m_textGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
+                gdk_draw_arc( m_window, m_textGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
+                gdk_draw_arc( m_window, m_textGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
+                gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+            } else
+            if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+            {
+                gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
+                gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
+                gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            } else
+            if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+            {
+                gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+                gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
+                gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            } else
+            if (m_brush.GetStyle() == wxSTIPPLE)
+            {
+                gdk_gc_set_ts_origin( m_brushGC,
+                                      m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                      m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+                gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
+                gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            }
+            else
+            {
+                gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
+                gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
+            }
+        }
+
+        if (m_pen.GetStyle() != wxTRANSPARENT)
+        {
+            gdk_draw_line( m_window, m_penGC, xx+rr+1, yy, xx+ww-rr, yy );
+            gdk_draw_line( m_window, m_penGC, xx+rr+1, yy+hh, xx+ww-rr, yy+hh );
+            gdk_draw_line( m_window, m_penGC, xx, yy+rr+1, xx, yy+hh-rr );
+            gdk_draw_line( m_window, m_penGC, xx+ww, yy+rr+1, xx+ww, yy+hh-rr );
+            gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, dd, dd, 90*64, 90*64 );
+            gdk_draw_arc( m_window, m_penGC, FALSE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
+            gdk_draw_arc( m_window, m_penGC, FALSE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
+            gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
+        }
+    }
+
+    // this ignores the radius
+    CalcBoundingBox( x, y );
+    CalcBoundingBox( x + width, y + height );
+}
+
+void wxWindowDCImpl::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

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

 
 

-void wxPaintDC::SetPen( const wxPen &pen )
-{
-  if (!Ok()) return;
-
-  if (m_pen == pen) return;
-  
-  m_pen = pen;
-  
-  if (!m_pen.Ok()) return;
-  
-  gint width = m_pen.GetWidth();
-  // CMB: if width is non-zero scale it with the dc
-  if (width <= 0)
-  {
-    width = 1;
-  }
-  else
-  {
-    // X doesn't allow different width in x and y and so we take
-    // the average
-    double w = 0.5 + (abs(XLOG2DEVREL(width)) + abs(YLOG2DEVREL(width))) / 2.0;
-    width = (int)w;
-  }
-  
-  GdkLineStyle lineStyle = GDK_LINE_SOLID;
-  switch (m_pen.GetStyle())
-  {
-    case wxSOLID:      { lineStyle = GDK_LINE_SOLID;       break; };
-    case wxDOT:        { lineStyle = GDK_LINE_ON_OFF_DASH; break; };
-    case wxLONG_DASH:  { lineStyle = GDK_LINE_ON_OFF_DASH; break; };
-    case wxSHORT_DASH: { lineStyle = GDK_LINE_ON_OFF_DASH; break; };
-    case wxDOT_DASH:   { lineStyle = GDK_LINE_DOUBLE_DASH; break; };
-  };
-  
-  GdkCapStyle capStyle = GDK_CAP_ROUND;
-  switch (m_pen.GetCap())
-  {
-    case wxCAP_ROUND:      { capStyle = (width <= 1) ? GDK_CAP_NOT_LAST : GDK_CAP_ROUND; break; };
-    case wxCAP_PROJECTING: { capStyle = GDK_CAP_PROJECTING; break; };
-    case wxCAP_BUTT:       { capStyle = GDK_CAP_BUTT;       break; };
-  };
-  
-  GdkJoinStyle joinStyle = GDK_JOIN_ROUND;
-  switch (m_pen.GetJoin())
-  {
-    case wxJOIN_BEVEL: { joinStyle = GDK_JOIN_BEVEL; break; };
-    case wxJOIN_ROUND: { joinStyle = GDK_JOIN_ROUND; break; };
-    case wxJOIN_MITER: { joinStyle = GDK_JOIN_MITER; break; };
-  };
-  
-  gdk_gc_set_line_attributes( m_penGC, width, lineStyle, capStyle, joinStyle );
-  
-  m_pen.GetColour().CalcPixel( m_cmap );
-  gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() );
-};
+    wxCoord xx = XLOG2DEV(x);
+    wxCoord yy = YLOG2DEV(y);
+    wxCoord ww = m_signX * XLOG2DEVREL(width);
+    wxCoord hh = m_signY * YLOG2DEVREL(height);

 
 

-void wxPaintDC::SetBrush( const wxBrush &brush )
-{
-  if (!Ok()) return;
-  
-  if (m_brush == brush) return;
-  
-  m_brush = brush;
-  
-  if (!m_brush.Ok()) return;
-  
-  m_brush.GetColour().CalcPixel( m_cmap );
-  gdk_gc_set_foreground( m_brushGC, m_brush.GetColour().GetColor() );
-  
-  GdkFill fillStyle = GDK_SOLID;
-  switch (m_brush.GetStyle())
-  {
-    case wxSOLID:
-    case wxTRANSPARENT:
-      break;
-    default:
-      fillStyle = GDK_STIPPLED;
-  };
- 
-  gdk_gc_set_fill( m_brushGC, fillStyle );
-  
-  if (m_brush.GetStyle() == wxSTIPPLE)
-  {
-    gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetPixmap() );
-  };
-  
-  if (IS_HATCH(m_brush.GetStyle()))
-  {
-    int num = m_brush.GetStyle() - wxBDIAGONAL_HATCH;
-    gdk_gc_set_stipple( m_brushGC, hatches[num] );
-  };
-};
+    // CMB: handle -ve width and/or height
+    if (ww < 0) { ww = -ww; xx = xx - ww; }
+    if (hh < 0) { hh = -hh; yy = yy - hh; }

 
 

-void wxPaintDC::SetLogicalFunction( int function )
-{
-  if (m_logicalFunction == function) return;
-  GdkFunction mode = GDK_COPY;
-  switch (function)
-  {
-    case wxXOR:    mode = GDK_INVERT; break;
-    case wxINVERT: mode = GDK_INVERT; break;
-    default:       break;
-  };
-  m_logicalFunction = function;
-  gdk_gc_set_function( m_penGC, mode );
-  gdk_gc_set_function( m_brushGC, mode );
-};
+    if (m_window)
+    {
+        if (m_brush.GetStyle() != wxTRANSPARENT)
+        {
+            if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+            {
+                gdk_gc_set_ts_origin( m_textGC,
+                                      m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                      m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+                gdk_draw_arc( m_window, m_textGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
+                gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+            } else
+            if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+            {
+                gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            } else
+            if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+            {
+                gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            } else
+            if (m_brush.GetStyle() == wxSTIPPLE)
+            {
+                gdk_gc_set_ts_origin( m_brushGC,
+                                      m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                      m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            }
+            else
+            {
+                gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
+            }
+        }
+
+        if (m_pen.GetStyle() != wxTRANSPARENT)
+            gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, ww, hh, 0, 360*64 );
+    }

 
 

-void wxPaintDC::SetTextForeground( const wxColour &col )
-{
-  if (!Ok()) return;
-  
-  if (m_textForegroundColour == col) return;
-  
-  m_textForegroundColour = col;
-  if (!m_textForegroundColour.Ok()) return;
-  
-  m_textForegroundColour.CalcPixel( m_cmap );
-  gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
-};
+    CalcBoundingBox( x, y );
+    CalcBoundingBox( x + width, y + height );
+}

 
 

-void wxPaintDC::SetTextBackground( const wxColour &col )
-{
-  if (!Ok()) return;
-  
-  if (m_textBackgroundColour == col) return;
-  
-  m_textBackgroundColour = col;
-  if (!m_textBackgroundColour.Ok()) return;
-  
-  m_textBackgroundColour.CalcPixel( m_cmap );
-  gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
-};
+void wxWindowDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
+{
+    // VZ: egcs 1.0.3 refuses to compile this without cast, no idea why
+    DoDrawBitmap( (const wxBitmap&)icon, x, y, true );
+}

 
 

-void wxPaintDC::SetBackgroundMode( int mode )
+void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
+                               wxCoord x, wxCoord y,
+                               bool useMask )

 {
 {

-  m_backgroundMode = mode;
-};
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    wxCHECK_RET( bitmap.IsOk(), wxT("invalid bitmap") );
+
+    bool is_mono = (bitmap.GetBitmap() != NULL);

 
 

-void wxPaintDC::SetPalette( const wxPalette& WXUNUSED(palette) )
+    // scale/translate size and position
+    int xx = XLOG2DEV(x);
+    int yy = YLOG2DEV(y);
+
+    int w = bitmap.GetWidth();
+    int h = bitmap.GetHeight();
+
+    CalcBoundingBox( x, y );
+    CalcBoundingBox( x + w, y + h );
+
+    if (!m_window) return;
+
+    int ww = XLOG2DEVREL(w);
+    int hh = YLOG2DEVREL(h);
+
+    // compare to current clipping region
+    if (!m_currentClippingRegion.IsNull())
+    {
+        wxRegion tmp( xx,yy,ww,hh );
+        tmp.Intersect( m_currentClippingRegion );
+        if (tmp.IsEmpty())
+            return;
+    }
+
+    // scale bitmap if required
+    wxBitmap use_bitmap = bitmap;
+    if ((w != ww) || (h != hh))
+        use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
+
+    // NB: We can't render pixbufs with GTK+ < 2.2, we need to use pixmaps code.
+    //     Pixbufs-based bitmaps with alpha channel don't have a mask, so we
+    //     have to call GetPixmap() here -- it converts the pixbuf into pixmap
+    //     and also creates the mask as a side-effect:
+    use_bitmap.GetPixmap();
+
+    // apply mask if any
+    GdkBitmap *mask = NULL;
+    if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
+
+    GdkBitmap *new_mask = NULL;
+
+    if (useMask && mask)
+    {
+        if (!m_currentClippingRegion.IsNull())
+        {
+            GdkColor col;
+            new_mask = gdk_pixmap_new( wxGetRootWindow()->window, ww, hh, 1 );
+            GdkGC *gc = gdk_gc_new( new_mask );
+            col.pixel = 0;
+            gdk_gc_set_foreground( gc, &col );
+            gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
+            col.pixel = 0;
+            gdk_gc_set_background( gc, &col );
+            col.pixel = 1;
+            gdk_gc_set_foreground( gc, &col );
+            gdk_gc_set_clip_region( gc, m_currentClippingRegion.GetRegion() );
+            gdk_gc_set_clip_origin( gc, -xx, -yy );
+            gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
+            gdk_gc_set_stipple( gc, mask );
+            gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
+            gdk_gc_unref( gc );
+        }
+
+        if (is_mono)
+        {
+            if (new_mask)
+                gdk_gc_set_clip_mask( m_textGC, new_mask );
+            else
+                gdk_gc_set_clip_mask( m_textGC, mask );
+            gdk_gc_set_clip_origin( m_textGC, xx, yy );
+        }
+        else
+        {
+            if (new_mask)
+                gdk_gc_set_clip_mask( m_penGC, new_mask );
+            else
+                gdk_gc_set_clip_mask( m_penGC, mask );
+            gdk_gc_set_clip_origin( m_penGC, xx, yy );
+        }
+    }
+
+    // Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For
+    // drawing a mono-bitmap (XBitmap) we use the current text GC
+    if (is_mono)
+    {
+        gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), 0, 0, xx, yy, -1, -1 );
+    }
+    else
+    {
+        gdk_draw_pixmap(m_window, m_penGC,
+                        use_bitmap.GetPixmap(),
+                        0, 0, xx, yy, -1, -1);
+    }
+
+    // remove mask again if any
+    if (useMask && mask)
+    {
+        if (is_mono)
+        {
+            gdk_gc_set_clip_mask( m_textGC, NULL );
+            gdk_gc_set_clip_origin( m_textGC, 0, 0 );
+            if (!m_currentClippingRegion.IsNull())
+                gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
+        }
+        else
+        {
+            gdk_gc_set_clip_mask( m_penGC, NULL );
+            gdk_gc_set_clip_origin( m_penGC, 0, 0 );
+            if (!m_currentClippingRegion.IsNull())
+                gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
+        }
+    }
+
+    if (new_mask)
+        gdk_bitmap_unref( new_mask );
+}
+
+bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
+                             wxCoord width, wxCoord height,
+                             wxDC *source,
+                             wxCoord xsrc, wxCoord ysrc,
+                             wxRasterOperationMode logical_func,
+                             bool useMask,
+                             wxCoord xsrcMask, wxCoord ysrcMask )

 {
 {

-};
+    wxCHECK_MSG( IsOk(), false, wxT("invalid window dc") );

 
 

-void wxPaintDC::SetClippingRegion( long x, long y, long width, long height )
-{
-  wxDC::SetClippingRegion( x, y, width, height );
-  
-  GdkRectangle rect;
-  rect.x = XLOG2DEV(x);
-  rect.y = YLOG2DEV(y);
-  rect.width = XLOG2DEV(x+width);
-  rect.height = YLOG2DEV(y+height);
-  gdk_gc_set_clip_rectangle( m_penGC, &rect );
-  gdk_gc_set_clip_rectangle( m_brushGC, &rect );
-  gdk_gc_set_clip_rectangle( m_textGC, &rect );
-  gdk_gc_set_clip_rectangle( m_bgGC, &rect );
-  
-};
+    wxCHECK_MSG( source, false, wxT("invalid source dc") );
+
+    if (!m_window) return false;
+
+    // transform the source DC coords to the device ones
+    xsrc = source->LogicalToDeviceX(xsrc);
+    ysrc = source->LogicalToDeviceY(ysrc);
+
+    wxWindowDCImpl *srcDC = wxDynamicCast(source->GetImpl(), wxWindowDCImpl);
+    wxCHECK_MSG( srcDC, false, "source must be a window DC" );
+
+    // FIXME: this cast is not always valid, see the code using m_isMemDC
+    wxMemoryDCImpl *memDC = static_cast<wxMemoryDCImpl *>(srcDC);
+
+    bool use_bitmap_method = false;
+    bool is_mono = false;
+
+    if (xsrcMask == -1 && ysrcMask == -1)
+    {
+        xsrcMask = xsrc;
+        ysrcMask = ysrc;
+    }
+
+    if (srcDC->m_isMemDC)
+    {
+        if (!memDC->m_selected.IsOk()) return false;
+
+        is_mono = (memDC->m_selected.GetDepth() == 1);
+
+        // we use the "XCopyArea" way to copy a memory dc into
+        // a different window if the memory dc BOTH
+        // a) doesn't have any mask or its mask isn't used
+        // b) it is clipped
+        // c) is not 1-bit
+
+        if (useMask && (memDC->m_selected.GetMask()))
+        {
+            // we HAVE TO use the direct way for memory dcs
+            // that have mask since the XCopyArea doesn't know
+            // about masks
+            use_bitmap_method = true;
+        }
+        else if (is_mono)
+        {
+            // we HAVE TO use the direct way for memory dcs
+            // that are bitmaps because XCopyArea doesn't cope
+            // with different bit depths
+            use_bitmap_method = true;
+        }
+        else if ((xsrc == 0) && (ysrc == 0) &&
+                 (width == memDC->m_selected.GetWidth()) &&
+                 (height == memDC->m_selected.GetHeight()))
+        {
+            // we SHOULD use the direct way if all of the bitmap
+            // in the memory dc is copied in which case XCopyArea
+            // wouldn't be able able to boost performace by reducing
+            // the area to be scaled
+            use_bitmap_method = true;
+        }
+        else
+        {
+            use_bitmap_method = false;
+        }
+    }
+
+    CalcBoundingBox( xdest, ydest );
+    CalcBoundingBox( xdest + width, ydest + height );
+
+    // scale/translate size and position
+    wxCoord xx = XLOG2DEV(xdest);
+    wxCoord yy = YLOG2DEV(ydest);
+
+    wxCoord ww = XLOG2DEVREL(width);
+    wxCoord hh = YLOG2DEVREL(height);
+
+    // compare to current clipping region
+    if (!m_currentClippingRegion.IsNull())
+    {
+        wxRegion tmp( xx,yy,ww,hh );
+        tmp.Intersect( m_currentClippingRegion );
+        if (tmp.IsEmpty())
+            return true;
+    }
+
+    wxRasterOperationMode old_logical_func = m_logicalFunction;
+    SetLogicalFunction( logical_func );
+
+    if (use_bitmap_method)
+    {
+        // scale/translate bitmap size
+        wxCoord bm_width = memDC->m_selected.GetWidth();
+        wxCoord bm_height = memDC->m_selected.GetHeight();
+
+        // Get clip coords for the bitmap. If we don't
+        // use wxBitmap::Rescale(), which can clip the
+        // bitmap, these are the same as the original
+        // coordinates
+        wxCoord cx = xx;
+        wxCoord cy = yy;
+        wxCoord cw = ww;
+        wxCoord ch = hh;
+
+        // interpret userscale of src too
+        double xsc,ysc;
+        memDC->GetUserScale(&xsc,&ysc);
+        bm_width = (int) (bm_width / xsc);
+        bm_height = (int) (bm_height / ysc);
+
+        wxCoord bm_ww = XLOG2DEVREL( bm_width );
+        wxCoord bm_hh = YLOG2DEVREL( bm_height );
+
+        // Scale bitmap if required
+        wxBitmap use_bitmap;
+        if ((memDC->m_selected.GetWidth()!= bm_ww) || ( memDC->m_selected.GetHeight()!= bm_hh))
+        {
+            // This indicates that the blitting code below will get
+            // a clipped bitmap and therefore needs to move the origin
+            // accordingly
+            wxRegion tmp( xx,yy,ww,hh );
+            tmp.Intersect( m_currentClippingRegion );
+            tmp.GetBox(cx,cy,cw,ch);
+
+            // Scale and clipped bitmap
+            use_bitmap = memDC->m_selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
+        }
+        else
+        {
+            // Don't scale bitmap
+            use_bitmap = memDC->m_selected;
+        }
+
+        // apply mask if any
+        GdkBitmap *mask = NULL;
+        if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
+
+        GdkBitmap *new_mask = NULL;
+
+        if (useMask && mask)
+        {
+            if (!m_currentClippingRegion.IsNull())
+            {
+                GdkColor col;
+                new_mask = gdk_pixmap_new( wxGetRootWindow()->window, bm_ww, bm_hh, 1 );
+                GdkGC *gc = gdk_gc_new( new_mask );
+                col.pixel = 0;
+                gdk_gc_set_foreground( gc, &col );
+                gdk_gc_set_ts_origin( gc, -xsrcMask, -ysrcMask);
+                gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
+                col.pixel = 0;
+                gdk_gc_set_background( gc, &col );
+                col.pixel = 1;
+                gdk_gc_set_foreground( gc, &col );
+                gdk_gc_set_clip_region( gc, m_currentClippingRegion.GetRegion() );
+                // was: gdk_gc_set_clip_origin( gc, -xx, -yy );
+                gdk_gc_set_clip_origin( gc, -cx, -cy );
+                gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
+                gdk_gc_set_stipple( gc, mask );
+                gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
+                gdk_gc_unref( gc );
+            }
+
+            if (is_mono)
+            {
+                if (new_mask)
+                {
+                    gdk_gc_set_clip_mask( m_textGC, new_mask );
+                    gdk_gc_set_clip_origin( m_textGC, cx, cy );
+                }
+                else
+                {
+                    gdk_gc_set_clip_mask( m_textGC, mask );
+                    gdk_gc_set_clip_origin( m_textGC, cx-xsrcMask, cy-ysrcMask );
+                }
+            }
+            else
+            {
+                if (new_mask)
+                {
+                    gdk_gc_set_clip_mask( m_penGC, new_mask );
+                    gdk_gc_set_clip_origin( m_penGC, cx, cy );
+                }
+                else
+                {
+                    gdk_gc_set_clip_mask( m_penGC, mask );
+                    gdk_gc_set_clip_origin( m_penGC, cx-xsrcMask, cy-ysrcMask );
+                }
+            }
+        }
+
+        // Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For
+        // drawing a mono-bitmap (XBitmap) we use the current text GC
+
+        if (is_mono)
+        {
+            // was: gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), xsrc, ysrc, xx, yy, ww, hh );
+            gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), xsrc, ysrc, cx, cy, cw, ch );
+        }
+        else
+        {
+            // was: gdk_draw_pixmap( m_window, m_penGC, use_bitmap.GetPixmap(), xsrc, ysrc, xx, yy, ww, hh );
+            gdk_draw_pixmap( m_window, m_penGC, use_bitmap.GetPixmap(), xsrc, ysrc, cx, cy, cw, ch );
+        }
+
+        // remove mask again if any
+        if (useMask && mask)
+        {
+            if (is_mono)
+            {
+                gdk_gc_set_clip_mask( m_textGC, NULL );
+                gdk_gc_set_clip_origin( m_textGC, 0, 0 );
+                if (!m_currentClippingRegion.IsNull())
+                    gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
+            }
+            else
+            {
+                gdk_gc_set_clip_mask( m_penGC, NULL );
+                gdk_gc_set_clip_origin( m_penGC, 0, 0 );
+                if (!m_currentClippingRegion.IsNull())
+                    gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
+            }
+        }
+
+        if (new_mask)
+            gdk_bitmap_unref( new_mask );
+    }
+    else // use_bitmap_method
+    {
+        if ((width != ww) || (height != hh))
+        {
+            // get clip coords
+            wxRegion tmp( xx,yy,ww,hh );
+            tmp.Intersect( m_currentClippingRegion );
+            wxCoord cx,cy,cw,ch;
+            tmp.GetBox(cx,cy,cw,ch);
+
+            // rescale bitmap
+            wxBitmap bitmap = memDC->m_selected.Rescale( cx-xx, cy-yy, cw, ch, ww, hh );
+
+            // draw scaled bitmap
+            // was: gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
+            gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, cx, cy, -1, -1 );
+        }
+        else
+        {
+            // No scaling and not a memory dc with a mask either
+
+            // copy including child window contents
+            gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
+            gdk_window_copy_area( m_window, m_penGC, xx, yy,
+                                  srcDC->GetWindow(),
+                                  xsrc, ysrc, width, height );
+            gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
+        }
+    }
+
+    SetLogicalFunction( old_logical_func );

 
 

-void wxPaintDC::DestroyClippingRegion(void)
+    return true;
+}
+
+void wxWindowDCImpl::DoDrawText( const wxString &text, wxCoord x, wxCoord y )

 {
 {

-  wxDC::DestroyClippingRegion();
-  
-  gdk_gc_set_clip_rectangle( m_penGC, NULL );
-  gdk_gc_set_clip_rectangle( m_brushGC, NULL );
-  gdk_gc_set_clip_rectangle( m_textGC, NULL );
-  gdk_gc_set_clip_rectangle( m_bgGC, NULL );
-};
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
 

-void wxPaintDC::SetUpDC(void)
-{
-  m_ok = TRUE;
-  m_logicalFunction = wxCOPY;
-  m_penGC = gdk_gc_new( m_window );
-  m_brushGC = gdk_gc_new( m_window );
-  m_textGC = gdk_gc_new( m_window );
-  m_bgGC = gdk_gc_new( m_window );
-  SetTextForeground( m_textForegroundColour );
-  SetTextBackground( m_textBackgroundColour );
-  SetPen( m_pen );
-  SetFont( m_font );
-  SetBrush( m_brush );
-  
-  gdk_gc_set_background( m_penGC, wxWHITE->GetColor() );
-  
-  if (!hatch_bitmap) 
-  {
-    hatch_bitmap    = hatches;
-    hatch_bitmap[0] = gdk_bitmap_create_from_data( NULL, bdiag_bits, bdiag_width, bdiag_height );
-    hatch_bitmap[1] = gdk_bitmap_create_from_data( NULL, cdiag_bits, cdiag_width, cdiag_height );
-    hatch_bitmap[2] = gdk_bitmap_create_from_data( NULL, fdiag_bits, fdiag_width, fdiag_height );
-    hatch_bitmap[3] = gdk_bitmap_create_from_data( NULL, cross_bits, cross_width, cross_height );
-    hatch_bitmap[4] = gdk_bitmap_create_from_data( NULL, horiz_bits, horiz_width, horiz_height );
-    hatch_bitmap[5] = gdk_bitmap_create_from_data( NULL, verti_bits, verti_width, verti_height );
-  };
-};
+    if (!m_window) return;
+
+    if (text.empty()) return;
+
+    GdkFont *font = m_font.GetInternalFont( m_scaleY );
+
+    wxCHECK_RET( font, wxT("invalid font") );
+
+    x = XLOG2DEV(x);
+    y = YLOG2DEV(y);
+
+    wxCoord width = gdk_string_width( font, text.mbc_str() );
+    wxCoord height = font->ascent + font->descent;
+
+    if ( m_backgroundMode == wxSOLID )
+    {
+        gdk_gc_set_foreground( m_textGC, m_textBackgroundColour.GetColor() );
+        gdk_draw_rectangle( m_window, m_textGC, TRUE, x, y, width, height );
+        gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
+    }
+    gdk_draw_string( m_window, font, m_textGC, x, y + font->ascent, text.mbc_str() );
+
+    /* CMB 17/7/98: simple underline: ignores scaling and underlying
+       X font's XA_UNDERLINE_POSITION and XA_UNDERLINE_THICKNESS
+       properties (see wxXt implementation) */
+    if (m_font.GetUnderlined())
+    {
+        wxCoord ul_y = y + font->ascent;
+        if (font->descent > 0) ul_y++;
+        gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
+    }

 
 

-GdkWindow *wxPaintDC::GetWindow(void)
+    width = wxCoord(width / m_scaleX);
+    height = wxCoord(height / m_scaleY);
+    CalcBoundingBox (x + width, y + height);
+    CalcBoundingBox (x, y);
+}
+
+
+// TODO: There is an example of rotating text with GTK2 that would probably be
+// a better approach here:
+//           http://www.daa.com.au/pipermail/pygtk/2003-April/005052.html
+
+void wxWindowDCImpl::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )

 {
 {

-  return m_window;
-};
+    if ( wxIsNullDouble(angle) )
+    {
+        DoDrawText(text, x, y);
+        return;
+    }
+
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if (!m_window) return;
+
+    wxCoord w;
+    wxCoord h;
+
+    GdkFont *font = m_font.GetInternalFont( m_scaleY );
+
+    wxCHECK_RET( font, wxT("invalid font") );
+
+    // the size of the text
+    w = gdk_string_width( font, text.mbc_str() );
+    h = font->ascent + font->descent;
+
+    // draw the string normally
+    wxBitmap src(w, h);
+    wxMemoryDC dc;
+    dc.SelectObject(src);
+    dc.SetFont(GetFont());
+    dc.SetBackground(*wxBLACK_BRUSH);
+    dc.SetBrush(*wxBLACK_BRUSH);
+    dc.Clear();
+    dc.SetTextForeground( *wxWHITE );
+    dc.DrawText(text, 0, 0);
+    dc.SelectObject(wxNullBitmap);
+
+    // Calculate the size of the rotated bounding box.
+    double rad = DegToRad(angle);
+    double dx = cos(rad),
+           dy = sin(rad);
+
+    // the rectngle vertices are counted clockwise with the first one being at
+    // (0, 0) (or, rather, at (x, y))
+    double x2 = w*dx,
+           y2 = -w*dy;      // y axis points to the bottom, hence minus
+    double x4 = h*dy,
+           y4 = h*dx;
+    double x3 = x4 + x2,
+           y3 = y4 + y2;
+
+    // calc max and min
+    wxCoord maxX = (wxCoord)(dmax(x2, dmax(x3, x4)) + 0.5),
+            maxY = (wxCoord)(dmax(y2, dmax(y3, y4)) + 0.5),
+            minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5),
+            minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
+
+
+    wxImage image = src.ConvertToImage();
+
+    image.ConvertColourToAlpha( m_textForegroundColour.Red(),
+                                m_textForegroundColour.Green(),
+                                m_textForegroundColour.Blue() );
+    image = image.Rotate( rad, wxPoint(0,0) );
+
+    int i_angle = (int) angle;
+    i_angle = i_angle % 360;
+    if (i_angle < 0)
+        i_angle += 360;
+    int xoffset = 0;
+    if ((i_angle >= 90.0) && (i_angle < 270.0))
+        xoffset = image.GetWidth();
+    int yoffset = 0;
+    if ((i_angle >= 0.0) && (i_angle < 180.0))
+        yoffset = image.GetHeight();
+
+    if ((i_angle >= 0) && (i_angle < 90))
+        yoffset -= (int)( cos(rad)*h );
+    if ((i_angle >= 90) && (i_angle < 180))
+        xoffset -= (int)( sin(rad)*h );
+    if ((i_angle >= 180) && (i_angle < 270))
+        yoffset -= (int)( cos(rad)*h );
+    if ((i_angle >= 270) && (i_angle < 360))
+        xoffset -= (int)( sin(rad)*h );
+
+    int i_x = x - xoffset;
+    int i_y = y - yoffset;
+
+    src = image;
+    DoDrawBitmap( src, i_x, i_y, true );
+
+
+    // it would be better to draw with non underlined font and draw the line
+    // manually here (it would be more straight...)
+#if 0
+    if ( m_font.GetUnderlined() )
+    {
+        gdk_draw_line( m_window, m_textGC,
+                       XLOG2DEV(x + x4), YLOG2DEV(y + y4 + font->descent),
+                       XLOG2DEV(x + x3), YLOG2DEV(y + y3 + font->descent));
+    }
+#endif // 0
+
+    // update the bounding box
+    CalcBoundingBox(x + minX, y + minY);
+    CalcBoundingBox(x + maxX, y + maxY);
+}
+
+void wxWindowDCImpl::DoGetTextExtent(const wxString &string,
+                                 wxCoord *width, wxCoord *height,
+                                 wxCoord *descent, wxCoord *externalLeading,
+                                 const wxFont *theFont) const
+{
+    if ( width )
+        *width = 0;
+    if ( height )
+        *height = 0;
+    if ( descent )
+        *descent = 0;
+    if ( externalLeading )
+        *externalLeading = 0;
+
+    if (string.empty())
+    {
+        return;
+    }

 
 

-// ----------------------------------- spline code ----------------------------------------
+    wxFont fontToUse = m_font;
+    if (theFont)
+        fontToUse = *theFont;

 
 

-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);
+    GdkFont *font = fontToUse.GetInternalFont( m_scaleY );
+    if ( !font )
+        return;

 
 

-wxList wx_spline_point_list;
+    if (width)
+        *width = wxCoord(gdk_string_width( font, string.mbc_str() ) / m_scaleX);
+    if (height)
+        *height = wxCoord((font->ascent + font->descent) / m_scaleY);
+    if (descent)
+        *descent = wxCoord(font->descent / m_scaleY);
+}

 
 

-#define                half(z1, z2)    ((z1+z2)/2.0)
-#define                THRESHOLD       5
+wxCoord wxWindowDCImpl::GetCharWidth() const
+{
+    GdkFont *font = m_font.GetInternalFont( m_scaleY );
+    wxCHECK_MSG( font, -1, wxT("invalid font") );

 
 

-/* iterative version */
+    return wxCoord(gdk_string_width( font, "H" ) / m_scaleX);
+}

 
 

-void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4,
-                 double b4)
+wxCoord wxWindowDCImpl::GetCharHeight() const

 {
 {

-    register double  xmid, ymid;
-    double           x1, y1, x2, y2, x3, y3, x4, y4;
+    GdkFont *font = m_font.GetInternalFont( m_scaleY );
+    wxCHECK_MSG( font, -1, wxT("invalid font") );

 
 

-    wx_clear_stack();
-    wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);
+    return wxCoord((font->ascent + font->descent) / m_scaleY);
+}

 
 

-    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);
-       }
+void wxWindowDCImpl::Clear()
+{
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if (!m_window) return;
+
+    // VZ: the code below results in infinite recursion and crashes when
+    //     dc.Clear() is done from OnPaint() so I disable it for now.
+    //     I don't know what the correct fix is but Clear() surely should not
+    //     reenter OnPaint()!
+#if 0
+    /* - we either are a memory dc or have a window as the
+       owner. anything else shouldn't happen.
+       - we don't use gdk_window_clear() as we don't set
+       the window's background colour anymore. it is too
+       much pain to keep the DC's and the window's back-
+       ground colour in synch. */
+
+    if (m_owner)
+    {
+        m_owner->Clear();
+        return;

     }
     }

+
+    if (m_isMemDC)
+    {
+        int width,height;
+        GetSize( &width, &height );
+        gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
+        return;
+    }
+#else // 1
+    int width,height;
+    GetSize( &width, &height );
+    gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
+#endif // 0/1

 }
 
 }
 

-/* utilities used by spline drawing routines */
+void wxWindowDCImpl::SetFont( const wxFont &font )
+{
+    m_font = font;
+}
+
+void wxWindowDCImpl::SetPen( const wxPen &pen )
+{
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if (m_pen == pen) return;
+
+    m_pen = pen;
+
+    if (!m_pen.IsOk()) return;
+
+    if (!m_window) return;

 
 

-typedef struct wx_spline_stack_struct {
-    double           x1, y1, x2, y2, x3, y3, x4, y4;
-} Stack;
+    gint width = m_pen.GetWidth();
+    if (width <= 0)
+    {
+        // CMB: if width is non-zero scale it with the dc
+        width = 1;
+    }
+    else
+    {
+        // X doesn't allow different width in x and y and so we take
+        // the average
+        double w = 0.5 +
+                   ( fabs((double) XLOG2DEVREL(width)) +
+                     fabs((double) YLOG2DEVREL(width)) ) / 2.0;
+        width = (int)w;
+        if ( !width )
+        {
+            // width can't be 0 or an internal GTK error occurs inside
+            // gdk_gc_set_dashes() below
+            width = 1;
+        }
+    }

 
 

-#define         SPLINE_STACK_DEPTH             20
-static Stack    wx_spline_stack[SPLINE_STACK_DEPTH];
-static Stack   *wx_stack_top;
-static int      wx_stack_count;
+    static const wxGTKDash dotted[] = {1, 1};
+    static const wxGTKDash short_dashed[] = {2, 2};
+    static const wxGTKDash wxCoord_dashed[] = {2, 4};
+    static const wxGTKDash dotted_dashed[] = {3, 3, 1, 3};
+
+    // We express dash pattern in pen width unit, so we are
+    // independent of zoom factor and so on...
+    int req_nb_dash;
+    const wxGTKDash *req_dash;
+
+    GdkLineStyle lineStyle = GDK_LINE_SOLID;
+    switch (m_pen.GetStyle())
+    {
+        case wxUSER_DASH:
+        {
+            lineStyle = GDK_LINE_ON_OFF_DASH;
+            req_nb_dash = m_pen.GetDashCount();
+            req_dash = (wxGTKDash*)m_pen.GetDash();
+            break;
+        }
+        case wxDOT:
+        {
+            lineStyle = GDK_LINE_ON_OFF_DASH;
+            req_nb_dash = 2;
+            req_dash = dotted;
+            break;
+        }
+        case wxLONG_DASH:
+        {
+            lineStyle = GDK_LINE_ON_OFF_DASH;
+            req_nb_dash = 2;
+            req_dash = wxCoord_dashed;
+            break;
+        }
+        case wxSHORT_DASH:
+        {
+            lineStyle = GDK_LINE_ON_OFF_DASH;
+            req_nb_dash = 2;
+            req_dash = short_dashed;
+            break;
+        }
+        case wxDOT_DASH:
+        {
+//            lineStyle = GDK_LINE_DOUBLE_DASH;
+            lineStyle = GDK_LINE_ON_OFF_DASH;
+            req_nb_dash = 4;
+            req_dash = dotted_dashed;
+            break;
+        }
+
+        case wxTRANSPARENT:
+        case wxSTIPPLE_MASK_OPAQUE:
+        case wxSTIPPLE:
+        case wxSOLID:
+        default:
+        {
+            lineStyle = GDK_LINE_SOLID;
+            req_dash = NULL;
+            req_nb_dash = 0;
+            break;
+        }
+    }
+
+    if (req_dash && req_nb_dash)
+    {
+        wxGTKDash *real_req_dash = new wxGTKDash[req_nb_dash];
+        if (real_req_dash)
+        {
+            for (int i = 0; i < req_nb_dash; i++)
+                real_req_dash[i] = req_dash[i] * width;
+            gdk_gc_set_dashes( m_penGC, 0, real_req_dash, req_nb_dash );
+            delete[] real_req_dash;
+        }
+        else
+        {
+            // No Memory. We use non-scaled dash pattern...
+            gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash );
+        }
+    }

 
 

-void wx_clear_stack(void)
+    GdkCapStyle capStyle = GDK_CAP_ROUND;
+    switch (m_pen.GetCap())
+    {
+        case wxCAP_PROJECTING: { capStyle = GDK_CAP_PROJECTING; break; }
+        case wxCAP_BUTT:       { capStyle = GDK_CAP_BUTT;       break; }
+        case wxCAP_ROUND:
+        default:
+        {
+            if (width <= 1)
+            {
+                width = 0;
+                capStyle = GDK_CAP_NOT_LAST;
+            }
+            else
+            {
+                capStyle = GDK_CAP_ROUND;
+            }
+            break;
+        }
+    }
+
+    GdkJoinStyle joinStyle = GDK_JOIN_ROUND;
+    switch (m_pen.GetJoin())
+    {
+        case wxJOIN_BEVEL: { joinStyle = GDK_JOIN_BEVEL; break; }
+        case wxJOIN_MITER: { joinStyle = GDK_JOIN_MITER; break; }
+        case wxJOIN_ROUND:
+        default:           { joinStyle = GDK_JOIN_ROUND; break; }
+    }
+
+    gdk_gc_set_line_attributes( m_penGC, width, lineStyle, capStyle, joinStyle );
+
+    m_pen.GetColour().CalcPixel( m_cmap );
+    gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() );
+}
+
+void wxWindowDCImpl::SetBrush( const wxBrush &brush )

 {
 {

-    wx_stack_top = wx_spline_stack;
-    wx_stack_count = 0;
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if (m_brush == brush) return;
+
+    m_brush = brush;
+
+    if (!m_brush.IsOk()) return;
+
+    if (!m_window) return;
+
+    m_brush.GetColour().CalcPixel( m_cmap );
+    gdk_gc_set_foreground( m_brushGC, m_brush.GetColour().GetColor() );
+
+    gdk_gc_set_fill( m_brushGC, GDK_SOLID );
+
+    if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->IsOk()))
+    {
+        if (m_brush.GetStipple()->GetPixmap())
+        {
+            gdk_gc_set_fill( m_brushGC, GDK_TILED );
+            gdk_gc_set_tile( m_brushGC, m_brush.GetStipple()->GetPixmap() );
+        }
+        else
+        {
+            gdk_gc_set_fill( m_brushGC, GDK_STIPPLED );
+            gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetBitmap() );
+        }
+    }
+
+    if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+    {
+        gdk_gc_set_fill( m_textGC, GDK_OPAQUE_STIPPLED);
+        gdk_gc_set_stipple( m_textGC, m_brush.GetStipple()->GetMask()->GetBitmap() );
+    }
+
+    if (m_brush.IsHatch())
+    {
+        gdk_gc_set_fill( m_brushGC, GDK_STIPPLED );
+        int num = m_brush.GetStyle() - wxBDIAGONAL_HATCH;
+        gdk_gc_set_stipple( m_brushGC, hatches[num] );
+    }

 }
 
 }
 

-void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
+void wxWindowDCImpl::SetBackground( const wxBrush &brush )

 {
 {

-    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++;
+   /* CMB 21/7/98: Added SetBackground. Sets background brush
+    * for Clear() and bg colour for shapes filled with cross-hatch brush */
+
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if (m_backgroundBrush == brush) return;
+
+    m_backgroundBrush = brush;
+
+    if (!m_backgroundBrush.IsOk()) return;
+
+    if (!m_window) return;
+
+    m_backgroundBrush.GetColour().CalcPixel( m_cmap );
+    gdk_gc_set_background( m_brushGC, m_backgroundBrush.GetColour().GetColor() );
+    gdk_gc_set_background( m_penGC, m_backgroundBrush.GetColour().GetColor() );
+    gdk_gc_set_background( m_bgGC, m_backgroundBrush.GetColour().GetColor() );
+    gdk_gc_set_foreground( m_bgGC, m_backgroundBrush.GetColour().GetColor() );
+
+    gdk_gc_set_fill( m_bgGC, GDK_SOLID );
+
+    if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->IsOk()))
+    {
+        if (m_backgroundBrush.GetStipple()->GetPixmap())
+        {
+            gdk_gc_set_fill( m_bgGC, GDK_TILED );
+            gdk_gc_set_tile( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );
+        }
+        else
+        {
+            gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );
+            gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetBitmap() );
+        }
+    }
+
+    if (m_backgroundBrush.IsHatch())
+    {
+        gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );
+        int num = m_backgroundBrush.GetStyle() - wxBDIAGONAL_HATCH;
+        gdk_gc_set_stipple( m_bgGC, hatches[num] );
+    }

 }
 
 }
 

-int wx_spline_pop(double *x1, double *y1, double *x2, double *y2,
-                  double *x3, double *y3, double *x4, double *y4)
+void wxWindowDCImpl::SetLogicalFunction( wxRasterOperationMode function )

 {
 {

-    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);
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if (m_logicalFunction == function)
+        return;
+
+    // VZ: shouldn't this be a CHECK?
+    if (!m_window)
+        return;
+
+    GdkFunction mode;
+    switch (function)
+    {
+        case wxXOR:          mode = GDK_XOR;           break;
+        case wxINVERT:       mode = GDK_INVERT;        break;
+        case wxOR_REVERSE:   mode = GDK_OR_REVERSE;    break;
+        case wxAND_REVERSE:  mode = GDK_AND_REVERSE;   break;
+        case wxCLEAR:        mode = GDK_CLEAR;         break;
+        case wxSET:          mode = GDK_SET;           break;
+        case wxOR_INVERT:    mode = GDK_OR_INVERT;     break;
+        case wxAND:          mode = GDK_AND;           break;
+        case wxOR:           mode = GDK_OR;            break;
+        case wxEQUIV:        mode = GDK_EQUIV;         break;
+        case wxNAND:         mode = GDK_NAND;          break;
+        case wxAND_INVERT:   mode = GDK_AND_INVERT;    break;
+        case wxCOPY:         mode = GDK_COPY;          break;
+        case wxNO_OP:        mode = GDK_NOOP;          break;
+        case wxSRC_INVERT:   mode = GDK_COPY_INVERT;   break;
+
+        // unsupported by GTK
+        case wxNOR:          mode = GDK_COPY;          break;
+        default:
+           wxFAIL_MSG( wxT("unsupported logical function") );
+           mode = GDK_COPY;
+    }
+
+    m_logicalFunction = function;
+
+    gdk_gc_set_function( m_penGC, mode );
+    gdk_gc_set_function( m_brushGC, mode );
+
+    // to stay compatible with wxMSW, we don't apply ROPs to the text
+    // operations (i.e. DrawText/DrawRotatedText).
+    // True, but mono-bitmaps use the m_textGC and they use ROPs as well.
+    gdk_gc_set_function( m_textGC, mode );

 }
 
 }
 

-static bool wx_spline_add_point(double x, double y)
+void wxWindowDCImpl::SetTextForeground( const wxColour &col )

 {
 {

-  wxPoint *point = new wxPoint ;
-  point->x = (int) x;
-  point->y = (int) y;
-  wx_spline_point_list.Append((wxObject*)point);
-  return TRUE;
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    // don't set m_textForegroundColour to an invalid colour as we'd crash
+    // later then (we use m_textForegroundColour.GetColor() without checking
+    // in a few places)
+    if ( !col.IsOk() || (m_textForegroundColour == col) )
+        return;
+
+    m_textForegroundColour = col;
+
+    if ( m_window )
+    {
+        m_textForegroundColour.CalcPixel( m_cmap );
+        gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
+    }

 }
 
 }
 

-static void wx_spline_draw_point_array(wxDC *dc)
+void wxWindowDCImpl::SetTextBackground( const wxColour &col )

 {
 {

-  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();
-  }
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    // same as above
+    if ( !col.IsOk() || (m_textBackgroundColour == col) )
+        return;
+
+    m_textBackgroundColour = col;
+
+    if ( m_window )
+    {
+        m_textBackgroundColour.CalcPixel( m_cmap );
+        gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
+    }

 }
 
 }
 

-void wxPaintDC::DrawOpenSpline( wxList *points )
+void wxWindowDCImpl::SetBackgroundMode( int mode )

 {
 {

-    wxPoint *p;
-    double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
-    double           x1, y1, x2, y2;
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
 

-    wxNode *node = points->First();
-    p = (wxPoint *)node->Data();
+    m_backgroundMode = mode;

 
 

-    x1 = p->x;
-    y1 = p->y;
+    if (!m_window) return;

 
 

-    node = node->Next();
-    p = (wxPoint *)node->Data();
+    // CMB 21/7/98: fill style of cross-hatch brushes is affected by
+    // transparent/solid background mode

 
 

-    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 (m_brush.GetStyle() != wxSOLID && m_brush.GetStyle() != wxTRANSPARENT)
+    {
+        gdk_gc_set_fill( m_brushGC,
+          (m_backgroundMode == wxTRANSPARENT) ? GDK_STIPPLED : GDK_OPAQUE_STIPPLED);
+    }
+}

 
 

-    wx_spline_add_point(x1, y1);
+void wxWindowDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) )
+{
+    wxFAIL_MSG( wxT("wxWindowDCImpl::SetPalette not implemented") );
+}
+
+void wxWindowDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+{
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if (!m_window) return;
+
+    wxRect rect;
+    rect.x = XLOG2DEV(x);
+    rect.y = YLOG2DEV(y);
+    rect.width = XLOG2DEVREL(width);
+    rect.height = YLOG2DEVREL(height);
+
+    if (!m_currentClippingRegion.IsNull())
+        m_currentClippingRegion.Intersect( rect );
+    else
+        m_currentClippingRegion.Union( rect );
+
+#if USE_PAINT_REGION
+    if (!m_paintClippingRegion.IsNull())
+        m_currentClippingRegion.Intersect( m_paintClippingRegion );
+#endif

 
 

-    while ((node = node->Next()) != NULL)
+    wxCoord xx, yy, ww, hh;
+    m_currentClippingRegion.GetBox( xx, yy, ww, hh );
+    wxGTKDCImpl::DoSetClippingRegion( xx, yy, ww, hh );
+
+    gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
+    gdk_gc_set_clip_region( m_brushGC, m_currentClippingRegion.GetRegion() );
+    gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
+    gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
+}
+
+void wxWindowDCImpl::DoSetDeviceClippingRegion( const wxRegion &region  )
+{
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    if (region.Empty())

     {
     {

-        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;
+        DestroyClippingRegion();
+        return;
+    }
+
+    if (!m_window) return;

 
 

-        wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);
+    if (!m_currentClippingRegion.IsNull())
+        m_currentClippingRegion.Intersect( region );
+    else
+        m_currentClippingRegion.Union( region );

 
 

-       cx1 = cx4;
-       cy1 = cy4;
-        cx2 = (double)(cx1 + x2) / 2;
-        cy2 = (double)(cy1 + y2) / 2;
+#if USE_PAINT_REGION
+    if (!m_paintClippingRegion.IsNull())
+        m_currentClippingRegion.Intersect( m_paintClippingRegion );
+#endif
+
+    wxCoord xx, yy, ww, hh;
+    m_currentClippingRegion.GetBox( xx, yy, ww, hh );
+    wxGTKDCImpl::DoSetClippingRegion( xx, yy, ww, hh );
+
+    gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
+    gdk_gc_set_clip_region( m_brushGC, m_currentClippingRegion.GetRegion() );
+    gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
+    gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
+}
+
+void wxWindowDCImpl::DestroyClippingRegion()
+{
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
+
+    wxGTKDCImpl::DestroyClippingRegion();
+
+    m_currentClippingRegion.Clear();
+
+#if USE_PAINT_REGION
+    if (!m_paintClippingRegion.IsEmpty())
+        m_currentClippingRegion.Union( m_paintClippingRegion );
+#endif
+
+    if (!m_window) return;
+
+    if (m_currentClippingRegion.IsEmpty())
+    {
+        gdk_gc_set_clip_rectangle( m_penGC, NULL );
+        gdk_gc_set_clip_rectangle( m_brushGC, NULL );
+        gdk_gc_set_clip_rectangle( m_textGC, NULL );
+        gdk_gc_set_clip_rectangle( m_bgGC, NULL );

     }
     }

+    else
+    {
+        gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
+        gdk_gc_set_clip_region( m_brushGC, m_currentClippingRegion.GetRegion() );
+        gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
+        gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
+    }
+}
+
+void wxWindowDCImpl::Destroy()
+{
+    if (m_penGC) wxFreePoolGC( m_penGC );
+    m_penGC = NULL;
+    if (m_brushGC) wxFreePoolGC( m_brushGC );
+    m_brushGC = NULL;
+    if (m_textGC) wxFreePoolGC( m_textGC );
+    m_textGC = NULL;
+    if (m_bgGC) wxFreePoolGC( m_bgGC );
+    m_bgGC = NULL;
+}
+
+void wxWindowDCImpl::ComputeScaleAndOrigin()
+{
+    const wxRealPoint origScale(m_scaleX, m_scaleY);
+
+    wxGTKDCImpl::ComputeScaleAndOrigin();
+
+    // if scale has changed call SetPen to recalulate the line width
+    if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() )
+    {
+        // this is a bit artificial, but we need to force wxDC to think the pen
+        // has changed
+        wxPen pen = m_pen;
+        m_pen = wxNullPen;
+        SetPen( pen );
+    }
+}
+
+// Resolution in pixels per logical inch
+wxSize wxWindowDCImpl::GetPPI() const
+{
+    return wxSize( (int) (m_mm_to_pix_x * 25.4 + 0.5), (int) (m_mm_to_pix_y * 25.4 + 0.5));
+}
+
+int wxWindowDCImpl::GetDepth() const
+{
+    wxFAIL_MSG(wxT("not implemented"));
+
+    return -1;
+}
+
+
+//-----------------------------------------------------------------------------
+// wxPaintDCImpl
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl)
+
+// Limit the paint region to the window size. Sometimes
+// the paint region is too big, and this risks X11 errors
+static void wxLimitRegionToSize(wxRegion& region, const wxSize& sz)
+{
+    wxRect originalRect = region.GetBox();
+    wxRect rect(originalRect);
+    if (rect.width + rect.x > sz.x)
+        rect.width = sz.x - rect.x;
+    if (rect.height + rect.y > sz.y)
+        rect.height = sz.y - rect.y;
+    if (rect != originalRect)
+    {
+        region = wxRegion(rect);
+        wxLogTrace(wxT("painting"), wxT("Limiting region from %d, %d, %d, %d to %d, %d, %d, %d\n"),
+                   originalRect.x, originalRect.y, originalRect.width, originalRect.height,
+                   rect.x, rect.y, rect.width, rect.height);
+    }
+}

 
 

-    wx_spline_add_point( cx1, cy1 );
-    wx_spline_add_point( x2, y2 );
+wxPaintDCImpl::wxPaintDCImpl(wxDC *owner, wxWindow *win)
+             : wxClientDCImpl(owner, win)
+{
+#if USE_PAINT_REGION
+    if (!win->m_clipPaintRegion)
+        return;
+
+    wxSize sz = win->GetSize();
+    m_paintClippingRegion = win->GetUpdateRegion();
+    wxLimitRegionToSize(m_paintClippingRegion, sz);
+
+    GdkRegion *region = m_paintClippingRegion.GetRegion();
+    if ( region )
+    {
+        m_currentClippingRegion.Union( m_paintClippingRegion );
+        wxLimitRegionToSize(m_currentClippingRegion, sz);
+
+        if (sz.x <= 0 || sz.y <= 0)
+            return ;
+
+        gdk_gc_set_clip_region( m_penGC, region );
+        gdk_gc_set_clip_region( m_brushGC, region );
+        gdk_gc_set_clip_region( m_textGC, region );
+        gdk_gc_set_clip_region( m_bgGC, region );
+    }
+#endif // USE_PAINT_REGION
+}
+
+//-----------------------------------------------------------------------------
+// wxClientDCImpl
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)
+
+wxClientDCImpl::wxClientDCImpl(wxDC *owner, wxWindow *win)
+              : wxWindowDCImpl(owner, win)
+{
+    wxCHECK_RET( win, wxT("NULL window in wxClientDCImpl::wxClientDCImpl") );
+
+#ifdef __WXUNIVERSAL__
+    wxPoint ptOrigin = win->GetClientAreaOrigin();
+    SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
+    wxSize size = win->GetClientSize();
+    SetClippingRegion(wxPoint(0, 0), size);
+#endif // __WXUNIVERSAL__
+}

 
 

-    wx_spline_draw_point_array( this );
+void wxClientDCImpl::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_owner, wxT("GetSize() doesn't work without window") );
+
+    m_owner->GetClientSize( width, height );
+}
+
+// ----------------------------------------------------------------------------
+// wxDCModule
+// ----------------------------------------------------------------------------
+
+class wxDCModule : public wxModule
+{
+public:
+    bool OnInit();
+    void OnExit();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxDCModule)

 };
 };

+
+IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
+
+bool wxDCModule::OnInit()
+{
+    wxInitGCPool();
+    return true;
+}
+
+void wxDCModule::OnExit()
+{
+    wxCleanUpGCPool();
+}