fixed bug/assert failure when refreshing items in non report mode

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

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 17cd0074333090febd5463b143a92abecc0e7db9..dd82f8f8b462fe5e6aa282338e232fd5d73751d9 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1,19 +1,39 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.cpp
+// Name:        gtk/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, Markus Holzem, Chris Breeze
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "dcclient.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "dcclient.h"
 #endif
 

+#ifdef __VMS
+#define XCopyPlane XCOPYPLANE
+#endif
+

 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"

+#include "wx/image.h"
+#include "wx/module.h"
+
+#include "wx/gtk/win_gtk.h"
+
+#include <math.h>               // for floating-point functions
+
+#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,1034 +47,2113 @@
 #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 **hatch_bitmap = (GdkPixmap **) NULL;
 
 static GdkPixmap  *hatches[num_hatches];
 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)
+
+void gdk_wx_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);
+    gint src_width, src_height;
+#ifndef __WXGTK20__
+    GdkWindowPrivate *drawable_private;
+    GdkWindowPrivate *src_private;
+    GdkGCPrivate *gc_private;
+#endif
+
+    g_return_if_fail (drawable != NULL);
+    g_return_if_fail (src != NULL);
+    g_return_if_fail (gc != NULL);
+
+#ifdef __WXGTK20__
+    if (GDK_WINDOW_DESTROYED(drawable) || GDK_WINDOW_DESTROYED(src))
+        return;
+
+    gdk_drawable_get_size(src, &src_width, &src_height);
+#else
+    drawable_private = (GdkWindowPrivate*) drawable;
+    src_private = (GdkWindowPrivate*) src;
+    if (drawable_private->destroyed || src_private->destroyed)
+        return;
+
+    src_width = src_private->width;
+    src_height = src_private->height;
+
+    gc_private = (GdkGCPrivate*) gc;
+#endif
+
+    if (width == -1) width = src_width;
+    if (height == -1) height = src_height;
+
+#ifdef __WXGTK20__
+    XCopyPlane( GDK_WINDOW_XDISPLAY(drawable),
+                GDK_WINDOW_XID(src),
+                GDK_WINDOW_XID(drawable),
+                GDK_GC_XGC(gc),
+                xsrc, ysrc,
+                width, height,
+                xdest, ydest,
+                1 );
+#else
+    XCopyPlane( drawable_private->xdisplay,
+                src_private->xwindow,
+                drawable_private->xwindow,
+                gc_private->xgc,
+                xsrc, ysrc,
+                width, height,
+                xdest, ydest,
+                1 );
+#endif

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

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

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

-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC,wxDC)
+#define GC_POOL_SIZE 200

 
 

-wxPaintDC::wxPaintDC(void)
+enum wxPoolGCType

 {
 {

-  m_penGC = (GdkGC *) NULL;
-  m_brushGC = (GdkGC *) NULL;
-  m_textGC = (GdkGC *) NULL;
-  m_bgGC = (GdkGC *) NULL;
-  m_cmap = (GdkColormap *) NULL;
-  m_isMemDC = FALSE;
-}
+   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
+};
+
+struct wxGC
+{
+    GdkGC        *m_gc;
+    wxPoolGCType  m_type;
+    bool          m_used;
+};
+
+static wxGC wxGCPool[GC_POOL_SIZE];

 
 

-wxPaintDC::wxPaintDC( wxWindow *window )
+static void wxInitGCPool()

 {
 {

-  m_penGC = (GdkGC *) NULL;
-  m_brushGC = (GdkGC *) NULL;
-  m_textGC = (GdkGC *) NULL;
-  m_bgGC = (GdkGC *) NULL;
-  m_cmap = (GdkColormap *) NULL;
-  
-  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 );
-    
-  m_isMemDC = FALSE;
-        
-  SetUpDC();
+    memset( wxGCPool, 0, GC_POOL_SIZE*sizeof(wxGC) );

 }
 
 }
 

-wxPaintDC::~wxPaintDC(void)
+static void wxCleanUpGCPool()

 {
 {

+    for (int i = 0; i < GC_POOL_SIZE; i++)
+    {
+        if (wxGCPool[i].m_gc)
+            gdk_gc_unref( wxGCPool[i].m_gc );
+    }

 }
 
 }
 

-void wxPaintDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1), 
-  wxColour *WXUNUSED(col), int WXUNUSED(style) )
+static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )

 {
 {

-  wxFAIL_MSG( "wxPaintDC::FloodFill not implemented" );
+    for (int i = 0; i < GC_POOL_SIZE; 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;
+        }
+    }
+
+    wxFAIL_MSG( wxT("No GC available") );
+
+    return (GdkGC*) NULL;

 }
 
 }
 

-bool wxPaintDC::GetPixel( long WXUNUSED(x1), long WXUNUSED(y1), wxColour *WXUNUSED(col) ) const
+static void wxFreePoolGC( GdkGC *gc )

 {
 {

-  wxFAIL_MSG( "wxPaintDC::GetPixel not implemented" );
-  return FALSE;
+    for (int i = 0; i < GC_POOL_SIZE; i++)
+    {
+        if (wxGCPool[i].m_gc == gc)
+        {
+            wxGCPool[i].m_used = FALSE;
+            return;
+        }
+    }
+
+    wxFAIL_MSG( wxT("Wrong GC") );

 }
 
 }
 

-void wxPaintDC::DrawLine( long x1, long y1, long x2, long y2 )
+//-----------------------------------------------------------------------------
+// wxWindowDC
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
+
+wxWindowDC::wxWindowDC()

 {
 {

-  if (!Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  if (m_pen.GetStyle() != wxTRANSPARENT)
-  {
-    gdk_draw_line( m_window, m_penGC, 
-      XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2) );
-  }
+    m_penGC = (GdkGC *) NULL;
+    m_brushGC = (GdkGC *) NULL;
+    m_textGC = (GdkGC *) NULL;
+    m_bgGC = (GdkGC *) NULL;
+    m_cmap = (GdkColormap *) NULL;
+    m_isMemDC = FALSE;
+    m_isScreenDC = FALSE;
+    m_owner = (wxWindow *)NULL;
+#ifdef __WXGTK20__
+    m_context = (PangoContext *)NULL;
+    m_fontdesc = (PangoFontDescription *)NULL;
+#endif

 }
 
 }
 

-void wxPaintDC::CrossHair( long x, long y )
+wxWindowDC::wxWindowDC( wxWindow *window )

 {
 {

-  if (!Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  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) );
-  }
+    m_penGC = (GdkGC *) NULL;
+    m_brushGC = (GdkGC *) NULL;
+    m_textGC = (GdkGC *) NULL;
+    m_bgGC = (GdkGC *) NULL;
+    m_cmap = (GdkColormap *) NULL;
+    m_owner = (wxWindow *)NULL;
+    m_isMemDC = FALSE;
+    m_isScreenDC = FALSE;
+    m_font = window->GetFont();
+
+    wxASSERT_MSG( window, wxT("DC needs a window") );
+
+    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;
+    }
+
+    wxASSERT_MSG( widget, wxT("DC needs a widget") );
+
+#ifdef __WXGTK20__
+    m_context = gtk_widget_get_pango_context( widget );
+    m_fontdesc = widget->style->font_desc;
+#endif
+
+    GtkPizza *pizza = GTK_PIZZA( widget );
+    m_window = pizza->bin_window;
+
+    /* not realized ? */
+    if (!m_window)
+    {
+         /* don't report problems */
+         m_ok = TRUE;
+
+         return;
+    }
+
+    m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
+
+    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;

 }
 
 }
 

-void wxPaintDC::DrawArc( long x1, long y1, long x2, long y2, double xc, double yc )
+wxWindowDC::~wxWindowDC()

 {
 {

-  if (!Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  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 );
-  
+    Destroy();

 }
 
 }
 

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

 {
 {

-  if (!Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  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 );
+    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 && (((wxMemoryDC*)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 );
+
+    /* 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, (GdkRectangle *) NULL );
+    gdk_gc_set_clip_rectangle( m_brushGC, (GdkRectangle *) NULL );
+    gdk_gc_set_clip_rectangle( m_textGC, (GdkRectangle *) NULL );
+    gdk_gc_set_clip_rectangle( m_bgGC, (GdkRectangle *) NULL );
+
+    if (!hatch_bitmap)
+    {
+        hatch_bitmap    = hatches;
+        hatch_bitmap[0] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, bdiag_bits, bdiag_width, bdiag_height );
+        hatch_bitmap[1] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cdiag_bits, cdiag_width, cdiag_height );
+        hatch_bitmap[2] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, fdiag_bits, fdiag_width, fdiag_height );
+        hatch_bitmap[3] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cross_bits, cross_width, cross_height );
+        hatch_bitmap[4] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, horiz_bits, horiz_width, horiz_height );
+        hatch_bitmap[5] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, verti_bits, verti_width, verti_height );
+    }

 }
 
 }
 

-void wxPaintDC::DrawPoint( long x, long y )
+void wxWindowDC::DoGetSize( int* width, int* height ) const

 {
 {

-  if (!Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  if (m_pen.GetStyle() != wxTRANSPARENT)
-    gdk_draw_point( m_window, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );
+    wxCHECK_RET( m_owner, _T("GetSize() doesn't work without window") );
+
+    m_owner->GetSize(width, height);

 }
 
 }
 

-void wxPaintDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset )
+void wxWindowDC::DoFloodFill( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                           const wxColour &WXUNUSED(col), int WXUNUSED(style) )

 {
 {

-  if (!Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  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 );
-  }
+    wxFAIL_MSG( wxT("wxWindowDC::DoFloodFill not implemented") );

 }
 
 }
 

-void wxPaintDC::DrawLines( wxList *points, long xoffset, long yoffset )
+bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const

 {
 {

-  if (!Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  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();
-  }
+    // Generic (and therefore rather inefficient) method.
+    // Could be improved.
+    wxMemoryDC memdc;
+    wxBitmap bitmap(1, 1);
+    memdc.SelectObject(bitmap);
+    memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1);
+    memdc.SelectObject(wxNullBitmap);
+
+    wxImage image(bitmap);
+    col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
+    return TRUE;

 }
 
 }
 

-void wxPaintDC::DrawPolygon( int n, wxPoint points[], long xoffset, long yoffset, int WXUNUSED(fillStyle) )
+void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )

 {
 {

-  if (!Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-   if (!n) return;    // Nothing to draw
-   GdkPoint *gdkpoints = new GdkPoint[n+1];
-   int i;
-   for (i = 0 ; i < n ; i++)
-     {
-       gdkpoints[i].x = XLOG2DEV(points[i].x + xoffset);
-       gdkpoints[i].y = YLOG2DEV(points[i].y + yoffset);
-     }
-   if (m_brush.GetStyle() != wxTRANSPARENT)
-     gdk_draw_polygon (m_window, m_brushGC, TRUE, gdkpoints, n);
-   // To do: Fillstyle
-   if (m_pen.GetStyle() != wxTRANSPARENT)
-     for (i = 0 ; i < n ; i++)
-       gdk_draw_line( m_window, m_penGC, 
-                    gdkpoints[i%n].x,
-                    gdkpoints[i%n].y,
-                    gdkpoints[(i+1)%n].x,
-                    gdkpoints[(i+1)%n].y);
-   delete[] gdkpoints;
+    wxCHECK_RET( Ok(), 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);
+    }

 }
 
 }
 

-void wxPaintDC::DrawPolygon( wxList *lines, long xoffset, long yoffset, int WXUNUSED(fillStyle))
+void wxWindowDC::DoCrossHair( wxCoord x, wxCoord y )

 {
 {

-  if (!Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-   int n = lines->Number();
-   GdkPoint *gdkpoints = new GdkPoint[n];
-   wxNode *node = lines->First();
-   int cnt=0;
-   while (node)
-     {
-       wxPoint *p = (wxPoint *) node->Data();
-       gdkpoints[cnt].x = XLOG2DEV(p->x + xoffset);
-       gdkpoints[cnt].y = YLOG2DEV(p->y + yoffset);
-       node = node->Next();
-       cnt++;
-     }
-   if (m_brush.GetStyle() != wxTRANSPARENT)
-     gdk_draw_polygon (m_window, m_brushGC, TRUE, gdkpoints, n);
-   // To do: Fillstyle
-   if (m_pen.GetStyle() != wxTRANSPARENT)
-     {
-       int i;
-       for (i = 0 ; i < n ; i++)
-       gdk_draw_line( m_window, m_penGC, 
-                      gdkpoints[i%n].x,
-                      gdkpoints[i%n].y,
-                      gdkpoints[(i+1)%n].x,
-                      gdkpoints[(i+1)%n].y);
-     }
-   delete[] gdkpoints;
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    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) );
+        }
+    }

 }
 
 }
 

-void wxPaintDC::DrawRectangle( long x, long y, long width, long height )
+void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
+                            wxCoord xc, wxCoord yc )

 {
 {

-  if (!Ok()) return;
-
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  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;
-
-  // 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_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 );
+    wxCHECK_RET( Ok(), 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 (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;
+    }
+    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;
+
+    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 wxPaintDC::DrawRoundedRectangle( long x, long y, long width, long height, double radius )
+void wxWindowDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double sa, double ea )

 {
 {

-  if (!Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  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;
-  }
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );

 
 

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

 
 

-  // 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: handle -ve width and/or height
+    if (ww < 0) { ww = -ww; xx = xx - ww; }
+    if (hh < 0) { hh = -hh; yy = yy - 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 );
-  }
+    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 wxPaintDC::DrawEllipse( long x, long y, long width, long height )
+void wxWindowDC::DoDrawPoint( wxCoord x, wxCoord y )

 {
 {

-  if (!Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  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 );
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    if ((m_pen.GetStyle() != wxTRANSPARENT) && m_window)
+        gdk_draw_point( m_window, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );
+
+    CalcBoundingBox (x, y);

 }
 
 }
 

-bool wxPaintDC::CanDrawBitmap(void) const
+void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset )

 {
 {

-  return TRUE;
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    if (m_pen.GetStyle() == wxTRANSPARENT) return;
+    if (n <= 0) return;
+
+    CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
+
+    for (int i = 0; i < n-1; i++)
+    {
+        wxCoord x1 = XLOG2DEV(points[i].x + xoffset);
+        wxCoord x2 = XLOG2DEV(points[i+1].x + xoffset);
+        wxCoord y1 = YLOG2DEV(points[i].y + yoffset);     // oh, what a waste
+        wxCoord y2 = YLOG2DEV(points[i+1].y + yoffset);
+
+        if (m_window)
+            gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );
+
+        CalcBoundingBox( points[i+1].x + xoffset, points[i+1].y + yoffset );
+    }

 }
 
 }
 

-void wxPaintDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
+void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle) )

 {
 {

-  if (!Ok()) return;
-  
-  if (!icon.Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  int xx = XLOG2DEV(x);
-  int yy = YLOG2DEV(y);
-  
-  GdkBitmap *mask = (GdkBitmap *) 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, (GdkBitmap *) NULL );
-    gdk_gc_set_clip_origin( m_penGC, 0, 0 );
-  }
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    if (n <= 0) return;
+
+    GdkPoint *gdkpoints = new GdkPoint[n+1];
+    int i;
+    for (i = 0 ; i < n ; i++)
+    {
+        gdkpoints[i].x = XLOG2DEV(points[i].x + xoffset);
+        gdkpoints[i].y = YLOG2DEV(points[i].y + yoffset);
+
+        CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset );
+    }
+
+    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_polygon( m_window, m_textGC, TRUE, gdkpoints, 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, gdkpoints, 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, gdkpoints, 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, gdkpoints, n );
+                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+            }
+            else
+            {
+                gdk_draw_polygon( m_window, m_brushGC, TRUE, gdkpoints, n );
+            }
+        }
+
+        if (m_pen.GetStyle() != wxTRANSPARENT)
+        {
+            for (i = 0 ; i < n ; i++)
+            {
+                gdk_draw_line( m_window, m_penGC,
+                               gdkpoints[i%n].x,
+                               gdkpoints[i%n].y,
+                               gdkpoints[(i+1)%n].x,
+                               gdkpoints[(i+1)%n].y);
+            }
+        }
+    }
+
+    delete[] gdkpoints;

 }
 
 }
 

-bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
-       wxDC *source, long xsrc, long ysrc, int WXUNUSED(logical_func), bool WXUNUSED(useMask) )
+void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

-  if (!Ok()) return FALSE;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  if (m_isMemDC)
-  {
-    wxMemoryDC* srcDC = (wxMemoryDC*)source;
-    GdkBitmap* bmap = srcDC->m_selected.GetBitmap();
-    if (bmap)
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    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)

     {
     {

-      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;
+        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 );

     }
     }

-  }

 
 

-  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;
+    CalcBoundingBox( x, y );
+    CalcBoundingBox( x + width, y + height );

 }
 
 }
 

-void wxPaintDC::DrawText( const wxString &text, long x, long y, bool WXUNUSED(use16) )
+void wxWindowDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )

 {
 {

-  if (!Ok()) return;
-
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  GdkFont *font = m_font.GetInternalFont( m_scaleY );
-
-  x = XLOG2DEV(x);
-  y = YLOG2DEV(y);
-
-  // 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, x, y + font->ascent, text );
-
-  // 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())
-  {
-    long width = gdk_string_width( font, text );
-    long 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);
-  }
+    wxCHECK_RET( Ok(), 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)
+    {
+        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--;
+    }
+
+    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 );

 }
 
 }
 

-bool wxPaintDC::CanGetTextExtent(void) const
+void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

-  return TRUE;
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    wxCoord xx = XLOG2DEV(x);
+    wxCoord yy = YLOG2DEV(y);
+    wxCoord ww = m_signX * XLOG2DEVREL(width);
+    wxCoord 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_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 );
+    }
+
+    CalcBoundingBox( x, y );
+    CalcBoundingBox( x + width, y + height );

 }
 
 }
 

-void wxPaintDC::GetTextExtent( const wxString &string, long *width, long *height,
-                     long *descent, long *externalLeading,
-                     wxFont *theFont, bool WXUNUSED(use16) )
+void wxWindowDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )

 {
 {

-  if (!Ok()) return;
-  
-  wxFont fontToUse = m_font;
-  if (theFont) fontToUse = *theFont;
-  
-  GdkFont *font = fontToUse.GetInternalFont( m_scaleY );
-  if (width) (*width) = long(gdk_string_width( font, string ) / m_scaleX);
-  if (height) (*height) = long((font->ascent + font->descent) / m_scaleY);
-  if (descent) (*descent) = long(font->descent / m_scaleY);
-  if (externalLeading) (*externalLeading) = 0;  // ??
+    // VZ: egcs 1.0.3 refuses to compile this without cast, no idea why
+    DoDrawBitmap( (const wxBitmap&)icon, x, y, (bool)TRUE );

 }
 
 }
 

-long wxPaintDC::GetCharWidth(void)
+void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
+                               wxCoord x, wxCoord y,
+                               bool useMask )

 {
 {

-  if (!Ok()) return 0;
-  
-  GdkFont *font = m_font.GetInternalFont( m_scaleY );
-  return long(gdk_string_width( font, "H" ) / m_scaleX);
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
+
+    bool is_mono = (bitmap.GetBitmap() != NULL);
+
+    /* 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;
+    if ((w != ww) || (h != hh))
+    {
+        wxImage image( bitmap );
+        image.Rescale( ww, hh );
+        if (is_mono)
+            use_bitmap = image.ConvertToMonoBitmap(255,255,255);
+        else
+            use_bitmap = image.ConvertToBitmap();
+    }
+    else
+    {
+        use_bitmap = bitmap;
+    }
+
+    /* apply mask if any */
+    GdkBitmap *mask = (GdkBitmap *) NULL;
+    if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
+
+        if (useMask && mask)
+        {
+            GdkBitmap *new_mask = (GdkBitmap*) NULL;
+            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 );
+            }
+            if (new_mask)
+                gdk_bitmap_unref( new_mask );
+        }
+
+    /* 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, (GdkBitmap *) 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, (GdkBitmap *) NULL );
+            gdk_gc_set_clip_origin( m_penGC, 0, 0 );
+            if (!m_currentClippingRegion.IsNull())
+                gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
+        }
+    }

 }
 
 }
 

-long wxPaintDC::GetCharHeight(void)
+bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
+                         wxCoord width, wxCoord height,
+                         wxDC *source,
+                         wxCoord xsrc, wxCoord ysrc,
+                         int logical_func,
+                         bool useMask,
+                         wxCoord xsrcMask, wxCoord ysrcMask )

 {
 {

-  if (!Ok()) return 0;
-  
-  GdkFont *font = m_font.GetInternalFont( m_scaleY );
-  return long((font->ascent + font->descent) / m_scaleY);
+   /* this is the nth try to get this utterly useless function to
+      work. it now completely ignores the scaling or translation
+      of the source dc, but scales correctly on the target dc and
+      knows about possible mask information in a memory dc. */
+
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid window dc") );
+
+    wxCHECK_MSG( source, FALSE, wxT("invalid source dc") );
+
+    if (!m_window) return FALSE;
+
+#if 0
+    // transform the source DC coords to the device ones
+    xsrc = XLOG2DEV(xsrc);
+    ysrc = YLOG2DEV(ysrc);
+#endif
+
+    wxClientDC *srcDC = (wxClientDC*)source;
+    wxMemoryDC *memDC = (wxMemoryDC*)source;
+
+    bool use_bitmap_method = FALSE;
+    bool is_mono = FALSE;
+
+    /* TODO: use the mask origin when drawing transparently */
+    if (xsrcMask == -1 && ysrcMask == -1)
+    {
+        xsrcMask = xsrc; ysrcMask = ysrc;
+    }
+
+    if (srcDC->m_isMemDC)
+    {
+        if (!memDC->m_selected.Ok()) return FALSE;
+
+        /* we use the "XCopyArea" way to copy a memory dc into
+           y 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 (memDC->m_selected.GetDepth() == 1)
+        {
+           /* we HAVE TO use the direct way for memory dcs
+              that are bitmaps because XCopyArea doesn't cope
+              with different bit depths */
+            is_mono = TRUE;
+            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;
+    }
+
+    int 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();
+
+        wxCoord bm_ww = XLOG2DEVREL( bm_width );
+        wxCoord bm_hh = YLOG2DEVREL( bm_height );
+
+        /* scale bitmap if required */
+        wxBitmap use_bitmap;
+
+        if ((bm_width != bm_ww) || (bm_height != bm_hh))
+        {
+            wxImage image( memDC->m_selected );
+            image = image.Scale( bm_ww, bm_hh );
+
+            if (is_mono)
+                use_bitmap = image.ConvertToMonoBitmap(255,255,255);
+            else
+                use_bitmap = image.ConvertToBitmap();
+        }
+        else
+        {
+            use_bitmap = memDC->m_selected;
+        }
+
+        /* apply mask if any */
+        GdkBitmap *mask = (GdkBitmap *) NULL;
+        if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
+
+        if (useMask && mask)
+        {
+            GdkBitmap *new_mask = (GdkBitmap*) NULL;
+            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_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() );
+                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, bm_ww, bm_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 );
+            }
+            if (new_mask)
+                gdk_bitmap_unref( new_mask );
+        }
+
+        /* 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(), xsrc, ysrc, xx, yy, ww, hh );
+        else
+            gdk_draw_pixmap( m_window, m_penGC, use_bitmap.GetPixmap(), xsrc, ysrc, xx, yy, ww, hh );
+
+        /* remove mask again if any */
+        if (useMask && mask)
+        {
+            if (is_mono)
+            {
+                gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) 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, (GdkBitmap *) NULL );
+                gdk_gc_set_clip_origin( m_penGC, 0, 0 );
+                if (!m_currentClippingRegion.IsNull())
+                    gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
+            }
+        }
+    }
+    else /* use_bitmap_method */
+    {
+        if ((width != ww) || (height != hh))
+        {
+            /* draw source window into a bitmap as we cannot scale
+               a window in contrast to a bitmap. this would actually
+               work with memory dcs as well, but we'd lose the mask
+               information and waste one step in this process since
+               a memory already has a bitmap. all this is slightly
+               inefficient as we could take an XImage directly from
+               an X window, but we'd then also have to care that
+               the window is not outside the screen (in which case
+               we'd get a BadMatch or what not).
+               Is a double XGetImage and combined XGetPixel and
+               XPutPixel really faster? I'm not sure. look at wxXt
+               for a different implementation of the same problem. */
+
+            wxBitmap bitmap( width, height );
+
+            /* copy including child window contents */
+            gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
+            gdk_window_copy_area( bitmap.GetPixmap(), m_penGC, 0, 0,
+                                  srcDC->GetWindow(),
+                                  xsrc, ysrc, width, height );
+            gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
+
+            /* scale image */
+            wxImage image( bitmap );
+            image = image.Scale( ww, hh );
+
+            /* convert to bitmap */
+            bitmap = image.ConvertToBitmap();
+
+            /* draw scaled bitmap */
+            gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -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 );
+    return TRUE;

 }
 
 }
 

-void wxPaintDC::Clear(void)
+void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )

 {
 {

-  if (!Ok()) return;
-  
-  if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
-  
-  if (!m_isMemDC)
-  {
-    gdk_window_clear( m_window );
-  }
-  else
-  {
-    int width = 0;
-    int height = 0;
-    GetSize( &width, &height );
-    gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
-  }
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    if (!m_window) return;
+
+    GdkFont *font = m_font.GetInternalFont( m_scaleY );
+
+    wxCHECK_RET( font, wxT("invalid font") );
+
+#if defined(__WXGTK20__)
+    wxCHECK_RET( m_context, wxT("no Pango context") );
+#endif
+
+    x = XLOG2DEV(x);
+    y = YLOG2DEV(y);
+
+#if defined(__WXGTK20__) && wxUSE_WCHAR_T
+    /* FIXME: the layout engine should probably be abstracted at a higher level in wxDC... */
+    PangoLayout *layout = pango_layout_new(m_context);
+    pango_layout_set_font_description(layout, m_fontdesc);
+    {
+        wxWX2MBbuf data = text.mb_str(wxConvUTF8);
+        pango_layout_set_text(layout, data, strlen(data));
+    }
+    PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
+    PangoRectangle rect;
+    pango_layout_line_get_extents(line, NULL, &rect);
+    wxCoord width = rect.width;
+    wxCoord height = rect.height;
+    gdk_draw_layout( m_window, m_textGC, x, y, layout );
+#else
+    wxCoord width = gdk_string_width( font, text.mbc_str() );
+    wxCoord height = font->ascent + font->descent;
+    /* CMB 21/5/98: draw text background if mode is wxSOLID */
+    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_draw_string( m_window, font, m_textGC, x, y + font->ascent, text.mbc_str() );
+#endif
+
+    /* 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);
+    }
+
+#if defined(__WXGTK20__) && wxUSE_WCHAR_T
+    g_object_unref( G_OBJECT( layout ) );
+#endif
+
+    width = wxCoord(width / m_scaleX);
+    height = wxCoord(height / m_scaleY);
+    CalcBoundingBox (x + width, y + height);
+    CalcBoundingBox (x, y);

 }
 
 }
 

-void wxPaintDC::SetFont( const wxFont &font )
+void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )

 {
 {

-  if (!Ok()) return;
-  
-  m_font = font;
+    if (angle == 0.0)
+    {
+        DrawText(text, x, y);
+        return;
+    }
+
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    if (!m_window) return;
+
+    GdkFont *font = m_font.GetInternalFont( m_scaleY );
+
+    wxCHECK_RET( font, wxT("invalid font") );
+
+    // the size of the text
+    wxCoord w = gdk_string_width( font, text.mbc_str() );
+    wxCoord h = font->ascent + font->descent;
+
+    // draw the string normally
+    wxBitmap src(w, h);
+    wxMemoryDC dc;
+    dc.SelectObject(src);
+    dc.SetFont(GetFont());
+    dc.SetBackground(*wxWHITE_BRUSH);
+    dc.SetBrush(*wxBLACK_BRUSH);
+    dc.Clear();
+    dc.DrawText(text, 0, 0);
+    dc.SetFont(wxNullFont);
+    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);
+
+    // prepare to blit-with-rotate the bitmap to the DC
+    wxImage image(src);
+
+    GdkColor *colText = m_textForegroundColour.GetColor(),
+             *colBack = m_textBackgroundColour.GetColor();
+
+    bool textColSet = TRUE;
+
+    unsigned char *data = image.GetData();
+
+    // paint pixel by pixel
+    for ( wxCoord srcX = 0; srcX < w; srcX++ )
+    {
+        for ( wxCoord srcY = 0; srcY < h; srcY++ )
+        {
+            // transform source coords to dest coords
+            double r = sqrt((double)srcX*srcX + srcY*srcY);
+            double angleOrig = atan2((double)srcY, (double)srcX) - rad;
+            wxCoord dstX = (wxCoord)(r*cos(angleOrig) + 0.5),
+                    dstY = (wxCoord)(r*sin(angleOrig) + 0.5);
+
+            // black pixel?
+            bool textPixel = data[(srcY*w + srcX)*3] == 0;
+            if ( textPixel || (m_backgroundMode == wxSOLID) )
+            {
+                // change colour if needed
+                if ( textPixel != textColSet )
+                {
+                    gdk_gc_set_foreground( m_textGC, textPixel ? colText
+                                                               : colBack );
+
+                    textColSet = textPixel;
+                }
+
+                // don't use DrawPoint() because it uses the current pen
+                // colour, and we don't need it here
+                gdk_draw_point( m_window, m_textGC,
+                                XLOG2DEV(x + dstX), YLOG2DEV(y + dstY) );
+            }
+        }
+    }
+
+    // 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
+
+    // restore the font colour
+    gdk_gc_set_foreground( m_textGC, colText );
+
+    // update the bounding box
+    CalcBoundingBox(x + minX, y + minY);
+    CalcBoundingBox(x + maxX, y + maxY);

 }
 
 }
 

-void wxPaintDC::SetPen( const wxPen &pen )
+void wxWindowDC::DoGetTextExtent(const wxString &string,
+                                 wxCoord *width, wxCoord *height,
+                                 wxCoord *descent, wxCoord *externalLeading,
+                                 wxFont *theFont) const

 {
 {

-  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() );
+    wxFont fontToUse = m_font;
+    if (theFont) fontToUse = *theFont;
+
+    GdkFont *font = fontToUse.GetInternalFont( m_scaleY );
+    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);
+    if (externalLeading) (*externalLeading) = 0;  // ??

 }
 
 }
 

-void wxPaintDC::SetBrush( const wxBrush &brush )
+wxCoord wxWindowDC::GetCharWidth() const

 {
 {

-  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] );
-  }
+    GdkFont *font = m_font.GetInternalFont( m_scaleY );
+    wxCHECK_MSG( font, -1, wxT("invalid font") );
+
+    return wxCoord(gdk_string_width( font, "H" ) / m_scaleX);

 }
 
 }
 

-// CMB 21/7/98: Added SetBackground. Sets background brush
-// for Clear() and bg colour for shapes filled with cross-hatch brush
-void wxPaintDC::SetBackground( const wxBrush &brush )
+wxCoord wxWindowDC::GetCharHeight() const

 {
 {

-  if (!Ok()) return;
-  
-  if (m_backgroundBrush == brush) return;
-  
-  m_backgroundBrush = brush;
-  
-  if (!m_backgroundBrush.Ok()) return;
-  
-  m_backgroundBrush.GetColour().CalcPixel( m_cmap );
-  gdk_gc_set_background( m_brushGC, m_backgroundBrush.GetColour().GetColor() );
-  gdk_gc_set_foreground( m_bgGC, m_backgroundBrush.GetColour().GetColor() );
-  
-  GdkFill fillStyle = GDK_SOLID;
-  switch (m_backgroundBrush.GetStyle())
-  {
-    case wxSOLID:
-    case wxTRANSPARENT:
-      break;
-    default:
-      fillStyle = GDK_STIPPLED;
-  }
- 
-  gdk_gc_set_fill( m_bgGC, fillStyle );
-  
-  if (m_backgroundBrush.GetStyle() == wxSTIPPLE)
-  {
-    gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );
-  }
-  
-  if (IS_HATCH(m_backgroundBrush.GetStyle()))
-  {
-    int num = m_backgroundBrush.GetStyle() - wxBDIAGONAL_HATCH;
-    gdk_gc_set_stipple( m_bgGC, hatches[num] );
-  }
+    GdkFont *font = m_font.GetInternalFont( m_scaleY );
+    wxCHECK_MSG( font, -1, wxT("invalid font") );
+
+    return wxCoord((font->ascent + font->descent) / m_scaleY);

 }
 
 }
 

-void wxPaintDC::SetLogicalFunction( int function )
+void wxWindowDC::Clear()

 {
 {

-  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 );
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    if (!m_window) return;
+
+    /* - 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)
+    {
+        int width,height;
+        m_owner->GetSize( &width, &height );
+        gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
+        return;
+    }
+
+    if (m_isMemDC)
+    {
+        int width,height;
+        GetSize( &width, &height );
+        gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
+        return;
+    }

 }
 
 }
 

-void wxPaintDC::SetTextForeground( const wxColour &col )
+void wxWindowDC::SetFont( const wxFont &font )

 {
 {

-  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() );
+    m_font = font;
+#ifdef __WXGTK20__
+    // fix fontdesc?
+#endif

 }
 
 }
 

-void wxPaintDC::SetTextBackground( const wxColour &col )
+void wxWindowDC::SetPen( const wxPen &pen )

 {
 {

-  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() );
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    if (m_pen == pen) return;
+
+    m_pen = pen;
+
+    if (!m_pen.Ok()) return;
+
+    if (!m_window) return;
+
+    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;
+    }
+
+    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 = (wxGTKDash*)NULL;
+            req_nb_dash = 0;
+            break;
+        }
+    }
+
+#if (GTK_MINOR_VERSION > 0) || (GTK_MAJOR_VERSION > 1)
+    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 );
+        }
+    }
+#endif
+
+    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 wxPaintDC::SetBackgroundMode( int mode )
+void wxWindowDC::SetBrush( const wxBrush &brush )

 {
 {

-  m_backgroundMode = mode;
-
-  // CMB 21/7/98: fill style of cross-hatch brushes is affected by
-  // transparent/solid background mode
-  if (m_brush.GetStyle() != wxSOLID && m_brush.GetStyle() != wxTRANSPARENT)
-  {
-    gdk_gc_set_fill( m_brushGC,
-      (m_backgroundMode == wxTRANSPARENT) ? GDK_STIPPLED : GDK_OPAQUE_STIPPLED);
-  }
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    if (m_brush == brush) return;
+
+    m_brush = brush;
+
+    if (!m_brush.Ok()) 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()->Ok()))
+    {
+        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 (IS_HATCH(m_brush.GetStyle()))
+    {
+        gdk_gc_set_fill( m_brushGC, GDK_STIPPLED );
+        int num = m_brush.GetStyle() - wxBDIAGONAL_HATCH;
+        gdk_gc_set_stipple( m_brushGC, hatches[num] );
+    }

 }
 
 }
 

-void wxPaintDC::SetPalette( const wxPalette& WXUNUSED(palette) )
+void wxWindowDC::SetBackground( const wxBrush &brush )

 {
 {

+   /* CMB 21/7/98: Added SetBackground. Sets background brush
+    * for Clear() and bg colour for shapes filled with cross-hatch brush */
+
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    if (m_backgroundBrush == brush) return;
+
+    m_backgroundBrush = brush;
+
+    if (!m_backgroundBrush.Ok()) 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()->Ok()))
+    {
+        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 (IS_HATCH(m_backgroundBrush.GetStyle()))
+    {
+        gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );
+        int num = m_backgroundBrush.GetStyle() - wxBDIAGONAL_HATCH;
+        gdk_gc_set_stipple( m_bgGC, hatches[num] );
+    }

 }
 
 }
 

-void wxPaintDC::SetClippingRegion( long x, long y, long width, long height )
+void wxWindowDC::SetLogicalFunction( int function )

 {
 {

-  wxDC::SetClippingRegion( x, y, width, height );
-  
-  GdkRectangle rect;
-  rect.x = XLOG2DEV(x);
-  rect.y = YLOG2DEV(y);
-  rect.width = XLOG2DEVREL(width);
-  rect.height = YLOG2DEVREL(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_RET( Ok(), wxT("invalid window dc") );
+
+    if (m_logicalFunction == function)
+        return;
+
+    // VZ: shouldn't this be a CHECK?
+    if (!m_window)
+        return;
+
+    GdkFunction mode = GDK_COPY;
+    switch (function)
+    {
+        case wxXOR:          mode = GDK_XOR;           break;
+        case wxINVERT:       mode = GDK_INVERT;        break;
+#if (GTK_MINOR_VERSION > 0)
+        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;
+#endif
+        default:
+        {
+           wxFAIL_MSG( wxT("unsupported logical function") );
+           break;
+        }
+    }
+
+    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 );

 }
 
 }
 

-void wxPaintDC::DestroyClippingRegion(void)
+void wxWindowDC::SetTextForeground( const wxColour &col )

 {
 {

-  wxDC::DestroyClippingRegion();
-  
-  gdk_gc_set_clip_rectangle( m_penGC, (GdkRectangle *) NULL );
-  gdk_gc_set_clip_rectangle( m_brushGC, (GdkRectangle *) NULL );
-  gdk_gc_set_clip_rectangle( m_textGC, (GdkRectangle *) NULL );
-  gdk_gc_set_clip_rectangle( m_bgGC, (GdkRectangle *) NULL );
+    wxCHECK_RET( Ok(), 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.Ok() || (m_textForegroundColour == col) )
+        return;
+
+    m_textForegroundColour = col;
+
+    if ( m_window )
+    {
+        m_textForegroundColour.CalcPixel( m_cmap );
+        gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
+    }

 }
 
 }
 

-void wxPaintDC::SetUpDC(void)
+void wxWindowDC::SetTextBackground( const wxColour &col )

 {
 {

-  m_ok = TRUE;
-  m_logicalFunction = wxCOPY;
-  if (m_penGC) gdk_gc_unref( m_penGC );
-  m_penGC = gdk_gc_new( m_window );
-  if (m_brushGC) gdk_gc_unref( m_brushGC );
-  m_brushGC = gdk_gc_new( m_window );
-  if (m_textGC) gdk_gc_unref( m_textGC );
-  m_textGC = gdk_gc_new( m_window );
-  if (m_bgGC) gdk_gc_unref( m_bgGC );
-  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( (GdkWindow *) NULL, bdiag_bits, bdiag_width, bdiag_height );
-    hatch_bitmap[1] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cdiag_bits, cdiag_width, cdiag_height );
-    hatch_bitmap[2] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, fdiag_bits, fdiag_width, fdiag_height );
-    hatch_bitmap[3] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cross_bits, cross_width, cross_height );
-    hatch_bitmap[4] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, horiz_bits, horiz_width, horiz_height );
-    hatch_bitmap[5] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, verti_bits, verti_width, verti_height );
-  }
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    // same as above
+    if ( !col.Ok() || (m_textBackgroundColour == col) )
+        return;
+
+    m_textBackgroundColour = col;
+
+    if ( m_window )
+    {
+        m_textBackgroundColour.CalcPixel( m_cmap );
+        gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
+    }

 }
 
 }
 

-GdkWindow *wxPaintDC::GetWindow(void)
+void wxWindowDC::SetBackgroundMode( int mode )

 {
 {

-  return m_window;
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    m_backgroundMode = mode;
+
+    if (!m_window) return;
+
+    // CMB 21/7/98: fill style of cross-hatch brushes is affected by
+    // transparent/solid background mode
+
+    if (m_brush.GetStyle() != wxSOLID && m_brush.GetStyle() != wxTRANSPARENT)
+    {
+        gdk_gc_set_fill( m_brushGC,
+          (m_backgroundMode == wxTRANSPARENT) ? GDK_STIPPLED : GDK_OPAQUE_STIPPLED);
+    }

 }
 
 }
 

-// ----------------------------------- spline code ----------------------------------------
+void wxWindowDC::SetPalette( const wxPalette& WXUNUSED(palette) )
+{
+    wxFAIL_MSG( wxT("wxWindowDC::SetPalette not implemented") );
+}

 
 

-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);
+void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+{
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );

 
 

-wxList wx_spline_point_list;
+    if (!m_window) return;

 
 

-#define                half(z1, z2)    ((z1+z2)/2.0)
-#define                THRESHOLD       5
+    wxRect rect;
+    rect.x = XLOG2DEV(x);
+    rect.y = YLOG2DEV(y);
+    rect.width = XLOG2DEVREL(width);
+    rect.height = YLOG2DEVREL(height);

 
 

-/* iterative version */
+    if (!m_currentClippingRegion.IsNull())
+        m_currentClippingRegion.Intersect( rect );
+    else
+        m_currentClippingRegion.Union( rect );

 
 

-void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4,
-                 double b4)
+#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 );
+    wxDC::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 wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion &region  )

 {
 {

-    register double  xmid, ymid;
-    double           x1, y1, x2, y2, x3, y3, x4, y4;
-
-    wx_clear_stack();
-    wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);
-
-    while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) {
-        xmid = (double)half(x2, x3);
-        ymid = (double)half(y2, y3);
-       if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD &&
-           fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) {
-            wx_spline_add_point( x1, y1 );
-            wx_spline_add_point( xmid, ymid );
-       } else {
-            wx_spline_push(xmid, ymid, (double)half(xmid, x3), (double)half(ymid, y3),
-                 (double)half(x3, x4), (double)half(y3, y4), x4, y4);
-            wx_spline_push(x1, y1, (double)half(x1, x2), (double)half(y1, y2),
-                 (double)half(x2, xmid), (double)half(y2, ymid), xmid, ymid);
-       }
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    if (region.Empty())
+    {
+        DestroyClippingRegion();
+        return;

     }
     }

-}

 
 

-/* utilities used by spline drawing routines */
+    if (!m_window) return;

 
 

-typedef struct wx_spline_stack_struct {
-    double           x1, y1, x2, y2, x3, y3, x4, y4;
-} Stack;
+    if (!m_currentClippingRegion.IsNull())
+        m_currentClippingRegion.Intersect( region );
+    else
+        m_currentClippingRegion.Union( region );

 
 

-#define         SPLINE_STACK_DEPTH             20
-static Stack    wx_spline_stack[SPLINE_STACK_DEPTH];
-static Stack   *wx_stack_top;
-static int      wx_stack_count;
+#if USE_PAINT_REGION
+    if (!m_paintClippingRegion.IsNull())
+        m_currentClippingRegion.Intersect( m_paintClippingRegion );
+#endif

 
 

-void wx_clear_stack(void)
-{
-    wx_stack_top = wx_spline_stack;
-    wx_stack_count = 0;
+    wxCoord xx, yy, ww, hh;
+    m_currentClippingRegion.GetBox( xx, yy, ww, hh );
+    wxDC::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 wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
+void wxWindowDC::DestroyClippingRegion()

 {
 {

-    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++;
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    wxDC::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, (GdkRectangle *) NULL );
+        gdk_gc_set_clip_rectangle( m_brushGC, (GdkRectangle *) NULL );
+        gdk_gc_set_clip_rectangle( m_textGC, (GdkRectangle *) NULL );
+        gdk_gc_set_clip_rectangle( m_bgGC, (GdkRectangle *) 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() );
+    }

 }
 
 }
 

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

 {
 {

-    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);
+    if (m_penGC) wxFreePoolGC( m_penGC );
+    m_penGC = (GdkGC*) NULL;
+    if (m_brushGC) wxFreePoolGC( m_brushGC );
+    m_brushGC = (GdkGC*) NULL;
+    if (m_textGC) wxFreePoolGC( m_textGC );
+    m_textGC = (GdkGC*) NULL;
+    if (m_bgGC) wxFreePoolGC( m_bgGC );
+    m_bgGC = (GdkGC*) NULL;

 }
 
 }
 

-static bool wx_spline_add_point(double x, double y)
+void wxWindowDC::ComputeScaleAndOrigin()

 {
 {

-  wxPoint *point = new wxPoint ;
-  point->x = (int) x;
-  point->y = (int) y;
-  wx_spline_point_list.Append((wxObject*)point);
-  return TRUE;
+    /* CMB: copy scale to see if it changes */
+    double origScaleX = m_scaleX;
+    double origScaleY = m_scaleY;
+
+    wxDC::ComputeScaleAndOrigin();
+
+    /* CMB: if scale has changed call SetPen to recalulate the line width */
+    if ((m_scaleX != origScaleX || m_scaleY != origScaleY) &&
+        (m_pen.Ok()))
+    {
+      /* 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 );
+  }

 }
 
 }
 

-static void wx_spline_draw_point_array(wxDC *dc)
+// Resolution in pixels per logical inch
+wxSize wxWindowDC::GetPPI() const

 {
 {

-  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();
-  }
+    return wxSize( (int) (m_mm_to_pix_x * 25.4 + 0.5), (int) (m_mm_to_pix_y * 25.4 + 0.5));

 }
 
 }
 

-void wxPaintDC::DrawSpline( wxList *points )
+int wxWindowDC::GetDepth() const

 {
 {

-    wxPoint *p;
-    double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
-    double           x1, y1, x2, y2;
+    wxFAIL_MSG(wxT("not implemented"));

 
 

-    wxNode *node = points->First();
-    p = (wxPoint *)node->Data();
+    return -1;
+}

 
 

-    x1 = p->x;
-    y1 = p->y;

 
 

-    node = node->Next();
-    p = (wxPoint *)node->Data();
+//-----------------------------------------------------------------------------
+// wxPaintDC
+//-----------------------------------------------------------------------------

 
 

-    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);
+IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)

 
 

-    wx_spline_add_point(x1, y1);
+wxPaintDC::wxPaintDC( wxWindow *win )
+         : wxClientDC( win )
+{
+#if USE_PAINT_REGION
+    if (!win->m_clipPaintRegion)
+        return;

 
 

-    while ((node = node->Next()) != NULL)
+    m_paintClippingRegion = win->GetUpdateRegion();
+    GdkRegion *region = m_paintClippingRegion.GetRegion();
+    if ( region )

     {
     {

-        p = (wxPoint *)node->Data();
-       x1 = x2;
-       y1 = y2;
-       x2 = p->x;
-       y2 = p->y;
-        cx4 = (double)(x1 + x2) / 2;
-        cy4 = (double)(y1 + y2) / 2;
-        cx3 = (double)(x1 + cx4) / 2;
-        cy3 = (double)(y1 + cy4) / 2;
-
-        wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);
-
-       cx1 = cx4;
-       cy1 = cy4;
-        cx2 = (double)(cx1 + x2) / 2;
-        cy2 = (double)(cy1 + y2) / 2;
+        m_paintClippingRegion = win->GetUpdateRegion();
+        GdkRegion *region = m_paintClippingRegion.GetRegion();
+        if ( region )
+        {
+            m_currentClippingRegion.Union( m_paintClippingRegion );
+
+            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
+}

 
 

-    wx_spline_add_point( cx1, cy1 );
-    wx_spline_add_point( x2, y2 );
+//-----------------------------------------------------------------------------
+// wxClientDC
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
+
+wxClientDC::wxClientDC( wxWindow *win )
+          : wxWindowDC( win )
+{
+    wxCHECK_RET( win, _T("NULL window in wxClientDC::wxClientDC") );
+
+#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 wxClientDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_owner, _T("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();

 }
 }