Fix a number of mingw compile errors.

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 4a36650e9ed599a5c3d2e0f56ea4785e7edd7637..798b1f413f1ef72c3d3c3320690fa26707ffaa7b 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/gtk/dcclient.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/gtk/dcclient.cpp

-// Purpose:
+// Purpose:     wxWindowDCImpl implementation

 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Chris Breeze
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Chris Breeze


@@ -10,28 +10,21 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __VMS
-#define XCopyPlane XCOPYPLANE
-#endif
-
-#include "wx/dc.h"
-#include "wx/dcclient.h"
+#include "wx/gtk/dcclient.h"

 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/log.h"
     #include "wx/dcmemory.h"
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/log.h"
     #include "wx/dcmemory.h"

-    #include "wx/math.h" // for floating-point functions
+    #include "wx/math.h"

     #include "wx/image.h"
     #include "wx/module.h"
 #endif
 
 #include "wx/fontutil.h"
     #include "wx/image.h"
     #include "wx/module.h"
 #endif
 
 #include "wx/fontutil.h"

-#include "wx/scrolwin.h"

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

-
-#include <gdk/gdkx.h>
+#include "wx/gtk/private/object.h"

 
 //-----------------------------------------------------------------------------
 // local defines
 
 //-----------------------------------------------------------------------------
 // local defines


@@ -54,22 +47,14 @@
 #include "horiz.xbm"
 #include "verti.xbm"
 #include "cross.xbm"
 #include "horiz.xbm"
 #include "verti.xbm"
 #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;

 
 

-extern GtkWidget *wxGetRootWindow();
+static GdkPixmap* hatches[wxBRUSHSTYLE_LAST_HATCH - wxBRUSHSTYLE_FIRST_HATCH + 1];

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

-const double RAD2DEG  = 180.0 / M_PI;
+static const double RAD2DEG  = 180.0 / M_PI;

 
 // ----------------------------------------------------------------------------
 // private functions
 
 // ----------------------------------------------------------------------------
 // private functions


@@ -80,34 +65,50 @@ 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; }
 
 
 static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
 

-//-----------------------------------------------------------------------------
-// temporary implementation of the missing GDK function
-//-----------------------------------------------------------------------------
-
-#include "gdk/gdkprivate.h"
-
-static
-void gdk_wx_draw_bitmap(GdkDrawable  *drawable,
-                        GdkGC        *gc,
-                        GdkDrawable  *src,
-                        gint         xsrc,
-                        gint         ysrc)
+static GdkPixmap* GetHatch(int style)

 {
 {

-    wxCHECK_RET( drawable, _T("NULL drawable in gdk_wx_draw_bitmap") );
-    wxCHECK_RET( src, _T("NULL src in gdk_wx_draw_bitmap") );
-    wxCHECK_RET( gc, _T("NULL gc in gdk_wx_draw_bitmap") );
-
-    gint src_width, src_height;
-    gdk_drawable_get_size(src, &src_width, &src_height);
+    wxASSERT(style >= wxBRUSHSTYLE_FIRST_HATCH && style <= wxBRUSHSTYLE_LAST_HATCH);
+    const int i = style - wxBRUSHSTYLE_FIRST_HATCH;
+    if (hatches[i] == NULL)
+    {
+        // This macro creates a bitmap from an XBM file included above. Notice
+        // the need for the cast because gdk_bitmap_create_from_data() doesn't
+        // accept unsigned data but the arrays in XBM need to be unsigned to
+        // avoid warnings (and even errors in C+0x mode) from g++.
+#define CREATE_FROM_XBM_DATA(name) \
+        gdk_bitmap_create_from_data \
+        ( \
+            NULL, \
+            reinterpret_cast<gchar *>(name ## _bits), \
+            name ## _width, \
+            name ## _height \
+        )
+
+        switch (style)
+        {
+        case wxBRUSHSTYLE_BDIAGONAL_HATCH:
+            hatches[i] = CREATE_FROM_XBM_DATA(bdiag);
+            break;
+        case wxBRUSHSTYLE_CROSSDIAG_HATCH:
+            hatches[i] = CREATE_FROM_XBM_DATA(cdiag);
+            break;
+        case wxBRUSHSTYLE_CROSS_HATCH:
+            hatches[i] = CREATE_FROM_XBM_DATA(cross);
+            break;
+        case wxBRUSHSTYLE_FDIAGONAL_HATCH:
+            hatches[i] = CREATE_FROM_XBM_DATA(fdiag);
+            break;
+        case wxBRUSHSTYLE_HORIZONTAL_HATCH:
+            hatches[i] = CREATE_FROM_XBM_DATA(horiz);
+            break;
+        case wxBRUSHSTYLE_VERTICAL_HATCH:
+            hatches[i] = CREATE_FROM_XBM_DATA(verti);
+            break;
+        }

 
 

-    XCopyPlane( GDK_WINDOW_XDISPLAY(drawable),
-                GDK_WINDOW_XID(src),
-                GDK_WINDOW_XID(drawable),
-                GDK_GC_XGC(gc),
-                xsrc, ysrc,
-                src_width, src_height,
-                0, 0,
-                1 );
+#undef CREATE_FROM_XBM_DATA
+    }
+    return hatches[i];

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


@@ -230,7 +231,7 @@ static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )
     // The realloc failed.  Fall through to error.
     wxFAIL_MSG( wxT("No GC available") );
 
     // The realloc failed.  Fall through to error.
     wxFAIL_MSG( wxT("No GC available") );
 

-    return (GdkGC*) NULL;
+    return NULL;

 }
 
 static void wxFreePoolGC( GdkGC *gc )
 }
 
 static void wxFreePoolGC( GdkGC *gc )


@@ -256,16 +257,16 @@ IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxGTKDCImpl)
 wxWindowDCImpl::wxWindowDCImpl( wxDC *owner ) :
    wxGTKDCImpl( owner )
 {
 wxWindowDCImpl::wxWindowDCImpl( wxDC *owner ) :
    wxGTKDCImpl( owner )
 {

-    m_gdkwindow = (GdkWindow*) NULL;
-    m_penGC = (GdkGC *) NULL;
-    m_brushGC = (GdkGC *) NULL;
-    m_textGC = (GdkGC *) NULL;
-    m_bgGC = (GdkGC *) NULL;
-    m_cmap = (GdkColormap *) NULL;
+    m_gdkwindow = NULL;
+    m_penGC = NULL;
+    m_brushGC = NULL;
+    m_textGC = NULL;
+    m_bgGC = NULL;
+    m_cmap = NULL;

     m_isScreenDC = false;
     m_isScreenDC = false;

-    m_context = (PangoContext *)NULL;
-    m_layout = (PangoLayout *)NULL;
-    m_fontdesc = (PangoFontDescription *)NULL;
+    m_context = NULL;
+    m_layout = NULL;
+    m_fontdesc = NULL;

 }
 
 wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) :
 }
 
 wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) :


@@ -273,34 +274,35 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) :
 {
     wxASSERT_MSG( window, wxT("DC needs a window") );
 
 {
     wxASSERT_MSG( window, wxT("DC needs a window") );
 

-    m_gdkwindow = (GdkWindow*) NULL;
-    m_penGC = (GdkGC *) NULL;
-    m_brushGC = (GdkGC *) NULL;
-    m_textGC = (GdkGC *) NULL;
-    m_bgGC = (GdkGC *) NULL;
-    m_cmap = (GdkColormap *) NULL;
+    m_gdkwindow = NULL;
+    m_penGC = NULL;
+    m_brushGC = NULL;
+    m_textGC = NULL;
+    m_bgGC = NULL;
+    m_cmap = NULL;

     m_isScreenDC = false;
     m_font = window->GetFont();
 
     GtkWidget *widget = window->m_wxwindow;
     m_isScreenDC = false;
     m_font = window->GetFont();
 
     GtkWidget *widget = window->m_wxwindow;

+    m_gdkwindow = window->GTKGetDrawingWindow();

 
     // Some controls don't have m_wxwindow - like wxStaticBox, but the user
 
     // 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.
+    // code should still be able to create wxClientDCs for them

     if ( !widget )
     {
     if ( !widget )
     {

-        window = window->GetParent();
-        widget = window->m_wxwindow;
-    }
+        widget = window->m_widget;
+
+        wxCHECK_RET(widget, "DC needs a widget");

 
 

-    wxASSERT_MSG( widget, wxT("DC needs a widget") );
+        m_gdkwindow = widget->window;
+        if (!gtk_widget_get_has_window(widget))
+            SetDeviceLocalOrigin(widget->allocation.x, widget->allocation.y);
+    }

 
 

-    m_context = window->GtkGetPangoDefaultContext();
+    m_context = window->GTKGetPangoDefaultContext();

     m_layout = pango_layout_new( m_context );
     m_fontdesc = pango_font_description_copy( widget->style->font_desc );
 
     m_layout = pango_layout_new( m_context );
     m_fontdesc = pango_font_description_copy( widget->style->font_desc );
 

-    m_gdkwindow = widget->window;
-

     // Window not realized ?
     if (!m_gdkwindow)
     {
     // Window not realized ?
     if (!m_gdkwindow)
     {


@@ -310,7 +312,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) :
          return;
     }
 
          return;
     }
 

-    m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
+    m_cmap = gtk_widget_get_colormap(widget);

 
     SetUpDC();
 
 
     SetUpDC();
 


@@ -323,7 +325,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) :
 
     m_window = window;
 
 
     m_window = window;
 

-    if (m_window && m_window->m_wxwindow && 
+    if (m_window && m_window->m_wxwindow &&

         (m_window->GetLayoutDirection() == wxLayout_RightToLeft))
     {
         // reverse sense
         (m_window->GetLayoutDirection() == wxLayout_RightToLeft))
     {
         // reverse sense


@@ -365,7 +367,7 @@ void wxWindowDCImpl::SetUpDC( bool isMemDC )
     }
 
     if (!done)
     }
 
     if (!done)

-    {    
+    {

         if (m_isScreenDC)
         {
             m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_SCREEN );
         if (m_isScreenDC)
         {
             m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_SCREEN );


@@ -424,36 +426,25 @@ void wxWindowDCImpl::SetUpDC( bool isMemDC )
     gdk_gc_set_function( m_penGC, GDK_COPY );
 
     /* clipping */
     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 );
-    }
+    gdk_gc_set_clip_rectangle( m_penGC, NULL );
+    gdk_gc_set_clip_rectangle( m_brushGC, NULL );
+    gdk_gc_set_clip_rectangle( m_textGC, NULL );
+    gdk_gc_set_clip_rectangle( m_bgGC, NULL );

 }
 
 void wxWindowDCImpl::DoGetSize( int* width, int* height ) const
 {
 }
 
 void wxWindowDCImpl::DoGetSize( int* width, int* height ) const
 {

-    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
+    wxCHECK_RET( m_window, wxT("GetSize() doesn't work without window") );

 
     m_window->GetSize(width, height);
 }
 
 bool wxWindowDCImpl::DoFloodFill(wxCoord x, wxCoord y,
 
     m_window->GetSize(width, height);
 }
 
 bool wxWindowDCImpl::DoFloodFill(wxCoord x, wxCoord y,

-                             const wxColour& col, int style)
+                                 const wxColour& col, wxFloodFillStyle style)

 {
 #if wxUSE_IMAGE
     extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
 {
 #if wxUSE_IMAGE
     extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,

-                              const wxColour & col, int style);
+                              const wxColour & col, wxFloodFillStyle style);

 
     return wxDoFloodFill( GetOwner(), x, y, col, style);
 #else
 
     return wxDoFloodFill( GetOwner(), x, y, col, style);
 #else


@@ -468,32 +459,40 @@ bool wxWindowDCImpl::DoFloodFill(wxCoord x, wxCoord y,
 
 bool wxWindowDCImpl::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
 {
 
 bool wxWindowDCImpl::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
 {

-#if wxUSE_IMAGE
-    // Generic (and therefore rather inefficient) method.
-    // Could be improved.
-    wxMemoryDC memdc;
-    wxBitmap bitmap(1, 1);
-    memdc.SelectObject(bitmap);
-    memdc.Blit(0, 0, 1, 1, GetOwner(), x1, y1);
-    memdc.SelectObject(wxNullBitmap);
-
-    wxImage image = bitmap.ConvertToImage();
-    col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
+    GdkImage* image = NULL;
+    if (m_gdkwindow)
+    {
+        const int x = LogicalToDeviceX(x1);
+        const int y = LogicalToDeviceY(y1);
+        wxRect rect;
+        gdk_drawable_get_size(m_gdkwindow, &rect.width, &rect.height);
+        if (rect.Contains(x, y))
+            image = gdk_drawable_get_image(m_gdkwindow, x, y, 1, 1);
+    }
+    if (image == NULL)
+    {
+        *col = wxColour();
+        return false;
+    }
+    GdkColormap* colormap = gdk_image_get_colormap(image);
+    const unsigned pixel = gdk_image_get_pixel(image, 0, 0);
+    if (colormap == NULL)
+        *col = pixel ? m_textForegroundColour : m_textBackgroundColour;
+    else
+    {
+        GdkColor c;
+        gdk_colormap_query_color(colormap, pixel, &c);
+        col->Set(c.red >> 8, c.green >> 8, c.blue >> 8);
+    }
+    g_object_unref(image);

     return true;
     return true;

-#else // !wxUSE_IMAGE
-    wxUnusedVar(x1);
-    wxUnusedVar(y1);
-    wxUnusedVar(col);
-
-    return false;
-#endif // wxUSE_IMAGE/!wxUSE_IMAGE

 }
 
 void wxWindowDCImpl::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
 }
 
 void wxWindowDCImpl::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 

-    if (m_pen.GetStyle() != wxTRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         if (m_gdkwindow)
             gdk_draw_line( m_gdkwindow, m_penGC, XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2) );
     {
         if (m_gdkwindow)
             gdk_draw_line( m_gdkwindow, m_penGC, XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2) );


@@ -507,7 +506,7 @@ void wxWindowDCImpl::DoCrossHair( wxCoord x, wxCoord y )
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 

-    if (m_pen.GetStyle() != wxTRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         int w = 0;
         int h = 0;
     {
         int w = 0;
         int h = 0;


@@ -522,6 +521,46 @@ void wxWindowDCImpl::DoCrossHair( wxCoord x, wxCoord y )
     }
 }
 
     }
 }
 

+void wxWindowDCImpl::DrawingSetup(GdkGC*& gc, bool& originChanged)
+{
+    gc = m_brushGC;
+    GdkPixmap* pixmap = NULL;
+    const int style = m_brush.GetStyle();
+
+    if (style == wxBRUSHSTYLE_STIPPLE || style == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE)
+    {
+        const wxBitmap* stipple = m_brush.GetStipple();
+        if (stipple->IsOk())
+        {
+            if (style == wxBRUSHSTYLE_STIPPLE)
+                pixmap = stipple->GetPixmap();
+            else if (stipple->GetMask())
+            {
+                pixmap = stipple->GetPixmap();
+                gc = m_textGC;
+            }
+        }
+    }
+    else if (m_brush.IsHatch())
+    {
+        pixmap = GetHatch(style);
+    }
+
+    int origin_x = 0;
+    int origin_y = 0;
+    if (pixmap)
+    {
+        int w, h;
+        gdk_drawable_get_size(pixmap, &w, &h);
+        origin_x = m_deviceOriginX % w;
+        origin_y = m_deviceOriginY % h;
+    }
+
+    originChanged = origin_x || origin_y;
+    if (originChanged)
+        gdk_gc_set_ts_origin(gc, origin_x, origin_y);
+}
+

 void wxWindowDCImpl::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
                             wxCoord xc, wxCoord yc )
 {
 void wxWindowDCImpl::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
                             wxCoord xc, wxCoord yc )
 {


@@ -565,47 +604,23 @@ void wxWindowDCImpl::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
 
     if (m_gdkwindow)
     {
 
     if (m_gdkwindow)
     {

-        if (m_brush.GetStyle() != wxTRANSPARENT)
+        if ( m_brush.IsNonTransparent() )

         {
         {

-            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_gdkwindow, 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_gdkwindow, 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_gdkwindow, 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_gdkwindow, 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_gdkwindow, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
-            }
+            GdkGC* gc;
+            bool originChanged;
+            DrawingSetup(gc, originChanged);
+
+            gdk_draw_arc(m_gdkwindow, gc, true, xxc-r, yyc-r, 2*r, 2*r, alpha1, alpha2);
+
+            if (originChanged)
+                gdk_gc_set_ts_origin(gc, 0, 0);

         }
 
         }
 

-        if (m_pen.GetStyle() != wxTRANSPARENT)
+        if ( m_pen.IsNonTransparent() )

         {
             gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
 
         {
             gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
 

-            if ((m_brush.GetStyle() != wxTRANSPARENT) && (alpha2 - alpha1 != 360*64))
+            if ( m_brush.IsNonTransparent() && (alpha2 - alpha1 != 360*64) )

             {
                 gdk_draw_line( m_gdkwindow, m_penGC, xx1, yy1, xxc, yyc );
                 gdk_draw_line( m_gdkwindow, m_penGC, xxc, yyc, xx2, yy2 );
             {
                 gdk_draw_line( m_gdkwindow, m_penGC, xx1, yy1, xxc, yyc );
                 gdk_draw_line( m_gdkwindow, m_penGC, xxc, yyc, xx2, yy2 );


@@ -635,43 +650,19 @@ void wxWindowDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxC
         wxCoord start = wxCoord(sa * 64.0);
         wxCoord end = wxCoord((ea-sa) * 64.0);
 
         wxCoord start = wxCoord(sa * 64.0);
         wxCoord end = wxCoord((ea-sa) * 64.0);
 

-        if (m_brush.GetStyle() != wxTRANSPARENT)
+        if ( m_brush.IsNonTransparent() )

         {
         {

-            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_gdkwindow, 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_gdkwindow, 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_gdkwindow, 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_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
-                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
-            }
-            else
-            {
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
-            }
+            GdkGC* gc;
+            bool originChanged;
+            DrawingSetup(gc, originChanged);
+
+            gdk_draw_arc(m_gdkwindow, gc, true, xx, yy, ww, hh, start, end);
+
+            if (originChanged)
+                gdk_gc_set_ts_origin(gc, 0, 0);

         }
 
         }
 

-        if (m_pen.GetStyle() != wxTRANSPARENT)
+        if ( m_pen.IsNonTransparent() )

             gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xx, yy, ww, hh, start, end );
     }
 
             gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xx, yy, ww, hh, start, end );
     }
 


@@ -683,7 +674,7 @@ void wxWindowDCImpl::DoDrawPoint( wxCoord x, wxCoord y )
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 

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

         gdk_draw_point( m_gdkwindow, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );
 
     CalcBoundingBox (x, y);
         gdk_draw_point( m_gdkwindow, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );
 
     CalcBoundingBox (x, y);


@@ -693,9 +684,11 @@ void wxWindowDCImpl::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCo
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 

-    if (m_pen.GetStyle() == wxTRANSPARENT) return;

     if (n <= 0) return;
 
     if (n <= 0) return;
 

+    if ( m_pen.IsTransparent() )
+        return;
+

     //Check, if scaling is necessary
     const bool doScale =
         xoffset != 0 || yoffset != 0 || XLOG2DEV(10) != 10 || YLOG2DEV(10) != 10;
     //Check, if scaling is necessary
     const bool doScale =
         xoffset != 0 || yoffset != 0 || XLOG2DEV(10) != 10 || YLOG2DEV(10) != 10;


@@ -723,7 +716,9 @@ void wxWindowDCImpl::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCo
         delete[] gpts;
 }
 
         delete[] gpts;
 }
 

-void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle) )
+void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[],
+                                    wxCoord xoffset, wxCoord yoffset,
+                                    wxPolygonFillMode WXUNUSED(fillStyle) )

 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 


@@ -752,43 +747,19 @@ void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wx
 
     if (m_gdkwindow)
     {
 
     if (m_gdkwindow)
     {

-        if (m_brush.GetStyle() != wxTRANSPARENT)
+        if ( m_brush.IsNonTransparent() )

         {
         {

-            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_gdkwindow, 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_gdkwindow, 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_gdkwindow, 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_gdkwindow, m_brushGC, TRUE, gdkpoints, n );
-                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
-            }
-            else
-            {
-                gdk_draw_polygon( m_gdkwindow, m_brushGC, TRUE, gdkpoints, n );
-            }
+            GdkGC* gc;
+            bool originChanged;
+            DrawingSetup(gc, originChanged);
+
+            gdk_draw_polygon(m_gdkwindow, gc, true, gdkpoints, n);
+
+            if (originChanged)
+                gdk_gc_set_ts_origin(gc, 0, 0);

         }
 
         }
 

-        if (m_pen.GetStyle() != wxTRANSPARENT)
+        if ( m_pen.IsNonTransparent() )

         {
 /*
             for (i = 0 ; i < n ; i++)
         {
 /*
             for (i = 0 ; i < n ; i++)


@@ -827,47 +798,22 @@ void wxWindowDCImpl::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoo
 
     if (m_gdkwindow)
     {
 
     if (m_gdkwindow)
     {

-        if (m_brush.GetStyle() != wxTRANSPARENT)
+        if ( m_brush.IsNonTransparent() )

         {
         {

-            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_gdkwindow, 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_gdkwindow, 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_gdkwindow, 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_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh );
-                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
-            }
-            else
-            {
-                gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh );
-            }
+            GdkGC* gc;
+            bool originChanged;
+            DrawingSetup(gc, originChanged);
+
+            gdk_draw_rectangle(m_gdkwindow, gc, true, xx, yy, ww, hh);
+
+            if (originChanged)
+                gdk_gc_set_ts_origin(gc, 0, 0);

         }
 
         }
 

-        if (m_pen.GetStyle() != wxTRANSPARENT)
+        if ( m_pen.IsNonTransparent() )

         {
         {

-#if 1

             if ((m_pen.GetWidth() == 2) && (m_pen.GetCap() == wxCAP_ROUND) &&
             if ((m_pen.GetWidth() == 2) && (m_pen.GetCap() == wxCAP_ROUND) &&

-                (m_pen.GetJoin() == wxJOIN_ROUND) && (m_pen.GetStyle() == wxSOLID))
+                (m_pen.GetJoin() == wxJOIN_ROUND) && (m_pen.GetStyle() == wxPENSTYLE_SOLID))

             {
                 // Use 2 1-line rects instead
                 gdk_gc_set_line_attributes( m_penGC, 1, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
             {
                 // Use 2 1-line rects instead
                 gdk_gc_set_line_attributes( m_penGC, 1, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );


@@ -888,7 +834,6 @@ void wxWindowDCImpl::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoo
                 gdk_gc_set_line_attributes( m_penGC, 2, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
             }
             else
                 gdk_gc_set_line_attributes( m_penGC, 2, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
             }
             else

-#endif

             {
                 // Just use X11 for other cases
                 gdk_draw_rectangle( m_gdkwindow, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
             {
                 // Just use X11 for other cases
                 gdk_draw_rectangle( m_gdkwindow, m_penGC, FALSE, xx, yy, ww-1, hh-1 );


@@ -929,7 +874,7 @@ void wxWindowDCImpl::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width
 
     // CMB: adjust size if outline is drawn otherwise the result is
     // 1 pixel too wide and high
 
     // CMB: adjust size if outline is drawn otherwise the result is
     // 1 pixel too wide and high

-    if (m_pen.GetStyle() != wxTRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         ww--;
         hh--;
     {
         ww--;
         hh--;


@@ -944,68 +889,24 @@ void wxWindowDCImpl::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width
         if (dd > hh) dd = hh;
         rr = dd / 2;
 
         if (dd > hh) dd = hh;
         rr = dd / 2;
 

-        if (m_brush.GetStyle() != wxTRANSPARENT)
+        if ( m_brush.IsNonTransparent() )

         {
         {

-            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_gdkwindow, m_textGC, TRUE, xx+rr, yy, ww-dd+1, hh );
-                gdk_draw_rectangle( m_gdkwindow, m_textGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
-                gdk_draw_arc( m_gdkwindow, m_textGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
-                gdk_draw_arc( m_gdkwindow, m_textGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
-                gdk_draw_arc( m_gdkwindow, m_textGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
-                gdk_draw_arc( m_gdkwindow, 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_gdkwindow, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
-                gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
-                gdk_draw_arc( m_gdkwindow, 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_gdkwindow, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
-                gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
-                gdk_draw_arc( m_gdkwindow, 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_gdkwindow, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
-                gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
-                gdk_draw_arc( m_gdkwindow, 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_gdkwindow, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
-                gdk_draw_rectangle( m_gdkwindow, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
-            }
+            GdkGC* gc;
+            bool originChanged;
+            DrawingSetup(gc, originChanged);
+
+            gdk_draw_rectangle(m_gdkwindow, gc, true, xx+rr, yy, ww-dd+1, hh);
+            gdk_draw_rectangle(m_gdkwindow, gc, true, xx, yy+rr, ww, hh-dd+1);
+            gdk_draw_arc(m_gdkwindow, gc, true, xx, yy, dd, dd, 90*64, 90*64);
+            gdk_draw_arc(m_gdkwindow, gc, true, xx+ww-dd, yy, dd, dd, 0, 90*64);
+            gdk_draw_arc(m_gdkwindow, gc, true, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64);
+            gdk_draw_arc(m_gdkwindow, gc, true, xx, yy+hh-dd, dd, dd, 180*64, 90*64);
+
+            if (originChanged)
+                gdk_gc_set_ts_origin(gc, 0, 0);

         }
 
         }
 

-        if (m_pen.GetStyle() != wxTRANSPARENT)
+        if ( m_pen.IsNonTransparent() )

         {
             gdk_draw_line( m_gdkwindow, m_penGC, xx+rr+1, yy, xx+ww-rr, yy );
             gdk_draw_line( m_gdkwindow, m_penGC, xx+rr+1, yy+hh, xx+ww-rr, yy+hh );
         {
             gdk_draw_line( m_gdkwindow, m_penGC, xx+rr+1, yy, xx+ww-rr, yy );
             gdk_draw_line( m_gdkwindow, m_penGC, xx+rr+1, yy+hh, xx+ww-rr, yy+hh );


@@ -1038,44 +939,28 @@ void wxWindowDCImpl::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord
 
     if (m_gdkwindow)
     {
 
     if (m_gdkwindow)
     {

-        if (m_brush.GetStyle() != wxTRANSPARENT)
+        if ( m_brush.IsNonTransparent() )

         {
         {

-            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_gdkwindow, 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_gdkwindow, 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_gdkwindow, 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_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
-                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
-            }
-            else
+            GdkGC* gc;
+            bool originChanged;
+            DrawingSetup(gc, originChanged);
+
+            // If the pen is transparent pen we increase the size
+            // for better compatibility with other platforms.
+            if ( m_pen.IsNonTransparent() )

             {
             {

-                gdk_draw_arc( m_gdkwindow, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
+                ++ww;
+                ++hh;

             }
             }

+
+            gdk_draw_arc(m_gdkwindow, gc, true, xx, yy, ww, hh, 0, 360*64);
+
+            if (originChanged)
+                gdk_gc_set_ts_origin(gc, 0, 0);

         }
 
         }
 

-        if (m_pen.GetStyle() != wxTRANSPARENT)
-            gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xx, yy, ww, hh, 0, 360*64 );
+        if ( m_pen.IsNonTransparent() )
+            gdk_draw_arc( m_gdkwindow, m_penGC, false, xx, yy, ww, hh, 0, 360*64 );

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


@@ -1088,125 +973,205 @@ void wxWindowDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
     DoDrawBitmap( (const wxBitmap&)icon, x, y, true );
 }
 
     DoDrawBitmap( (const wxBitmap&)icon, x, y, true );
 }
 

+// scale a pixbuf, return new pixbuf, unref old one
+static GdkPixbuf*
+Scale(GdkPixbuf* pixbuf, int dst_w, int dst_h, double sx, double sy)
+{
+    GdkPixbuf* pixbuf_scaled = gdk_pixbuf_new(
+        GDK_COLORSPACE_RGB, gdk_pixbuf_get_has_alpha(pixbuf), 8, dst_w, dst_h);
+    gdk_pixbuf_scale(pixbuf, pixbuf_scaled,
+        0, 0, dst_w, dst_h, 0, 0, sx, sy, GDK_INTERP_NEAREST);
+    g_object_unref(pixbuf);
+    return pixbuf_scaled;
+}
+
+// scale part of a pixmap using pixbuf scaling, return pixbuf
+static GdkPixbuf*
+Scale(GdkPixmap* pixmap, int x, int y, int w, int h, int dst_w, int dst_h, double sx, double sy)
+{
+    GdkPixbuf* pixbuf = gdk_pixbuf_get_from_drawable(
+        NULL, pixmap, NULL, x, y, 0, 0, w, h);
+    return Scale(pixbuf, dst_w, dst_h, sx, sy);
+}
+
+// scale part of a mask pixmap, return new mask, unref old one
+static GdkPixmap*
+ScaleMask(GdkPixmap* mask, int x, int y, int w, int h, int dst_w, int dst_h, double sx, double sy)
+{
+    GdkPixbuf* pixbuf = Scale(mask, x, y, w, h, dst_w, dst_h, sx, sy);
+
+    // convert black and white pixbuf back to a mono pixmap
+    const unsigned out_rowstride = (dst_w + 7) / 8;
+    const size_t data_size = out_rowstride * size_t(dst_h);
+    char* data = new char[data_size];
+    char* out = data;
+    const guchar* row = gdk_pixbuf_get_pixels(pixbuf);
+    const int rowstride = gdk_pixbuf_get_rowstride(pixbuf);
+    memset(data, 0, data_size);
+    for (int j = 0; j < dst_h; j++, row += rowstride, out += out_rowstride)
+    {
+        const guchar* in = row;
+        for (int i = 0; i < dst_w; i++, in += 3)
+            if (*in)
+                out[i >> 3] |= 1 << (i & 7);
+    }
+    g_object_unref(pixbuf);
+    GdkPixmap* pixmap = gdk_bitmap_create_from_data(mask, data, dst_w, dst_h);
+    delete[] data;
+    g_object_unref(mask);
+    return pixmap;
+}
+
+// Make a new mask from part of a mask and a clip region.
+// Return new mask, unref old one.
+static GdkPixmap*
+ClipMask(GdkPixmap* mask, GdkRegion* clipRegion, int x, int y, int dst_x, int dst_y, int w, int h)
+{
+    GdkGCValues gcValues;
+    gcValues.foreground.pixel = 0;
+    GdkGC* gc = gdk_gc_new_with_values(mask, &gcValues, GDK_GC_FOREGROUND);
+    GdkPixmap* pixmap = gdk_pixmap_new(mask, w, h, 1);
+    // clear new mask, so clipped areas will be masked
+    gdk_draw_rectangle(pixmap, gc, true, 0, 0, w, h);
+    gdk_gc_set_clip_region(gc, clipRegion);
+    gdk_gc_set_clip_origin(gc, -dst_x, -dst_y);
+    // draw old mask onto new one, with clip
+    gdk_draw_drawable(pixmap, gc, mask, x, y, 0, 0, w, h);
+    g_object_unref(gc);
+    g_object_unref(mask);
+    return pixmap;
+}
+
+// make a color pixmap from part of a mono one, using text fg/bg colors
+GdkPixmap*
+wxWindowDCImpl::MonoToColor(GdkPixmap* monoPixmap, int x, int y, int w, int h) const
+{
+    GdkPixmap* pixmap = gdk_pixmap_new(m_gdkwindow, w, h, -1);
+    GdkGCValues gcValues;
+    gcValues.foreground.pixel = m_textForegroundColour.GetColor()->pixel;
+    gcValues.background.pixel = m_textBackgroundColour.GetColor()->pixel;
+    gcValues.stipple = monoPixmap;
+    gcValues.fill = GDK_OPAQUE_STIPPLED;
+    gcValues.ts_x_origin = -x;
+    gcValues.ts_y_origin = -y;
+    GdkGC* gc = gdk_gc_new_with_values(pixmap, &gcValues, GdkGCValuesMask(
+        GDK_GC_FOREGROUND | GDK_GC_BACKGROUND | GDK_GC_STIPPLE | GDK_GC_FILL |
+        GDK_GC_TS_X_ORIGIN | GDK_GC_TS_Y_ORIGIN));
+    gdk_draw_rectangle(pixmap, gc, true, 0, 0, w, h);
+    g_object_unref(gc);
+    return pixmap;
+}
+

 void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
                                wxCoord x, wxCoord y,
                                bool useMask )
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
                                wxCoord x, wxCoord y,
                                bool useMask )
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );

-

     wxCHECK_RET( bitmap.IsOk(), wxT("invalid bitmap") );
 
     wxCHECK_RET( bitmap.IsOk(), wxT("invalid bitmap") );
 

-    bool is_mono = bitmap.GetDepth() == 1;
-
-    // scale/translate size and position
-    int xx = XLOG2DEV(x);
-    int yy = YLOG2DEV(y);
+    if (!m_gdkwindow) return;

 
 

-    int w = bitmap.GetWidth();
-    int h = bitmap.GetHeight();
+    const int w = bitmap.GetWidth();
+    const int h = bitmap.GetHeight();

 
 

-    if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
-        xx -= w;
+    // notice that as the bitmap is not drawn upside down (or right to left)
+    // even if the corresponding axis direction is inversed, we need to take it
+    // into account when calculating its bounding box
+    CalcBoundingBox(x, y);
+    CalcBoundingBox(x + m_signX*w, y + m_signY*h);

 
 

-    CalcBoundingBox( x, y );
-    CalcBoundingBox( x + w, y + h );
-
-    if (!m_gdkwindow) return;
+    // device coords
+    int xx = LogicalToDeviceX(x);
+    const int yy = LogicalToDeviceY(y);
+    const int ww = LogicalToDeviceXRel(w);
+    const int hh = LogicalToDeviceYRel(h);

 
 

-    int ww = XLOG2DEVREL(w);
-    int hh = YLOG2DEVREL(h);
+    if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
+        xx -= ww;

 
 

-    // compare to current clipping region
-    if (!m_currentClippingRegion.IsNull())
+    GdkRegion* const clipRegion = m_currentClippingRegion.GetRegion();
+    // determine clip region overlap
+    int overlap = wxInRegion;
+    if (clipRegion)

     {
     {

-        wxRegion tmp( xx,yy,ww,hh );
-        tmp.Intersect( m_currentClippingRegion );
-        if (tmp.IsEmpty())
+        overlap = m_currentClippingRegion.Contains(xx, yy, ww, hh);
+        if (overlap == wxOutRegion)

             return;
     }
 
             return;
     }
 

-    // scale bitmap if required
-    wxBitmap use_bitmap = bitmap;
-    if ((w != ww) || (h != hh))
-        use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
-
-    // apply mask if any
-    GdkBitmap *mask = (GdkBitmap *) NULL;
-    if (useMask && use_bitmap.GetMask())
-        mask = use_bitmap.GetMask()->GetBitmap();
+    const bool isScaled = ww != w || hh != h;
+    const bool hasAlpha = bitmap.HasAlpha();
+    GdkGC* const use_gc = m_penGC;

 
 

-    GdkGC* use_gc = is_mono ? m_textGC : m_penGC;
-
-    GdkBitmap *new_mask = (GdkBitmap*) NULL;
-
-    if (mask != NULL)
+    GdkPixmap* mask = NULL;
+    // mask does not work when drawing a pixbuf with alpha
+    if (useMask && !hasAlpha)

     {
     {

-        if (!m_currentClippingRegion.IsNull())
+        wxMask* m = bitmap.GetMask();
+        if (m)
+            mask = m->GetBitmap();
+    }
+    if (mask)
+    {
+        g_object_ref(mask);
+        if (isScaled)
+            mask = ScaleMask(mask, 0, 0, w, h, ww, hh, m_scaleX, m_scaleY);
+        if (overlap == wxPartRegion)

         {
         {

-            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 );
-            mask = new_mask;
-            g_object_unref (gc);
+            // need a new mask that also masks the clipped area,
+            // because gc can't have both a mask and a clip region
+            mask = ClipMask(mask, clipRegion, 0, 0, xx, yy, ww, hh);

         }
         }

-

         gdk_gc_set_clip_mask(use_gc, mask);
         gdk_gc_set_clip_origin(use_gc, xx, yy);
     }
 
         gdk_gc_set_clip_mask(use_gc, mask);
         gdk_gc_set_clip_origin(use_gc, xx, yy);
     }
 

-    // Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For
-    // drawing a mono-bitmap (XBitmap) we use the current text GC
-    if (is_mono)
+    // determine whether to use pixmap or pixbuf
+    GdkPixmap* pixmap = NULL;
+    GdkPixbuf* pixbuf = NULL;
+    if (bitmap.HasPixmap())
+        pixmap = bitmap.GetPixmap();
+    if (pixmap && gdk_drawable_get_depth(pixmap) == 1)

     {
     {

-        GdkPixmap *bitmap2 = gdk_pixmap_new( wxGetRootWindow()->window, ww, hh, -1 );
-        GdkGC *gc = gdk_gc_new( bitmap2 );
-        gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
-        gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
-        gdk_wx_draw_bitmap(bitmap2, gc, use_bitmap.GetPixmap(), 0, 0);
+        // convert mono pixmap to color using text fg/bg colors
+        pixmap = MonoToColor(pixmap, 0, 0, w, h);
+    }
+    else if (hasAlpha || pixmap == NULL)
+    {
+        pixmap = NULL;
+        pixbuf = bitmap.GetPixbuf();
+        g_object_ref(pixbuf);
+    }
+    else
+    {
+        g_object_ref(pixmap);
+    }

 
 

-        gdk_draw_drawable(m_gdkwindow, use_gc, bitmap2, 0, 0, xx, yy, -1, -1);
+    if (isScaled)
+    {
+        if (pixbuf)
+            pixbuf = Scale(pixbuf, ww, hh, m_scaleX, m_scaleY);
+        else
+            pixbuf = Scale(pixmap, 0, 0, w, h, ww, hh, m_scaleX, m_scaleY);
+    }

 
 

-        g_object_unref (bitmap2);
-        g_object_unref (gc);
+    if (pixbuf)
+    {
+        gdk_draw_pixbuf(m_gdkwindow, use_gc, pixbuf,
+            0, 0, xx, yy, ww, hh, GDK_RGB_DITHER_NORMAL, 0, 0);
+        g_object_unref(pixbuf);

     }
     else
     {
     }
     else
     {

-        if (use_bitmap.HasPixbuf())
-        {
-            gdk_draw_pixbuf(m_gdkwindow, use_gc,
-                            use_bitmap.GetPixbuf(),
-                            0, 0, xx, yy, -1, -1,
-                            GDK_RGB_DITHER_NORMAL, xx, yy);
-        }
-        else
-        {
-            gdk_draw_drawable(m_gdkwindow, use_gc,
-                              use_bitmap.GetPixmap(),
-                              0, 0, xx, yy, -1, -1);
-        }
+        gdk_draw_drawable(m_gdkwindow, use_gc, pixmap, 0, 0, xx, yy, ww, hh);

     }
 
     }
 

-    // remove mask again if any
-    if (mask != NULL)
+    if (pixmap)
+        g_object_unref(pixmap);
+    if (mask)

     {
     {

-        gdk_gc_set_clip_mask(use_gc, NULL);
-        gdk_gc_set_clip_origin(use_gc, 0, 0);
-        if (!m_currentClippingRegion.IsNull())
-            gdk_gc_set_clip_region(use_gc, m_currentClippingRegion.GetRegion());
-        if (new_mask != NULL)
-            g_object_unref(new_mask);
+        g_object_unref(mask);
+        gdk_gc_set_clip_region(use_gc, clipRegion);

     }
 }
 
     }
 }
 


@@ -1214,258 +1179,183 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
                          wxCoord width, wxCoord height,
                          wxDC *source,
                          wxCoord xsrc, wxCoord ysrc,
                          wxCoord width, wxCoord height,
                          wxDC *source,
                          wxCoord xsrc, wxCoord ysrc,

-                         int logical_func,
+                         wxRasterOperationMode logical_func,

                          bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask )
 {
     wxCHECK_MSG( IsOk(), false, wxT("invalid window dc") );
                          bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask )
 {
     wxCHECK_MSG( IsOk(), false, wxT("invalid window dc") );

-

     wxCHECK_MSG( source, false, wxT("invalid source dc") );
 
     if (!m_gdkwindow) return false;
 
     wxCHECK_MSG( source, false, wxT("invalid source dc") );
 
     if (!m_gdkwindow) return false;
 

-    // transform the source DC coords to the device ones
-    xsrc = source->LogicalToDeviceX(xsrc);
-    ysrc = source->LogicalToDeviceY(ysrc);
-
-    wxBitmap selected;
-    wxMemoryDC *memDC = wxDynamicCast(source, wxMemoryDC);
-    if ( memDC )
+    GdkDrawable* srcDrawable = NULL;
+    GdkPixmap* mask = NULL;
+    wxMemoryDC* memDC = wxDynamicCast(source, wxMemoryDC);
+    if (memDC)

     {
     {

-        selected = memDC->GetSelectedBitmap();
-        if ( !selected.IsOk() )
+        const wxBitmap& bitmap = memDC->GetSelectedBitmap();
+        if (!bitmap.IsOk())

             return false;
             return false;

+        srcDrawable = bitmap.GetPixmap();
+        if (useMask)
+        {
+            wxMask* m = bitmap.GetMask();
+            if (m)
+                mask = m->GetBitmap();
+        }

     }
     }

-
-    bool use_bitmap_method = false;
-    bool is_mono = false;
-
-    if (xsrcMask == -1 && ysrcMask == -1)
+    else

     {
     {

-        xsrcMask = xsrc;
-        ysrcMask = ysrc;
+        wxDCImpl* impl = source->GetImpl();
+        wxWindowDCImpl* gtk_impl = wxDynamicCast(impl, wxWindowDCImpl);
+        if (gtk_impl)
+            srcDrawable = gtk_impl->GetGDKWindow();
+        if (srcDrawable == NULL)
+            return false;

     }
 
     }
 

-    if (selected.IsOk())
-    {
-        is_mono = (selected.GetDepth() == 1);
+    CalcBoundingBox(xdest, ydest);
+    CalcBoundingBox(xdest + width, ydest + height);

 
 

-        // we use the "XCopyArea" way to copy a memory dc into
-        // a different window if the memory dc BOTH
-        // a) doesn't have any mask or its mask isn't used
-        // b) it is clipped
-        // c) is not 1-bit
+    // source device coords
+    int src_x = source->LogicalToDeviceX(xsrc);
+    int src_y = source->LogicalToDeviceY(ysrc);
+    int src_w = source->LogicalToDeviceXRel(width);
+    int src_h = source->LogicalToDeviceYRel(height);

 
 

-        if (useMask && (selected.GetMask()))
-        {
-            // we HAVE TO use the direct way for memory dcs
-            // that have mask since the XCopyArea doesn't know
-            // about masks
-            use_bitmap_method = true;
-        }
-        else if (is_mono)
-        {
-            // we HAVE TO use the direct way for memory dcs
-            // that are bitmaps because XCopyArea doesn't cope
-            // with different bit depths
-            use_bitmap_method = true;
-        }
-        else if ((xsrc == 0) && (ysrc == 0) &&
-                 (width == selected.GetWidth()) &&
-                 (height == selected.GetHeight()))
+    // Clip source rect to source dc.
+    // Only necessary when scaling, to avoid GDK errors when
+    // converting to pixbuf, but no harm in always doing it.
+    // If source rect changes, it also changes the dest rect.
+    wxRect clip;
+    gdk_drawable_get_size(srcDrawable, &clip.width, &clip.height);
+    clip.Intersect(wxRect(src_x, src_y, src_w, src_h));
+    if (src_w != clip.width || src_h != clip.height)
+    {
+        if (clip.width == 0)
+            return true;
+
+        src_w = clip.width;
+        src_h = clip.height;
+        width  = source->DeviceToLogicalXRel(src_w);
+        height = source->DeviceToLogicalYRel(src_h);
+        if (src_x != clip.x || src_y != clip.y)

         {
         {

-            // 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;
+            xdest += source->DeviceToLogicalXRel(clip.x - src_x);
+            ydest += source->DeviceToLogicalYRel(clip.y - src_y);
+            src_x = clip.x;
+            src_y = clip.y;

         }
     }
 
         }
     }
 

-    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);
+    // destination device coords
+    const int dst_x = LogicalToDeviceX(xdest);
+    const int dst_y = LogicalToDeviceY(ydest);
+    const int dst_w = LogicalToDeviceXRel(width);
+    const int dst_h = LogicalToDeviceYRel(height);

 
 

-    // compare to current clipping region
-    if (!m_currentClippingRegion.IsNull())
+    GdkRegion* const clipRegion = m_currentClippingRegion.GetRegion();
+    // determine dest clip region overlap
+    int overlap = wxInRegion;
+    if (clipRegion)

     {
     {

-        wxRegion tmp( xx,yy,ww,hh );
-        tmp.Intersect( m_currentClippingRegion );
-        if (tmp.IsEmpty())
+        overlap = m_currentClippingRegion.Contains(dst_x, dst_y, dst_w, dst_h);
+        if (overlap == wxOutRegion)

             return true;
     }
 
             return true;
     }
 

-    int old_logical_func = m_logicalFunction;
-    SetLogicalFunction( logical_func );
-
-    if (use_bitmap_method)
+    const bool isScaled = src_w != dst_w || src_h != dst_h;
+    double scale_x = 0;
+    double scale_y = 0;
+    if (isScaled)

     {
     {

-        // scale/translate bitmap size
-        wxCoord bm_width = selected.GetWidth();
-        wxCoord bm_height = selected.GetHeight();
-
-        // Get clip coords for the bitmap. If we don't
-        // use wxBitmap::Rescale(), which can clip the
-        // bitmap, these are the same as the original
-        // coordinates
-        wxCoord cx = xx;
-        wxCoord cy = yy;
-        wxCoord cw = ww;
-        wxCoord ch = hh;
-
-        // interpret userscale of src too
-        double xsc,ysc;
-        memDC->GetUserScale(&xsc,&ysc);
-        bm_width = (int) (bm_width / xsc);
-        bm_height = (int) (bm_height / ysc);
+        // get source to dest scale
+        double usx, usy, lsx, lsy;
+        source->GetUserScale(&usx, &usy);
+        source->GetLogicalScale(&lsx, &lsy);
+        scale_x = m_scaleX / (usx * lsx);
+        scale_y = m_scaleY / (usy * lsy);
+    }

 
 

-        wxCoord bm_ww = XLOG2DEVREL( bm_width );
-        wxCoord bm_hh = YLOG2DEVREL( bm_height );
+    GdkGC* const use_gc = m_penGC;

 
 

-        // Scale bitmap if required
-        wxBitmap use_bitmap = selected;
-        if ((selected.GetWidth()!= bm_ww) || ( selected.GetHeight()!= bm_hh))
+    if (mask)
+    {
+        g_object_ref(mask);
+        int srcMask_x = src_x;
+        int srcMask_y = src_y;
+        if (xsrcMask != -1 || ysrcMask != -1)

         {
         {

-            // This indicates that the blitting code below will get
-            // a clipped bitmap and therefore needs to move the origin
-            // accordingly
-            wxRegion tmp( xx,yy,ww,hh );
-            if (!m_currentClippingRegion.IsNull())
-                tmp.Intersect( m_currentClippingRegion );
-            tmp.GetBox(cx,cy,cw,ch);
-
-            // Scale and clipped bitmap
-            use_bitmap = selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
+            srcMask_x = source->LogicalToDeviceX(xsrcMask);
+            srcMask_y = source->LogicalToDeviceY(ysrcMask);

         }
         }

-
-        // apply mask if any
-        GdkBitmap *mask = (GdkBitmap *) NULL;
-        if (useMask && use_bitmap.GetMask())
-            mask = use_bitmap.GetMask()->GetBitmap();
-
-        GdkGC* use_gc = is_mono ? m_textGC : m_penGC;
-
-        GdkBitmap *new_mask = (GdkBitmap*) NULL;
-
-        if (mask != NULL)
+        if (isScaled)

         {
         {

-            if (!m_currentClippingRegion.IsNull())
-            {
-                GdkColor col;
-                new_mask = gdk_pixmap_new( wxGetRootWindow()->window, bm_ww, bm_hh, 1 );
-                GdkGC *gc = gdk_gc_new( new_mask );
-                col.pixel = 0;
-                gdk_gc_set_foreground( gc, &col );
-                gdk_gc_set_ts_origin( gc, -xsrcMask, -ysrcMask);
-                gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
-                col.pixel = 0;
-                gdk_gc_set_background( gc, &col );
-                col.pixel = 1;
-                gdk_gc_set_foreground( gc, &col );
-                gdk_gc_set_clip_region( gc, m_currentClippingRegion.GetRegion() );
-                // was: gdk_gc_set_clip_origin( gc, -xx, -yy );
-                gdk_gc_set_clip_origin( gc, -cx, -cy );
-                gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
-                gdk_gc_set_stipple( gc, mask );
-                gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
-                mask = new_mask;
-                g_object_unref (gc);
-            }
-
-            gdk_gc_set_clip_mask(use_gc, mask);
-            if (new_mask != NULL)
-                gdk_gc_set_clip_origin(use_gc, cx, cy);
-            else
-                gdk_gc_set_clip_origin(use_gc, cx - xsrcMask, cy - ysrcMask);
+            mask = ScaleMask(mask, srcMask_x, srcMask_y,
+                src_w, src_h, dst_w, dst_h, scale_x, scale_y);
+            srcMask_x = 0;
+            srcMask_y = 0;

         }
         }

-
-        // 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)
+        if (overlap == wxPartRegion)

         {
         {

-            GdkPixmap *bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bm_ww, bm_hh, -1 );
-            GdkGC *gc = gdk_gc_new( bitmap );
-            gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
-            gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
-            gdk_wx_draw_bitmap(bitmap, gc, use_bitmap.GetPixmap(), 0, 0);
-
-            gdk_draw_drawable(m_gdkwindow, use_gc, bitmap, xsrc, ysrc, cx, cy, cw, ch);
-
-            g_object_unref (bitmap);
-            g_object_unref (gc);
-        }
-        else
-        {
-            // was: gdk_draw_drawable( m_gdkwindow, m_penGC, use_bitmap.GetPixmap(), xsrc, ysrc, xx, yy, ww, hh );
-            gdk_draw_drawable(m_gdkwindow, use_gc, use_bitmap.GetPixmap(), xsrc, ysrc, cx, cy, cw, ch);
+            // need a new mask that also masks the clipped area,
+            // because gc can't have both a mask and a clip region
+            mask = ClipMask(mask, clipRegion,
+                srcMask_x, srcMask_y, dst_x, dst_y, dst_w, dst_h);
+            srcMask_x = 0;
+            srcMask_y = 0;

         }
         }

+        gdk_gc_set_clip_mask(use_gc, mask);
+        gdk_gc_set_clip_origin(use_gc, dst_x - srcMask_x, dst_y - srcMask_y);
+    }

 
 

-        // remove mask again if any
-        if (mask != NULL)
-        {
-            gdk_gc_set_clip_mask(use_gc, NULL);
-            gdk_gc_set_clip_origin(use_gc, 0, 0);
-            if (!m_currentClippingRegion.IsNull())
-                gdk_gc_set_clip_region(use_gc, m_currentClippingRegion.GetRegion());
-        }
+    GdkPixmap* pixmap = NULL;
+    if (gdk_drawable_get_depth(srcDrawable) == 1)
+    {
+        // Convert mono pixmap to color using text fg/bg colors.
+        // Scaling/drawing is simpler if this is done first.
+        pixmap = MonoToColor(srcDrawable, src_x, src_y, src_w, src_h);
+        srcDrawable = pixmap;
+        src_x = 0;
+        src_y = 0;
+    }

 
 

-        if (new_mask)
-            g_object_unref (new_mask);
+    const wxRasterOperationMode logical_func_save = m_logicalFunction;
+    SetLogicalFunction(logical_func);
+    if (memDC == NULL)
+        gdk_gc_set_subwindow(use_gc, GDK_INCLUDE_INFERIORS);
+
+    if (isScaled)
+    {
+        GdkPixbuf* pixbuf = Scale(srcDrawable,
+            src_x, src_y, src_w, src_h, dst_w, dst_h, scale_x, scale_y);
+        gdk_draw_pixbuf(m_gdkwindow, use_gc, pixbuf,
+            0, 0, dst_x, dst_y, dst_w, dst_h, GDK_RGB_DITHER_NONE, 0, 0);
+        g_object_unref(pixbuf);

     }
     }

-    else // use_bitmap_method
+    else

     {
     {

-        if (selected.IsOk() && ((width != ww) || (height != hh)))
-        {
-            // get clip coords
-            wxRegion tmp( xx,yy,ww,hh );
-            tmp.Intersect( m_currentClippingRegion );
-            wxCoord cx,cy,cw,ch;
-            tmp.GetBox(cx,cy,cw,ch);
-
-            // rescale bitmap
-            wxBitmap bitmap = selected.Rescale( cx-xx, cy-yy, cw, ch, ww, hh );
-
-            // draw scaled bitmap
-            // was: gdk_draw_drawable( m_gdkwindow, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
-            gdk_draw_drawable( m_gdkwindow, m_penGC, bitmap.GetPixmap(), 0, 0, cx, cy, -1, -1 );
-        }
-        else
-        {
-            // No scaling and not a memory dc with a mask either
-            GdkWindow* window = NULL;
-            wxDCImpl *impl = source->GetImpl();
-            wxWindowDCImpl *gtk_impl = wxDynamicCast(impl, wxWindowDCImpl);
-            if (gtk_impl)
-                window = gtk_impl->GetGDKWindow();
-            if ( !window )
-            {
-                SetLogicalFunction( old_logical_func );
-                return false;
-            }
-
-            // copy including child window contents
-            gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
-            gdk_draw_drawable( m_gdkwindow, m_penGC,
-                               window,
-                               xsrc, ysrc, xx, yy,
-                               width, height );
-            gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
-        }
+        gdk_draw_drawable(m_gdkwindow, use_gc, srcDrawable,
+            src_x, src_y, dst_x, dst_y, dst_w, dst_h);

     }
 
     }
 

-    SetLogicalFunction( old_logical_func );
+    SetLogicalFunction(logical_func_save);
+    if (memDC == NULL)
+        gdk_gc_set_subwindow(use_gc, GDK_CLIP_BY_CHILDREN);

 
 

+    if (pixmap)
+        g_object_unref(pixmap);
+    if (mask)
+    {
+        g_object_unref(mask);
+        gdk_gc_set_clip_region(use_gc, clipRegion);
+    }

     return true;
 }
 
     return true;
 }
 

-void wxWindowDCImpl::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
+void wxWindowDCImpl::DoDrawText(const wxString& text,
+                                wxCoord xLogical,
+                                wxCoord yLogical)

 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 


@@ -1473,18 +1363,18 @@ void wxWindowDCImpl::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
 
     if (text.empty()) return;
 
 
     if (text.empty()) return;
 

-    x = XLOG2DEV(x);
-    y = YLOG2DEV(y);
+    wxCoord x = XLOG2DEV(xLogical),
+            y = YLOG2DEV(yLogical);

 
     wxCHECK_RET( m_context, wxT("no Pango context") );
     wxCHECK_RET( m_layout, wxT("no Pango layout") );
     wxCHECK_RET( m_fontdesc, wxT("no Pango font description") );
 
 
     wxCHECK_RET( m_context, wxT("no Pango context") );
     wxCHECK_RET( m_layout, wxT("no Pango layout") );
     wxCHECK_RET( m_fontdesc, wxT("no Pango font description") );
 

-    gdk_pango_context_set_colormap( m_context, m_cmap );
+    gdk_pango_context_set_colormap( m_context, m_cmap );  // not needed in gtk+ >= 2.6

 
     bool underlined = m_font.IsOk() && m_font.GetUnderlined();
 
 
     bool underlined = m_font.IsOk() && m_font.GetUnderlined();
 

-    const wxCharBuffer data = wxGTK_CONV( text );
+    wxCharBuffer data = wxGTK_CONV(text);

     if ( !data )
         return;
     size_t datalen = strlen(data);
     if ( !data )
         return;
     size_t datalen = strlen(data);


@@ -1494,7 +1384,6 @@ void wxWindowDCImpl::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
     static bool pangoOk = !wx_pango_version_check(1, 16, 0);
 
     bool needshack = underlined && !pangoOk;
     static bool pangoOk = !wx_pango_version_check(1, 16, 0);
 
     bool needshack = underlined && !pangoOk;

-    char *hackstring = NULL;

 
     if (needshack)
     {
 
     if (needshack)
     {


@@ -1506,28 +1395,20 @@ void wxWindowDCImpl::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         // empty space characters and give them a dummy colour attribute.
         // This will force Pango to underline the leading/trailing spaces, too.
 
         // empty space characters and give them a dummy colour attribute.
         // This will force Pango to underline the leading/trailing spaces, too.
 

-        // need to realloc the string to prepend & append our special characters
-        hackstring = (char*)malloc((datalen+7)*sizeof(char));
-
+        wxCharBuffer data_tmp(datalen + 6);

         // copy the leading U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format
         // copy the leading U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format

-        strcpy(hackstring, "\342\200\214");
-
+        memcpy(data_tmp.data(), "\342\200\214", 3);

         // copy the user string
         // copy the user string

-        memcpy(&hackstring[3], data, datalen);
-
+        memcpy(data_tmp.data() + 3, data, datalen);

         // copy the trailing U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format
         // copy the trailing U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format

-        strcpy(&hackstring[datalen+3], "\342\200\214");
+        memcpy(data_tmp.data() + 3 + datalen, "\342\200\214", 3);

 
 

-        // the special characters that we added require 6 additional bytes:
+        data = data_tmp;

         datalen += 6;
         datalen += 6;

-
-        pango_layout_set_text(m_layout, hackstring, datalen);
-    }
-    else
-    {
-        pango_layout_set_text(m_layout, data, datalen);

     }
 
     }
 

+    pango_layout_set_text(m_layout, data, datalen);
+

     if (underlined)
     {
         PangoAttrList *attrs = pango_attr_list_new();
     if (underlined)
     {
         PangoAttrList *attrs = pango_attr_list_new();


@@ -1555,90 +1436,153 @@ void wxWindowDCImpl::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         pango_attr_list_unref(attrs);
     }
 
         pango_attr_list_unref(attrs);
     }
 

-    int w,h;
-
-    if (fabs(m_scaleY - 1.0) > 0.00001)
+    int oldSize = 0;
+    const bool isScaled = fabs(m_scaleY - 1.0) > 0.00001;
+    if (isScaled)

     {
     {

-         // If there is a user or actually any scale applied to
-         // the device context, scale the font.
+        // If there is a user or actually any scale applied to
+        // the device context, scale the font.

 
 

-         // scale font description
-         gint oldSize = pango_font_description_get_size( m_fontdesc );
-         double size = oldSize;
-         size = size * m_scaleY;
-         pango_font_description_set_size( m_fontdesc, (gint)size );
+        // scale font description
+        oldSize = pango_font_description_get_size(m_fontdesc);
+        pango_font_description_set_size(m_fontdesc, int(oldSize * m_scaleY));

 
 

-         // actually apply scaled font
-         pango_layout_set_font_description( m_layout, m_fontdesc );
+        // actually apply scaled font
+        pango_layout_set_font_description( m_layout, m_fontdesc );
+    }
+
+    int w, h;
+    pango_layout_get_pixel_size(m_layout, &w, &h);

 
 

-         pango_layout_get_pixel_size( m_layout, &w, &h );
-         if ( m_backgroundMode == wxSOLID )
-         {
-            gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
-            gdk_draw_rectangle(m_gdkwindow, m_textGC, TRUE, x, y, w, h);
-            gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
-         }
+    // Draw layout.
+    int x_rtl = x;
+    if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
+        x_rtl -= w;

 
 

-         // Draw layout.
-         if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
-             gdk_draw_layout( m_gdkwindow, m_textGC, x-w, y, m_layout );
-         else
-             gdk_draw_layout( m_gdkwindow, m_textGC, x, y, m_layout );
+    const GdkColor* bg_col = NULL;
+    if (m_backgroundMode == wxBRUSHSTYLE_SOLID)
+        bg_col = m_textBackgroundColour.GetColor();

 
 

+    gdk_draw_layout_with_colors(m_gdkwindow, m_textGC, x_rtl, y, m_layout, NULL, bg_col);
+
+    if (isScaled)
+    {

          // reset unscaled size
          pango_font_description_set_size( m_fontdesc, oldSize );
 
          // actually apply unscaled font
          pango_layout_set_font_description( m_layout, m_fontdesc );
     }
          // reset unscaled size
          pango_font_description_set_size( m_fontdesc, oldSize );
 
          // actually apply unscaled font
          pango_layout_set_font_description( m_layout, m_fontdesc );
     }

-    else
-    {
-        pango_layout_get_pixel_size( m_layout, &w, &h );
-        if ( m_backgroundMode == wxSOLID )
-        {
-            gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
-            gdk_draw_rectangle(m_gdkwindow, m_textGC, TRUE, x, y, w, h);
-            gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
-        }
-
-        // Draw layout.
-        if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
-            gdk_draw_layout( m_gdkwindow, m_textGC, x-w, y, m_layout );
-        else
-            gdk_draw_layout( m_gdkwindow, m_textGC, x, y, m_layout );
-    }
-

     if (underlined)
     {
         // undo underline attributes setting:
         pango_layout_set_attributes(m_layout, NULL);
     }
 
     if (underlined)
     {
         // undo underline attributes setting:
         pango_layout_set_attributes(m_layout, NULL);
     }
 

-    wxCoord width = w;
-    wxCoord height = h;
-
-    width = wxCoord(width / m_scaleX);
-    height = wxCoord(height / m_scaleY);
-    CalcBoundingBox (x + width, y + height);
-    CalcBoundingBox (x, y);
-
-    if (hackstring)
-        free(hackstring);
+    CalcBoundingBox(xLogical + int(w / m_scaleX), yLogical + int(h / m_scaleY));
+    CalcBoundingBox(xLogical, yLogical);

 }
 
 }
 

-
-// TODO: There is an example of rotating text with GTK2 that would probably be
-// a better approach here:
-//           http://www.daa.com.au/pipermail/pygtk/2003-April/005052.html
-
+// TODO: When GTK2.6 is required, merge DoDrawText and DoDrawRotatedText to
+// avoid code duplication

 void wxWindowDCImpl::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )
 {
 void wxWindowDCImpl::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )
 {

-#if wxUSE_IMAGE

     if (!m_gdkwindow || text.empty())
         return;
 
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
     if (!m_gdkwindow || text.empty())
         return;
 
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 

+#if __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        x = XLOG2DEV(x);
+        y = YLOG2DEV(y);
+
+        pango_layout_set_text(m_layout, wxGTK_CONV(text), -1);
+
+        if (m_font.GetUnderlined())
+        {
+            PangoAttrList *attrs = pango_attr_list_new();
+            PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
+            pango_attr_list_insert(attrs, a);
+            pango_layout_set_attributes(m_layout, attrs);
+            pango_attr_list_unref(attrs);
+        }
+
+        int oldSize = 0;
+        const bool isScaled = fabs(m_scaleY - 1.0) > 0.00001;
+        if (isScaled)
+        {
+            //TODO: when Pango >= 1.6 is required, use pango_matrix_scale()
+             // If there is a user or actually any scale applied to
+             // the device context, scale the font.
+
+             // scale font description
+            oldSize = pango_font_description_get_size(m_fontdesc);
+            pango_font_description_set_size(m_fontdesc, int(oldSize * m_scaleY));
+
+             // actually apply scaled font
+             pango_layout_set_font_description( m_layout, m_fontdesc );
+        }
+
+        int w, h;
+        pango_layout_get_pixel_size(m_layout, &w, &h);
+
+        const GdkColor* bg_col = NULL;
+        if (m_backgroundMode == wxBRUSHSTYLE_SOLID)
+            bg_col = m_textBackgroundColour.GetColor();
+
+        // rotate the text
+        PangoMatrix matrix = PANGO_MATRIX_INIT;
+        pango_matrix_rotate (&matrix, angle);
+        pango_context_set_matrix (m_context, &matrix);
+        pango_layout_context_changed (m_layout);
+
+        // To be compatible with MSW, the rotation axis must be in the old
+        // top-left corner.
+        // Calculate the vertices of the rotated rectangle containing the text,
+        // relative to the old top-left vertex.
+        // We could use the matrix for this, but it's simpler with trignonometry.
+        double rad = DegToRad(angle);
+        // the rectangle vertices are counted clockwise with the first one
+        // being at (0, 0)
+        double x2 = w * cos(rad);
+        double y2 = -w * sin(rad);   // y axis points to the bottom, hence minus
+        double x4 = h * sin(rad);
+        double y4 = h * cos(rad);
+        double x3 = x4 + x2;
+        double y3 = y4 + y2;
+        // Then we calculate max and min of the rotated rectangle.
+        wxCoord maxX = (wxCoord)(dmax(dmax(0, x2), dmax(x3, x4)) + 0.5),
+                maxY = (wxCoord)(dmax(dmax(0, y2), dmax(y3, y4)) + 0.5),
+                minX = (wxCoord)(dmin(dmin(0, x2), dmin(x3, x4)) - 0.5),
+                minY = (wxCoord)(dmin(dmin(0, y2), dmin(y3, y4)) - 0.5);
+
+        gdk_draw_layout_with_colors(m_gdkwindow, m_textGC, x+minX, y+minY,
+                                    m_layout, NULL, bg_col);
+
+        if (m_font.GetUnderlined())
+            pango_layout_set_attributes(m_layout, NULL);
+
+        // clean up the transformation matrix
+        pango_context_set_matrix(m_context, NULL);
+
+        if (isScaled)
+        {
+             // reset unscaled size
+             pango_font_description_set_size( m_fontdesc, oldSize );
+
+             // actually apply unscaled font
+             pango_layout_set_font_description( m_layout, m_fontdesc );
+        }
+
+        CalcBoundingBox(x+minX, y+minY);
+        CalcBoundingBox(x+maxX, y+maxY);
+    }
+    else
+#endif //__WXGTK26__
+    {
+#if wxUSE_IMAGE

     if ( wxIsNullDouble(angle) )
     {
         DoDrawText(text, x, y);
     if ( wxIsNullDouble(angle) )
     {
         DoDrawText(text, x, y);


@@ -1738,6 +1682,7 @@ void wxWindowDCImpl::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord
     wxUnusedVar(y);
     wxUnusedVar(angle);
 #endif // wxUSE_IMAGE/!wxUSE_IMAGE
     wxUnusedVar(y);
     wxUnusedVar(angle);
 #endif // wxUSE_IMAGE/!wxUSE_IMAGE

+    }

 }
 
 void wxWindowDCImpl::DoGetTextExtent(const wxString &string,
 }
 
 void wxWindowDCImpl::DoGetTextExtent(const wxString &string,


@@ -1759,7 +1704,7 @@ void wxWindowDCImpl::DoGetTextExtent(const wxString &string,
 
     // ensure that theFont is always non-NULL
     if ( !theFont || !theFont->IsOk() )
 
     // ensure that theFont is always non-NULL
     if ( !theFont || !theFont->IsOk() )

-        theFont = wx_const_cast(wxFont *, &m_font);
+        theFont = &m_font;

 
     // and use it if it's valid
     if ( theFont->IsOk() )
 
     // and use it if it's valid
     if ( theFont->IsOk() )


@@ -1779,24 +1724,19 @@ void wxWindowDCImpl::DoGetTextExtent(const wxString &string,
         return;
     }
 
         return;
     }
 

-    pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
+    pango_layout_set_text(m_layout, dataUTF8, -1);

 
 

+    int h;
+    pango_layout_get_pixel_size(m_layout, width, &h);

     if (descent)
     {
     if (descent)
     {

-        int h;
-        pango_layout_get_pixel_size( m_layout, width, &h );

         PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
         int baseline = pango_layout_iter_get_baseline(iter);
         pango_layout_iter_free(iter);
         *descent = h - PANGO_PIXELS(baseline);
         PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
         int baseline = pango_layout_iter_get_baseline(iter);
         pango_layout_iter_free(iter);
         *descent = h - PANGO_PIXELS(baseline);

-
-        if (height)
-            *height = (wxCoord) h;
-    }
-    else
-    {
-        pango_layout_get_pixel_size( m_layout, width, height );

     }
     }

+    if (height)
+        *height = h;

 
     // Reset old font description
     if (theFont->IsOk())
 
     // Reset old font description
     if (theFont->IsOk())


@@ -1823,7 +1763,7 @@ bool wxWindowDCImpl::DoGetPartialTextExtents(const wxString& text,
         return false;
     }
 
         return false;
     }
 

-    pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
+    pango_layout_set_text(m_layout, dataUTF8, -1);

 
     // Calculate the position of each character based on the widths of
     // the previous characters
 
     // Calculate the position of each character based on the widths of
     // the previous characters


@@ -1858,10 +1798,10 @@ wxCoord wxWindowDCImpl::GetCharWidth() const
 wxCoord wxWindowDCImpl::GetCharHeight() const
 {
     PangoFontMetrics *metrics = pango_context_get_metrics (m_context, m_fontdesc, pango_context_get_language(m_context));
 wxCoord wxWindowDCImpl::GetCharHeight() const
 {
     PangoFontMetrics *metrics = pango_context_get_metrics (m_context, m_fontdesc, pango_context_get_language(m_context));

-    wxCHECK_MSG( metrics, -1, _T("failed to get pango font metrics") );
+    wxCHECK_MSG( metrics, -1, wxT("failed to get pango font metrics") );

 
     wxCoord h = PANGO_PIXELS (pango_font_metrics_get_descent (metrics) +
 
     wxCoord h = PANGO_PIXELS (pango_font_metrics_get_descent (metrics) +

-                pango_font_metrics_get_ascent (metrics));
+                              pango_font_metrics_get_ascent (metrics));

     pango_font_metrics_unref (metrics);
     return h;
 }
     pango_font_metrics_unref (metrics);
     return h;
 }


@@ -1893,7 +1833,7 @@ void wxWindowDCImpl::SetFont( const wxFont &font )
         {
             PangoContext *oldContext = m_context;
 
         {
             PangoContext *oldContext = m_context;
 

-            m_context = m_window->GtkGetPangoDefaultContext();
+            m_context = m_window->GTKGetPangoDefaultContext();

 
             // If we switch back/forth between different contexts
             // we also have to create a new layout. I think so,
 
             // If we switch back/forth between different contexts
             // we also have to create a new layout. I think so,


@@ -1955,57 +1895,39 @@ void wxWindowDCImpl::SetPen( const wxPen &pen )
     int req_nb_dash;
     const wxGTKDash *req_dash;
 
     int req_nb_dash;
     const wxGTKDash *req_dash;
 

-    GdkLineStyle lineStyle = GDK_LINE_SOLID;
+    GdkLineStyle lineStyle = GDK_LINE_ON_OFF_DASH;

     switch (m_pen.GetStyle())
     {
     switch (m_pen.GetStyle())
     {

-        case wxUSER_DASH:
-        {
-            lineStyle = GDK_LINE_ON_OFF_DASH;
+        case wxPENSTYLE_USER_DASH:

             req_nb_dash = m_pen.GetDashCount();
             req_dash = (wxGTKDash*)m_pen.GetDash();
             break;
             req_nb_dash = m_pen.GetDashCount();
             req_dash = (wxGTKDash*)m_pen.GetDash();
             break;

-        }
-        case wxDOT:
-        {
-            lineStyle = GDK_LINE_ON_OFF_DASH;
+        case wxPENSTYLE_DOT:

             req_nb_dash = 2;
             req_dash = dotted;
             break;
             req_nb_dash = 2;
             req_dash = dotted;
             break;

-        }
-        case wxLONG_DASH:
-        {
-            lineStyle = GDK_LINE_ON_OFF_DASH;
+        case wxPENSTYLE_LONG_DASH:

             req_nb_dash = 2;
             req_dash = wxCoord_dashed;
             break;
             req_nb_dash = 2;
             req_dash = wxCoord_dashed;
             break;

-        }
-        case wxSHORT_DASH:
-        {
-            lineStyle = GDK_LINE_ON_OFF_DASH;
+        case wxPENSTYLE_SHORT_DASH:

             req_nb_dash = 2;
             req_dash = short_dashed;
             break;
             req_nb_dash = 2;
             req_dash = short_dashed;
             break;

-        }
-        case wxDOT_DASH:
-        {
-//            lineStyle = GDK_LINE_DOUBLE_DASH;
-            lineStyle = GDK_LINE_ON_OFF_DASH;
+        case wxPENSTYLE_DOT_DASH:

             req_nb_dash = 4;
             req_dash = dotted_dashed;
             break;
             req_nb_dash = 4;
             req_dash = dotted_dashed;
             break;

-        }

 
 

-        case wxTRANSPARENT:
-        case wxSTIPPLE_MASK_OPAQUE:
-        case wxSTIPPLE:
-        case wxSOLID:
+        case wxPENSTYLE_TRANSPARENT:
+        case wxPENSTYLE_STIPPLE_MASK_OPAQUE:
+        case wxPENSTYLE_STIPPLE:
+        case wxPENSTYLE_SOLID:

         default:
         default:

-        {

             lineStyle = GDK_LINE_SOLID;
             lineStyle = GDK_LINE_SOLID;

-            req_dash = (wxGTKDash*)NULL;
+            req_dash = NULL;

             req_nb_dash = 0;
             break;
             req_nb_dash = 0;
             break;

-        }

     }
 
     if (req_dash && req_nb_dash)
     }
 
     if (req_dash && req_nb_dash)


@@ -2032,18 +1954,12 @@ void wxWindowDCImpl::SetPen( const wxPen &pen )
         case wxCAP_BUTT:       { capStyle = GDK_CAP_BUTT;       break; }
         case wxCAP_ROUND:
         default:
         case wxCAP_BUTT:       { capStyle = GDK_CAP_BUTT;       break; }
         case wxCAP_ROUND:
         default:

-        {

             if (width <= 1)
             {
                 width = 0;
                 capStyle = GDK_CAP_NOT_LAST;
             }
             if (width <= 1)
             {
                 width = 0;
                 capStyle = GDK_CAP_NOT_LAST;
             }

-            else
-            {
-                capStyle = GDK_CAP_ROUND;
-            }

             break;
             break;

-        }

     }
 
     GdkJoinStyle joinStyle = GDK_JOIN_ROUND;
     }
 
     GdkJoinStyle joinStyle = GDK_JOIN_ROUND;


@@ -2078,7 +1994,7 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush )
 
     gdk_gc_set_fill( m_brushGC, GDK_SOLID );
 
 
     gdk_gc_set_fill( m_brushGC, GDK_SOLID );
 

-    if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->IsOk()))
+    if ((m_brush.GetStyle() == wxBRUSHSTYLE_STIPPLE) && (m_brush.GetStipple()->IsOk()))

     {
         if (m_brush.GetStipple()->GetDepth() != 1)
         {
     {
         if (m_brush.GetStipple()->GetDepth() != 1)
         {


@@ -2092,7 +2008,7 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush )
         }
     }
 
         }
     }
 

-    if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+    if ((m_brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_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() );
     {
         gdk_gc_set_fill( m_textGC, GDK_OPAQUE_STIPPLED);
         gdk_gc_set_stipple( m_textGC, m_brush.GetStipple()->GetMask()->GetBitmap() );


@@ -2101,8 +2017,7 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush )
     if (m_brush.IsHatch())
     {
         gdk_gc_set_fill( m_brushGC, GDK_STIPPLED );
     if (m_brush.IsHatch())
     {
         gdk_gc_set_fill( m_brushGC, GDK_STIPPLED );

-        int num = m_brush.GetStyle() - wxBDIAGONAL_HATCH;
-        gdk_gc_set_stipple( m_brushGC, hatches[num] );
+        gdk_gc_set_stipple(m_brushGC, GetHatch(m_brush.GetStyle()));

     }
 }
 
     }
 }
 


@@ -2121,37 +2036,42 @@ void wxWindowDCImpl::SetBackground( const wxBrush &brush )
 
     if (!m_gdkwindow) return;
 
 
     if (!m_gdkwindow) 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() );
+    wxColor color = m_backgroundBrush.GetColour();
+    color.CalcPixel(m_cmap);
+    const GdkColor* gdkColor = color.GetColor();
+    gdk_gc_set_background(m_brushGC, gdkColor);
+    gdk_gc_set_background(m_penGC,   gdkColor);
+    gdk_gc_set_background(m_bgGC,    gdkColor);
+    gdk_gc_set_foreground(m_bgGC,    gdkColor);
+

 
     gdk_gc_set_fill( m_bgGC, GDK_SOLID );
 
 
     gdk_gc_set_fill( m_bgGC, GDK_SOLID );
 

-    if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->IsOk()))
+    if (m_backgroundBrush.GetStyle() == wxBRUSHSTYLE_STIPPLE)

     {
     {

-        if (m_backgroundBrush.GetStipple()->GetDepth() != 1)
+        const wxBitmap* stipple = m_backgroundBrush.GetStipple();
+        if (stipple->IsOk())

         {
         {

-            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()->GetPixmap() );
+            if (stipple->GetDepth() != 1)
+            {
+                gdk_gc_set_fill(m_bgGC, GDK_TILED);
+                gdk_gc_set_tile(m_bgGC, stipple->GetPixmap());
+            }
+            else
+            {
+                gdk_gc_set_fill(m_bgGC, GDK_STIPPLED);
+                gdk_gc_set_stipple(m_bgGC, stipple->GetPixmap());
+            }

         }
     }
         }
     }

-
-    if (m_backgroundBrush.IsHatch())
+    else if (m_backgroundBrush.IsHatch())

     {
         gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );
     {
         gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );

-        int num = m_backgroundBrush.GetStyle() - wxBDIAGONAL_HATCH;
-        gdk_gc_set_stipple( m_bgGC, hatches[num] );
+        gdk_gc_set_stipple(m_bgGC, GetHatch(m_backgroundBrush.GetStyle()));

     }
 }
 
     }
 }
 

-void wxWindowDCImpl::SetLogicalFunction( int function )
+void wxWindowDCImpl::SetLogicalFunction( wxRasterOperationMode function )

 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 


@@ -2180,12 +2100,10 @@ void wxWindowDCImpl::SetLogicalFunction( int function )
         case wxCOPY:         mode = GDK_COPY;          break;
         case wxNO_OP:        mode = GDK_NOOP;          break;
         case wxSRC_INVERT:   mode = GDK_COPY_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;
+        case wxNOR:          mode = GDK_NOR;           break;

         default:
         default:

-           wxFAIL_MSG( wxT("unsupported logical function") );
-           mode = GDK_COPY;
+            wxFAIL_MSG("unknown mode");
+            return;

     }
 
     m_logicalFunction = function;
     }
 
     m_logicalFunction = function;


@@ -2240,17 +2158,6 @@ void wxWindowDCImpl::SetBackgroundMode( int mode )
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
     m_backgroundMode = mode;
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
     m_backgroundMode = mode;

-
-    if (!m_gdkwindow) 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);
-    }

 }
 
 void wxWindowDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) )
 }
 
 void wxWindowDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) )


@@ -2270,37 +2177,16 @@ void wxWindowDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, w
     rect.width = XLOG2DEVREL(width);
     rect.height = YLOG2DEVREL(height);
 
     rect.width = XLOG2DEVREL(width);
     rect.height = YLOG2DEVREL(height);
 

-    if (m_window && m_window->m_wxwindow && 
+    if (m_window && m_window->m_wxwindow &&

         (m_window->GetLayoutDirection() == wxLayout_RightToLeft))
     {
         rect.x -= rect.width;
     }
 
         (m_window->GetLayoutDirection() == wxLayout_RightToLeft))
     {
         rect.x -= rect.width;
     }
 

-    if (!m_currentClippingRegion.IsNull())
-        m_currentClippingRegion.Intersect( rect );
-    else
-        m_currentClippingRegion.Union( rect );
-
-#if USE_PAINT_REGION
-    if (!m_paintClippingRegion.IsNull())
-        m_currentClippingRegion.Intersect( m_paintClippingRegion );
-#endif
-
-    wxCoord xx, yy, ww, hh;
-    m_currentClippingRegion.GetBox( xx, yy, ww, hh );
-#if wxUSE_NEW_DC
-    wxGTKDCImpl::DoSetClippingRegion( xx, yy, ww, hh );
-#else
-    wxDC::DoSetClippingRegion( xx, yy, ww, hh );
-#endif
-
-    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() );
+    DoSetDeviceClippingRegion(wxRegion(rect));

 }
 
 }
 

-void wxWindowDCImpl::DoSetClippingRegionAsRegion( const wxRegion &region  )
+void wxWindowDCImpl::DoSetDeviceClippingRegion( const wxRegion &region  )

 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 


@@ -2324,27 +2210,20 @@ void wxWindowDCImpl::DoSetClippingRegionAsRegion( const wxRegion &region  )
 
     wxCoord xx, yy, ww, hh;
     m_currentClippingRegion.GetBox( xx, yy, ww, hh );
 
     wxCoord xx, yy, ww, hh;
     m_currentClippingRegion.GetBox( xx, yy, ww, hh );

-#if wxUSE_NEW_DC

     wxGTKDCImpl::DoSetClippingRegion( xx, yy, ww, hh );
     wxGTKDCImpl::DoSetClippingRegion( xx, yy, ww, hh );

-#else
-    wxDC::DoSetClippingRegion( xx, yy, ww, hh );
-#endif

 
 

-    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() );
+    GdkRegion* gdkRegion = m_currentClippingRegion.GetRegion();
+    gdk_gc_set_clip_region(m_penGC,   gdkRegion);
+    gdk_gc_set_clip_region(m_brushGC, gdkRegion);
+    gdk_gc_set_clip_region(m_textGC,  gdkRegion);
+    gdk_gc_set_clip_region(m_bgGC,    gdkRegion);

 }
 
 void wxWindowDCImpl::DestroyClippingRegion()
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
 }
 
 void wxWindowDCImpl::DestroyClippingRegion()
 {
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 

-#if wxUSE_NEW_DC

     wxDCImpl::DestroyClippingRegion();
     wxDCImpl::DestroyClippingRegion();

-#else
-    wxDC::DestroyClippingRegion();
-#endif

 
     m_currentClippingRegion.Clear();
 
 
     m_currentClippingRegion.Clear();
 


@@ -2355,32 +2234,26 @@ void wxWindowDCImpl::DestroyClippingRegion()
 
     if (!m_gdkwindow) return;
 
 
     if (!m_gdkwindow) 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() );
-    }
+    GdkRegion* gdkRegion = NULL;
+    if (!m_currentClippingRegion.IsEmpty())
+        gdkRegion = m_currentClippingRegion.GetRegion();
+
+    gdk_gc_set_clip_region(m_penGC,   gdkRegion);
+    gdk_gc_set_clip_region(m_brushGC, gdkRegion);
+    gdk_gc_set_clip_region(m_textGC,  gdkRegion);
+    gdk_gc_set_clip_region(m_bgGC,    gdkRegion);

 }
 
 void wxWindowDCImpl::Destroy()
 {
     if (m_penGC) wxFreePoolGC( m_penGC );
 }
 
 void wxWindowDCImpl::Destroy()
 {
     if (m_penGC) wxFreePoolGC( m_penGC );

-    m_penGC = (GdkGC*) NULL;
+    m_penGC = NULL;

     if (m_brushGC) wxFreePoolGC( m_brushGC );
     if (m_brushGC) wxFreePoolGC( m_brushGC );

-    m_brushGC = (GdkGC*) NULL;
+    m_brushGC = NULL;

     if (m_textGC) wxFreePoolGC( m_textGC );
     if (m_textGC) wxFreePoolGC( m_textGC );

-    m_textGC = (GdkGC*) NULL;
+    m_textGC = NULL;

     if (m_bgGC) wxFreePoolGC( m_bgGC );
     if (m_bgGC) wxFreePoolGC( m_bgGC );

-    m_bgGC = (GdkGC*) NULL;
+    m_bgGC = NULL;

 }
 
 void wxWindowDCImpl::SetDeviceOrigin( wxCoord x, wxCoord y )
 }
 
 void wxWindowDCImpl::SetDeviceOrigin( wxCoord x, wxCoord y )


@@ -2396,7 +2269,7 @@ void wxWindowDCImpl::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
     m_signX = (xLeftRight ?  1 : -1);
     m_signY = (yBottomUp  ? -1 :  1);
 
     m_signX = (xLeftRight ?  1 : -1);
     m_signY = (yBottomUp  ? -1 :  1);
 

-    if (m_window && m_window->m_wxwindow && 
+    if (m_window && m_window->m_wxwindow &&

         (m_window->GetLayoutDirection() == wxLayout_RightToLeft))
         m_signX = -m_signX;
 
         (m_window->GetLayoutDirection() == wxLayout_RightToLeft))
         m_signX = -m_signX;
 


@@ -2407,11 +2280,7 @@ void wxWindowDCImpl::ComputeScaleAndOrigin()
 {
     const wxRealPoint origScale(m_scaleX, m_scaleY);
 
 {
     const wxRealPoint origScale(m_scaleX, m_scaleY);
 

-#if wxUSE_NEW_DC

     wxDCImpl::ComputeScaleAndOrigin();
     wxDCImpl::ComputeScaleAndOrigin();

-#else
-    wxDC::ComputeScaleAndOrigin();
-#endif

 
     // if scale has changed call SetPen to recalulate the line width
     if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() )
 
     // if scale has changed call SetPen to recalulate the line width
     if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() )


@@ -2450,20 +2319,20 @@ wxClientDCImpl::wxClientDCImpl( wxDC *owner )
 wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *win )
           : wxWindowDCImpl( owner, win )
 {
 wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *win )
           : wxWindowDCImpl( owner, win )
 {

-    wxCHECK_RET( win, _T("NULL window in wxClientDCImpl::wxClientDC") );
+    wxCHECK_RET( win, wxT("NULL window in wxClientDCImpl::wxClientDC") );

 
 #ifdef __WXUNIVERSAL__
     wxPoint ptOrigin = win->GetClientAreaOrigin();
     SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
     wxSize size = win->GetClientSize();
     DoSetClippingRegion(0, 0, size.x, size.y);
 
 #ifdef __WXUNIVERSAL__
     wxPoint ptOrigin = win->GetClientAreaOrigin();
     SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
     wxSize size = win->GetClientSize();
     DoSetClippingRegion(0, 0, size.x, size.y);

-#endif 
+#endif

     // __WXUNIVERSAL__
 }
 
 void wxClientDCImpl::DoGetSize(int *width, int *height) const
 {
     // __WXUNIVERSAL__
 }
 
 void wxClientDCImpl::DoGetSize(int *width, int *height) const
 {

-    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
+    wxCHECK_RET( m_window, wxT("GetSize() doesn't work without window") );

 
     m_window->GetClientSize( width, height );
 }
 
     m_window->GetClientSize( width, height );
 }


@@ -2523,7 +2392,7 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *win )
         gdk_gc_set_clip_region( m_textGC, region );
         gdk_gc_set_clip_region( m_bgGC, region );
     }
         gdk_gc_set_clip_region( m_textGC, region );
         gdk_gc_set_clip_region( m_bgGC, region );
     }

-#endif 
+#endif

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


@@ -2551,4 +2420,10 @@ bool wxDCModule::OnInit()
 void wxDCModule::OnExit()
 {
     wxCleanUpGCPool();
 void wxDCModule::OnExit()
 {
     wxCleanUpGCPool();

+
+    for (int i = wxBRUSHSTYLE_LAST_HATCH - wxBRUSHSTYLE_FIRST_HATCH; i--; )
+    {
+        if (hatches[i])
+            g_object_unref(hatches[i]);
+    }

 }
 }