More comments about non-native GTH widgets.

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 94df22e7d94810ac07f410c2d677b4b07c3dd9f3..c5ce2eea4411da461df69047852a19f6768174ad 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcclient.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -19,20 +15,22 @@
 #endif
 
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/dcclient.h"

-#include "wx/dcmemory.h"
-#include "wx/image.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/image.h"
+#endif
+

 #include "wx/module.h"
 #include "wx/module.h"

-#include "wx/log.h"

 #include "wx/fontutil.h"
 
 #include "wx/gtk/win_gtk.h"
 #include "wx/fontutil.h"
 
 #include "wx/gtk/win_gtk.h"

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

 
 

-#include <math.h>               // for floating-point functions
-
-#include <gdk/gdk.h>

 #include <gdk/gdkx.h>
 #include <gdk/gdkx.h>

-#include <gdk/gdkprivate.h>
-#include <gtk/gtk.h>

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


@@ -82,6 +80,7 @@ static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
 
 #include "gdk/gdkprivate.h"
 
 
 #include "gdk/gdkprivate.h"
 

+static

 void gdk_wx_draw_bitmap(GdkDrawable  *drawable,
                         GdkGC        *gc,
                         GdkDrawable  *src,
 void gdk_wx_draw_bitmap(GdkDrawable  *drawable,
                         GdkGC        *gc,
                         GdkDrawable  *src,


@@ -92,11 +91,10 @@ void gdk_wx_draw_bitmap(GdkDrawable  *drawable,
                         gint         width,
                         gint         height)
 {
                         gint         width,
                         gint         height)
 {

-    g_return_if_fail (drawable != NULL);
-    g_return_if_fail (src != NULL);
-    g_return_if_fail (gc != NULL);
-    
-#ifdef __WXGTK20__
+    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);
     if (width == -1) width = src_width;
     gint src_width, src_height;
     gdk_drawable_get_size(src, &src_width, &src_height);
     if (width == -1) width = src_width;


@@ -110,41 +108,12 @@ void gdk_wx_draw_bitmap(GdkDrawable  *drawable,
                 width, height,
                 0, 0,
                 1 );
                 width, height,
                 0, 0,
                 1 );

-#else
-    GdkWindowPrivate *drawable_private;
-    GdkWindowPrivate *src_private;
-    GdkGCPrivate *gc_private;
-    
-    drawable_private = (GdkWindowPrivate*) drawable;
-    src_private = (GdkWindowPrivate*) src;
-    if (drawable_private->destroyed || src_private->destroyed)
-        return;
-
-    gint src_width = src_private->width;
-    gint src_height = src_private->height;
-
-    gc_private = (GdkGCPrivate*) gc;
-    
-    if (width == -1) width = src_width;
-    if (height == -1) height = src_height;
-    
-    XCopyPlane( drawable_private->xdisplay,
-                src_private->xwindow,
-                drawable_private->xwindow,
-                gc_private->xgc,
-                xsrc, ysrc,
-                width, height,
-                xdest, ydest,
-                1 );
-#endif

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

-#define GC_POOL_SIZE 200
-

 enum wxPoolGCType
 {
    wxGC_ERROR = 0,
 enum wxPoolGCType
 {
    wxGC_ERROR = 0,


@@ -180,10 +149,10 @@ static void wxInitGCPool()
     // This really could wait until the first call to
     // wxGetPoolGC, but we will make the first allocation
     // now when other initialization is being performed.
     // This really could wait until the first call to
     // wxGetPoolGC, but we will make the first allocation
     // now when other initialization is being performed.

-    
+

     // Set initial pool size.
     wxGCPoolSize = GC_POOL_ALLOC_SIZE;
     // Set initial pool size.
     wxGCPoolSize = GC_POOL_ALLOC_SIZE;

-    
+

     // Allocate initial pool.
     wxGCPool = (wxGC *)malloc(wxGCPoolSize * sizeof(wxGC));
     if (wxGCPool == NULL)
     // Allocate initial pool.
     wxGCPool = (wxGC *)malloc(wxGCPoolSize * sizeof(wxGC));
     if (wxGCPool == NULL)


@@ -195,7 +164,7 @@ static void wxInitGCPool()
         wxFAIL_MSG( wxT("Cannot allocate GC pool") );
         return;
     }
         wxFAIL_MSG( wxT("Cannot allocate GC pool") );
         return;
     }

-    
+

     // Zero initial pool.
     memset(wxGCPool, 0, wxGCPoolSize * sizeof(wxGC));
 }
     // Zero initial pool.
     memset(wxGCPool, 0, wxGCPoolSize * sizeof(wxGC));
 }


@@ -205,7 +174,7 @@ static void wxCleanUpGCPool()
     for (int i = 0; i < wxGCPoolSize; i++)
     {
         if (wxGCPool[i].m_gc)
     for (int i = 0; i < wxGCPoolSize; i++)
     {
         if (wxGCPool[i].m_gc)

-            gdk_gc_unref( wxGCPool[i].m_gc );
+            g_object_unref (wxGCPool[i].m_gc);

     }
 
     free(wxGCPool);
     }
 
     free(wxGCPool);


@@ -216,7 +185,7 @@ static void wxCleanUpGCPool()
 static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )
 {
     wxGC *pptr;
 static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )
 {
     wxGC *pptr;

-    
+

     // Look for an available GC.
     for (int i = 0; i < wxGCPoolSize; i++)
     {
     // Look for an available GC.
     for (int i = 0; i < wxGCPoolSize; i++)
     {


@@ -225,11 +194,11 @@ static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )
             wxGCPool[i].m_gc = gdk_gc_new( window );
             gdk_gc_set_exposures( wxGCPool[i].m_gc, FALSE );
             wxGCPool[i].m_type = type;
             wxGCPool[i].m_gc = gdk_gc_new( window );
             gdk_gc_set_exposures( wxGCPool[i].m_gc, FALSE );
             wxGCPool[i].m_type = type;

-            wxGCPool[i].m_used = FALSE;
+            wxGCPool[i].m_used = false;

         }
         if ((!wxGCPool[i].m_used) && (wxGCPool[i].m_type == type))
         {
         }
         if ((!wxGCPool[i].m_used) && (wxGCPool[i].m_type == type))
         {

-            wxGCPool[i].m_used = TRUE;
+            wxGCPool[i].m_used = true;

             return wxGCPool[i].m_gc;
         }
     }
             return wxGCPool[i].m_gc;
         }
     }


@@ -244,20 +213,20 @@ static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )
         wxGCPool = pptr;
         memset(&wxGCPool[wxGCPoolSize], 0,
             GC_POOL_ALLOC_SIZE*sizeof(wxGC));
         wxGCPool = pptr;
         memset(&wxGCPool[wxGCPoolSize], 0,
             GC_POOL_ALLOC_SIZE*sizeof(wxGC));

-    
-        // Initialize entry we will return.    
+
+        // Initialize entry we will return.

         wxGCPool[wxGCPoolSize].m_gc = gdk_gc_new( window );
         gdk_gc_set_exposures( wxGCPool[wxGCPoolSize].m_gc, FALSE );
         wxGCPool[wxGCPoolSize].m_type = type;
         wxGCPool[wxGCPoolSize].m_gc = gdk_gc_new( window );
         gdk_gc_set_exposures( wxGCPool[wxGCPoolSize].m_gc, FALSE );
         wxGCPool[wxGCPoolSize].m_type = type;

-        wxGCPool[wxGCPoolSize].m_used = TRUE;
-        
+        wxGCPool[wxGCPoolSize].m_used = true;
+

         // Set new value of pool size.
         wxGCPoolSize += GC_POOL_ALLOC_SIZE;
         // Set new value of pool size.
         wxGCPoolSize += GC_POOL_ALLOC_SIZE;

-        
+

         // Return newly allocated entry.
         return wxGCPool[wxGCPoolSize-GC_POOL_ALLOC_SIZE].m_gc;
     }
         // Return newly allocated entry.
         return wxGCPool[wxGCPoolSize-GC_POOL_ALLOC_SIZE].m_gc;
     }

-    
+

     // The realloc failed.  Fall through to error.
     wxFAIL_MSG( wxT("No GC available") );
 
     // The realloc failed.  Fall through to error.
     wxFAIL_MSG( wxT("No GC available") );
 


@@ -270,7 +239,7 @@ static void wxFreePoolGC( GdkGC *gc )
     {
         if (wxGCPool[i].m_gc == gc)
         {
     {
         if (wxGCPool[i].m_gc == gc)
         {

-            wxGCPool[i].m_used = FALSE;
+            wxGCPool[i].m_used = false;

             return;
         }
     }
             return;
         }
     }


@@ -291,14 +260,12 @@ wxWindowDC::wxWindowDC()
     m_textGC = (GdkGC *) NULL;
     m_bgGC = (GdkGC *) NULL;
     m_cmap = (GdkColormap *) NULL;
     m_textGC = (GdkGC *) NULL;
     m_bgGC = (GdkGC *) NULL;
     m_cmap = (GdkColormap *) NULL;

-    m_isMemDC = FALSE;
-    m_isScreenDC = FALSE;
+    m_isMemDC = false;
+    m_isScreenDC = false;

     m_owner = (wxWindow *)NULL;
     m_owner = (wxWindow *)NULL;

-#ifdef __WXGTK20__

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

-#endif

 }
 
 wxWindowDC::wxWindowDC( wxWindow *window )
 }
 
 wxWindowDC::wxWindowDC( wxWindow *window )


@@ -311,8 +278,8 @@ wxWindowDC::wxWindowDC( wxWindow *window )
     m_bgGC = (GdkGC *) NULL;
     m_cmap = (GdkColormap *) NULL;
     m_owner = (wxWindow *)NULL;
     m_bgGC = (GdkGC *) NULL;
     m_cmap = (GdkColormap *) NULL;
     m_owner = (wxWindow *)NULL;

-    m_isMemDC = FALSE;
-    m_isScreenDC = FALSE;
+    m_isMemDC = false;
+    m_isScreenDC = false;

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


@@ -328,11 +295,9 @@ wxWindowDC::wxWindowDC( wxWindow *window )
 
     wxASSERT_MSG( widget, wxT("DC needs a widget") );
 
 
     wxASSERT_MSG( widget, wxT("DC needs a widget") );
 

-#ifdef __WXGTK20__

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

-#endif

 
     GtkPizza *pizza = GTK_PIZZA( widget );
     m_window = pizza->bin_window;
 
     GtkPizza *pizza = GTK_PIZZA( widget );
     m_window = pizza->bin_window;


@@ -341,7 +306,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
     if (!m_window)
     {
          // Don't report problems as per MSW.
     if (!m_window)
     {
          // Don't report problems as per MSW.

-         m_ok = TRUE;
+         m_ok = true;

 
          return;
     }
 
          return;
     }


@@ -363,18 +328,16 @@ wxWindowDC::wxWindowDC( wxWindow *window )
 wxWindowDC::~wxWindowDC()
 {
     Destroy();
 wxWindowDC::~wxWindowDC()
 {
     Destroy();

-    
-#ifdef __WXGTK20__
+

     if (m_layout)
     if (m_layout)

-        g_object_unref( G_OBJECT( m_layout ) );
+        g_object_unref (m_layout);

     if (m_fontdesc)
         pango_font_description_free( m_fontdesc );
     if (m_fontdesc)
         pango_font_description_free( m_fontdesc );

-#endif

 }
 
 void wxWindowDC::SetUpDC()
 {
 }
 
 void wxWindowDC::SetUpDC()
 {

-    m_ok = TRUE;
+    m_ok = true;

 
     wxASSERT_MSG( !m_penGC, wxT("GCs already created") );
 
 
     wxASSERT_MSG( !m_penGC, wxT("GCs already created") );
 


@@ -404,7 +367,11 @@ void wxWindowDC::SetUpDC()
     /* background colour */
     m_backgroundBrush = *wxWHITE_BRUSH;
     m_backgroundBrush.GetColour().CalcPixel( m_cmap );
     /* background colour */
     m_backgroundBrush = *wxWHITE_BRUSH;
     m_backgroundBrush.GetColour().CalcPixel( m_cmap );

-    GdkColor *bg_col = m_backgroundBrush.GetColour().GetColor();
+#ifdef __WXGTK24__
+    const GdkColor *bg_col = m_backgroundBrush.GetColour().GetColor();
+#else
+          GdkColor *bg_col = m_backgroundBrush.GetColour().GetColor();
+#endif

 
     /* m_textGC */
     m_textForegroundColour.CalcPixel( m_cmap );
 
     /* m_textGC */
     m_textForegroundColour.CalcPixel( m_cmap );


@@ -465,7 +432,7 @@ void wxWindowDC::DoGetSize( int* width, int* height ) const
     m_owner->GetSize(width, height);
 }
 
     m_owner->GetSize(width, height);
 }
 

-extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,

                           const wxColour & col, int style);
 
 bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
                           const wxColour & col, int style);
 
 bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,


@@ -486,7 +453,7 @@ bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
 
     wxImage image = bitmap.ConvertToImage();
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
 
     wxImage image = bitmap.ConvertToImage();
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));

-    return TRUE;
+    return true;

 }
 
 void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
 }
 
 void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )


@@ -544,10 +511,10 @@ void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
         radius1 = 0.0;
         radius2 = 360.0;
     }
         radius1 = 0.0;
         radius2 = 360.0;
     }

-    else
-    if (radius == 0.0)
+    else if ( wxIsNullDouble(radius) )

     {
     {

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

     }
     else
     {
     }
     else
     {


@@ -693,28 +660,31 @@ void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord
     if (m_pen.GetStyle() == wxTRANSPARENT) return;
     if (n <= 0) return;
 
     if (m_pen.GetStyle() == wxTRANSPARENT) return;
     if (n <= 0) return;
 

-    GdkPoint *gpts = new GdkPoint[n];
-    if (! gpts)
-    {
-        wxFAIL_MSG( wxT("Cannot allocate PolyLine") );
-        return;
-    }
+    //Check, if scaling is necessary
+    const bool doScale =
+        xoffset != 0 || yoffset != 0 || XLOG2DEV(10) != 10 || YLOG2DEV(10) != 10;

 
 

-    for (int i = 0; i < n; i++) 
-    {
-        wxCoord x1 = XLOG2DEV(points[i].x + xoffset);
-        wxCoord y1 = YLOG2DEV(points[i].y + yoffset);
+    // GdkPoint and wxPoint have the same memory layout, so we can cast one to the other
+    GdkPoint* gpts = reinterpret_cast<GdkPoint*>(points);

 
 

-        CalcBoundingBox( x1 + xoffset, y1 + yoffset );
+    if (doScale)
+        gpts = new GdkPoint[n];

 
 

-        gpts[i].x = x1;
-        gpts[i].y = y1;
+    for (int i = 0; i < n; i++)
+    {
+        if (doScale)
+        {
+            gpts[i].x = XLOG2DEV(points[i].x + xoffset);
+            gpts[i].y = YLOG2DEV(points[i].y + yoffset);
+        }
+        CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset);

     }
 
     if (m_window)
         gdk_draw_lines( m_window, m_penGC, gpts, n);
 
     }
 
     if (m_window)
         gdk_draw_lines( m_window, m_penGC, gpts, n);
 

-    delete[] gpts;
+    if (doScale)
+        delete[] gpts;

 }
 
 void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle) )
 }
 
 void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle) )


@@ -723,14 +693,25 @@ void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoor
 
     if (n <= 0) return;
 
 
     if (n <= 0) return;
 

-    GdkPoint *gdkpoints = new GdkPoint[n+1];
+    //Check, if scaling is necessary
+    const bool doScale =
+        xoffset != 0 || yoffset != 0 || XLOG2DEV(10) != 10 || YLOG2DEV(10) != 10;
+
+    // GdkPoint and wxPoint have the same memory layout, so we can cast one to the other
+    GdkPoint* gdkpoints = reinterpret_cast<GdkPoint*>(points);
+
+    if (doScale)
+        gdkpoints = new GdkPoint[n];
+

     int i;
     for (i = 0 ; i < n ; i++)
     {
     int i;
     for (i = 0 ; i < n ; i++)
     {

-        gdkpoints[i].x = XLOG2DEV(points[i].x + xoffset);
-        gdkpoints[i].y = YLOG2DEV(points[i].y + yoffset);
-
-        CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset );
+        if (doScale)
+        {
+            gdkpoints[i].x = XLOG2DEV(points[i].x + xoffset);
+            gdkpoints[i].y = YLOG2DEV(points[i].y + yoffset);
+        }
+        CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset);

     }
 
     if (m_window)
     }
 
     if (m_window)


@@ -784,11 +765,12 @@ void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoor
             }
 */
             gdk_draw_polygon( m_window, m_penGC, FALSE, gdkpoints, n );
             }
 */
             gdk_draw_polygon( m_window, m_penGC, FALSE, gdkpoints, n );

-            
+

         }
     }
 
         }
     }
 

-    delete[] gdkpoints;
+    if (doScale)
+        delete[] gdkpoints;

 }
 
 void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 }
 
 void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )


@@ -1038,7 +1020,7 @@ void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
 void wxWindowDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
 {
     // VZ: egcs 1.0.3 refuses to compile this without cast, no idea why
 void wxWindowDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
 {
     // VZ: egcs 1.0.3 refuses to compile this without cast, no idea why

-    DoDrawBitmap( (const wxBitmap&)icon, x, y, (bool)TRUE );
+    DoDrawBitmap( (const wxBitmap&)icon, x, y, true );

 }
 
 void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
 }
 
 void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,


@@ -1049,7 +1031,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
 
     wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
 
 
     wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
 

-    bool is_mono = (bitmap.GetBitmap() != NULL);
+    bool is_mono = bitmap.GetDepth() == 1;

 
     // scale/translate size and position
     int xx = XLOG2DEV(x);
 
     // scale/translate size and position
     int xx = XLOG2DEV(x);


@@ -1075,18 +1057,29 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
             return;
     }
 
             return;
     }
 

-    // scale bitmap if required 
+    // scale bitmap if required

     wxBitmap use_bitmap = bitmap;
     if ((w != ww) || (h != hh))
         use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
     wxBitmap use_bitmap = bitmap;
     if ((w != ww) || (h != hh))
         use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );

-    
+
+#if !GTK_CHECK_VERSION(2,2,0)
+    // NB: We can't render pixbufs with GTK+ < 2.2, we need to use pixmaps code.
+    //     Pixbufs-based bitmaps with alpha channel don't have a mask, so we
+    //     have to call GetPixmap() here -- it converts the pixbuf into pixmap
+    //     and also creates the mask as a side-effect:
+    use_bitmap.GetPixmap();
+#endif
+

     // apply mask if any
     GdkBitmap *mask = (GdkBitmap *) NULL;
     // apply mask if any
     GdkBitmap *mask = (GdkBitmap *) NULL;

-    if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
+    if (useMask && use_bitmap.GetMask())
+        mask = use_bitmap.GetMask()->GetBitmap();
+
+    GdkGC* use_gc = is_mono ? m_textGC : m_penGC;

 
     GdkBitmap *new_mask = (GdkBitmap*) NULL;
 
     GdkBitmap *new_mask = (GdkBitmap*) NULL;

-    
-    if (useMask && mask)
+
+    if (mask != NULL)

     {
         if (!m_currentClippingRegion.IsNull())
         {
     {
         if (!m_currentClippingRegion.IsNull())
         {


@@ -1105,72 +1098,58 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
             gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
             gdk_gc_set_stipple( gc, mask );
             gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
             gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
             gdk_gc_set_stipple( gc, mask );
             gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );

-            gdk_gc_unref( gc );
-        }
-        
-        if (is_mono)
-        {
-            if (new_mask)
-                gdk_gc_set_clip_mask( m_textGC, new_mask );
-            else
-                gdk_gc_set_clip_mask( m_textGC, mask );
-            gdk_gc_set_clip_origin( m_textGC, xx, yy );
-        }
-        else
-        {
-            if (new_mask)
-                gdk_gc_set_clip_mask( m_penGC, new_mask );
-            else
-                gdk_gc_set_clip_mask( m_penGC, mask );
-            gdk_gc_set_clip_origin( m_penGC, xx, yy );
+            mask = new_mask;
+            g_object_unref (gc);

         }
         }

+
+        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)
     {
     }
 
     // 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)
     {

-#ifdef __WXGTK20__
-        GdkPixmap *bitmap = gdk_pixmap_new( wxGetRootWindow()->window, ww, hh, -1 );
-        GdkGC *gc = gdk_gc_new( bitmap );
+        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_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
         gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );

-        gdk_wx_draw_bitmap( bitmap, gc, use_bitmap.GetBitmap(), 0, 0, 0, 0, -1, -1 );
-                
-        gdk_draw_drawable( m_window, m_textGC, bitmap, 0, 0, xx, yy, -1, -1 );
-        
-        gdk_bitmap_unref( bitmap );
-        gdk_gc_unref( gc );
-#else
-        gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), 0, 0, xx, yy, -1, -1 );
-#endif
+        gdk_wx_draw_bitmap( bitmap2, gc, use_bitmap.GetPixmap(), 0, 0, 0, 0, -1, -1 );
+
+        gdk_draw_drawable(m_window, use_gc, bitmap2, 0, 0, xx, yy, -1, -1);
+
+        g_object_unref (bitmap2);
+        g_object_unref (gc);

     }
     else
     {
     }
     else
     {

-        gdk_draw_pixmap( m_window, m_penGC, use_bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
-    }
-
-    // remove mask again if any
-    if (useMask && mask)
-    {
-        if (is_mono)
+#if GTK_CHECK_VERSION(2,2,0)
+        if (!gtk_check_version(2,2,0) && use_bitmap.HasPixbuf())

         {
         {

-            gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL );
-            gdk_gc_set_clip_origin( m_textGC, 0, 0 );
-            if (!m_currentClippingRegion.IsNull())
-                gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
+            gdk_draw_pixbuf(m_window, use_gc,
+                            use_bitmap.GetPixbuf(),
+                            0, 0, xx, yy, -1, -1,
+                            GDK_RGB_DITHER_NORMAL, xx, yy);

         }
         else
         }
         else

+#endif

         {
         {

-            gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
-            gdk_gc_set_clip_origin( m_penGC, 0, 0 );
-            if (!m_currentClippingRegion.IsNull())
-                gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
+            gdk_draw_drawable(m_window, use_gc,
+                              use_bitmap.GetPixmap(),
+                              0, 0, xx, yy, -1, -1);

         }
     }
         }
     }

-    
-    if (new_mask)
-        gdk_bitmap_unref( new_mask );
+
+    // 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());
+        if (new_mask != NULL)
+            g_object_unref(new_mask);
+    }

 }
 
 bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 }
 
 bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,


@@ -1181,23 +1160,22 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
                          bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask )
 {
                          bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask )
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid window dc") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid window dc") );

 
 

-    wxCHECK_MSG( source, FALSE, wxT("invalid source dc") );
+    wxCHECK_MSG( source, false, wxT("invalid source dc") );

 
 

-    if (!m_window) return FALSE;
+    if (!m_window) return false;

 
     // transform the source DC coords to the device ones
 
     // transform the source DC coords to the device ones

-    xsrc = source->XLOG2DEV(xsrc);
-    ysrc = source->YLOG2DEV(ysrc);
+    xsrc = source->LogicalToDeviceX(xsrc);
+    ysrc = source->LogicalToDeviceY(ysrc);

 
     wxClientDC *srcDC = (wxClientDC*)source;
     wxMemoryDC *memDC = (wxMemoryDC*)source;
 
 
     wxClientDC *srcDC = (wxClientDC*)source;
     wxMemoryDC *memDC = (wxMemoryDC*)source;
 

-    bool use_bitmap_method = FALSE;
-    bool is_mono = FALSE;
+    bool use_bitmap_method = false;
+    bool is_mono = false;

 
 

-    // TODO: use the mask origin when drawing transparently

     if (xsrcMask == -1 && ysrcMask == -1)
     {
         xsrcMask = xsrc;
     if (xsrcMask == -1 && ysrcMask == -1)
     {
         xsrcMask = xsrc;


@@ -1206,7 +1184,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
     if (srcDC->m_isMemDC)
     {
 
     if (srcDC->m_isMemDC)
     {

-        if (!memDC->m_selected.Ok()) return FALSE;
+        if (!memDC->m_selected.Ok()) return false;

 
         is_mono = (memDC->m_selected.GetDepth() == 1);
 
 
         is_mono = (memDC->m_selected.GetDepth() == 1);
 


@@ -1221,14 +1199,14 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             // we HAVE TO use the direct way for memory dcs
             // that have mask since the XCopyArea doesn't know
             // about masks
             // 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;
+            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
         }
         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;
+            use_bitmap_method = true;

         }
         else if ((xsrc == 0) && (ysrc == 0) &&
                  (width == memDC->m_selected.GetWidth()) &&
         }
         else if ((xsrc == 0) && (ysrc == 0) &&
                  (width == memDC->m_selected.GetWidth()) &&


@@ -1238,11 +1216,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             // 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
             // in the memory dc is copied in which case XCopyArea
             // wouldn't be able able to boost performace by reducing
             // the area to be scaled

-            use_bitmap_method = TRUE;
-        }
-        else
-        {
-            use_bitmap_method = FALSE;
+            use_bitmap_method = true;

         }
     }
 
         }
     }
 


@@ -1262,7 +1236,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         wxRegion tmp( xx,yy,ww,hh );
         tmp.Intersect( m_currentClippingRegion );
         if (tmp.IsEmpty())
         wxRegion tmp( xx,yy,ww,hh );
         tmp.Intersect( m_currentClippingRegion );
         if (tmp.IsEmpty())

-            return TRUE;
+            return true;

     }
 
     int old_logical_func = m_logicalFunction;
     }
 
     int old_logical_func = m_logicalFunction;


@@ -1282,7 +1256,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         wxCoord cy = yy;
         wxCoord cw = ww;
         wxCoord ch = hh;
         wxCoord cy = yy;
         wxCoord cw = ww;
         wxCoord ch = hh;

-        
+

         // interpret userscale of src too
         double xsc,ysc;
         memDC->GetUserScale(&xsc,&ysc);
         // interpret userscale of src too
         double xsc,ysc;
         memDC->GetUserScale(&xsc,&ysc);


@@ -1293,8 +1267,8 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         wxCoord bm_hh = YLOG2DEVREL( bm_height );
 
         // Scale bitmap if required
         wxCoord bm_hh = YLOG2DEVREL( bm_height );
 
         // Scale bitmap if required

-        wxBitmap use_bitmap;
-        if ((bm_width != bm_ww) || (bm_height != bm_hh))
+        wxBitmap use_bitmap = memDC->m_selected;
+        if ((memDC->m_selected.GetWidth()!= bm_ww) || ( memDC->m_selected.GetHeight()!= bm_hh))

         {
             // This indicates that the blitting code below will get
             // a clipped bitmap and therefore needs to move the origin
         {
             // This indicates that the blitting code below will get
             // a clipped bitmap and therefore needs to move the origin


@@ -1302,23 +1276,21 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             wxRegion tmp( xx,yy,ww,hh );
             tmp.Intersect( m_currentClippingRegion );
             tmp.GetBox(cx,cy,cw,ch);
             wxRegion tmp( xx,yy,ww,hh );
             tmp.Intersect( m_currentClippingRegion );
             tmp.GetBox(cx,cy,cw,ch);

-            
+

             // Scale and clipped bitmap
             use_bitmap = memDC->m_selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
         }
             // Scale and clipped bitmap
             use_bitmap = memDC->m_selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
         }

-        else
-        {
-            // Don't scale bitmap
-            use_bitmap = memDC->m_selected;
-        }

 
         // apply mask if any
         GdkBitmap *mask = (GdkBitmap *) NULL;
 
         // apply mask if any
         GdkBitmap *mask = (GdkBitmap *) NULL;

-        if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
+        if (useMask && use_bitmap.GetMask())
+            mask = use_bitmap.GetMask()->GetBitmap();
+
+        GdkGC* use_gc = is_mono ? m_textGC : m_penGC;

 
         GdkBitmap *new_mask = (GdkBitmap*) NULL;
 
         GdkBitmap *new_mask = (GdkBitmap*) NULL;

-        
-        if (useMask && mask)
+
+        if (mask != NULL)

         {
             if (!m_currentClippingRegion.IsNull())
             {
         {
             if (!m_currentClippingRegion.IsNull())
             {


@@ -1327,6 +1299,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
                 GdkGC *gc = gdk_gc_new( new_mask );
                 col.pixel = 0;
                 gdk_gc_set_foreground( gc, &col );
                 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 );
                 gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
                 col.pixel = 0;
                 gdk_gc_set_background( gc, &col );


@@ -1338,27 +1311,15 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
                 gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
                 gdk_gc_set_stipple( gc, mask );
                 gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
                 gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
                 gdk_gc_set_stipple( gc, mask );
                 gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );

-                gdk_gc_unref( gc );
+                mask = new_mask;
+                g_object_unref (gc);

             }
 
             }
 

-            if (is_mono)
-            {
-                if (new_mask)
-                    gdk_gc_set_clip_mask( m_textGC, new_mask );
-                else
-                    gdk_gc_set_clip_mask( m_textGC, mask );
-                // was: gdk_gc_set_clip_origin( m_textGC, xx, yy );
-                gdk_gc_set_clip_origin( m_textGC, cx, cy );
-            }
+            gdk_gc_set_clip_mask(use_gc, mask);
+            if (new_mask != NULL)
+                gdk_gc_set_clip_origin(use_gc, cx, cy);

             else
             else

-            {
-                if (new_mask)
-                    gdk_gc_set_clip_mask( m_penGC, new_mask );
-                else
-                    gdk_gc_set_clip_mask( m_penGC, mask );
-                // was: gdk_gc_set_clip_origin( m_penGC, xx, yy );
-                gdk_gc_set_clip_origin( m_penGC, cx, cy );
-            }
+                gdk_gc_set_clip_origin(use_gc, cx - xsrcMask, cy - ysrcMask);

         }
 
         // Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For
         }
 
         // Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For


@@ -1366,49 +1327,34 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
         if (is_mono)
         {
 
         if (is_mono)
         {

-#ifdef __WXGTK20__

             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() );
             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.GetBitmap(), 0, 0, 0, 0, -1, -1 );
-                
-            gdk_draw_drawable( m_window, m_textGC, bitmap, xsrc, ysrc, cx, cy, cw, ch );
-        
-            gdk_bitmap_unref( bitmap );
-            gdk_gc_unref( gc );
-#else
-            // was: gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), xsrc, ysrc, xx, yy, ww, hh );
-            gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), xsrc, ysrc, cx, cy, cw, ch );
-#endif
+            gdk_wx_draw_bitmap( bitmap, gc, use_bitmap.GetPixmap(), 0, 0, 0, 0, -1, -1 );
+
+            gdk_draw_drawable(m_window, use_gc, bitmap, xsrc, ysrc, cx, cy, cw, ch);
+
+            g_object_unref (bitmap);
+            g_object_unref (gc);

         }
         else
         {
         }
         else
         {

-            // was: gdk_draw_pixmap( m_window, m_penGC, use_bitmap.GetPixmap(), xsrc, ysrc, xx, yy, ww, hh );
-            gdk_draw_pixmap( m_window, m_penGC, use_bitmap.GetPixmap(), xsrc, ysrc, cx, cy, cw, ch );
+            // was: gdk_draw_drawable( m_window, m_penGC, use_bitmap.GetPixmap(), xsrc, ysrc, xx, yy, ww, hh );
+            gdk_draw_drawable(m_window, use_gc, use_bitmap.GetPixmap(), xsrc, ysrc, cx, cy, cw, ch);

         }
 
         // remove mask again if any
         }
 
         // remove mask again if any

-        if (useMask && mask)
+        if (mask != NULL)

         {
         {

-            if (is_mono)
-            {
-                gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL );
-                gdk_gc_set_clip_origin( m_textGC, 0, 0 );
-                if (!m_currentClippingRegion.IsNull())
-                    gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
-            }
-            else
-            {
-                gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
-                gdk_gc_set_clip_origin( m_penGC, 0, 0 );
-                if (!m_currentClippingRegion.IsNull())
-                    gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
-            }
+            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)
         if (new_mask)

-            gdk_bitmap_unref( new_mask );
+            g_object_unref (new_mask);

     }
     else // use_bitmap_method
     {
     }
     else // use_bitmap_method
     {


@@ -1419,30 +1365,31 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             tmp.Intersect( m_currentClippingRegion );
             wxCoord cx,cy,cw,ch;
             tmp.GetBox(cx,cy,cw,ch);
             tmp.Intersect( m_currentClippingRegion );
             wxCoord cx,cy,cw,ch;
             tmp.GetBox(cx,cy,cw,ch);

-            
-            // rescale bitmap   
+
+            // rescale bitmap

             wxBitmap bitmap = memDC->m_selected.Rescale( cx-xx, cy-yy, cw, ch, ww, hh );
 
             // draw scaled bitmap
             wxBitmap bitmap = memDC->m_selected.Rescale( cx-xx, cy-yy, cw, ch, ww, hh );
 
             // draw scaled bitmap

-            // was: gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
-            gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, cx, cy, -1, -1 );
+            // was: gdk_draw_drawable( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
+            gdk_draw_drawable( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, cx, cy, -1, -1 );

         }
         else
         {
         }
         else
         {

-            // No scaling and not a memory dc with a mask either 
+            // No scaling and not a memory dc with a mask either

 
             // copy including child window contents
             gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
 
             // copy including child window contents
             gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );

-            gdk_window_copy_area( m_window, m_penGC, xx, yy,
-                                  srcDC->GetWindow(),
-                                  xsrc, ysrc, width, height );
+            gdk_draw_drawable( m_window, m_penGC,
+                               srcDC->GetWindow(),
+                               xsrc, ysrc, xx, yy,
+                               width, height );

             gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
         }
     }
 
     SetLogicalFunction( old_logical_func );
             gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
         }
     }
 
     SetLogicalFunction( old_logical_func );

-    
-    return TRUE;
+
+    return true;

 }
 
 void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
 }
 
 void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )


@@ -1450,47 +1397,51 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
     wxCHECK_RET( Ok(), wxT("invalid window dc") );
 
     if (!m_window) return;
     wxCHECK_RET( Ok(), wxT("invalid window dc") );
 
     if (!m_window) return;

-    
-    if (text.empty()) return;
-
-#ifndef __WXGTK20__
-    GdkFont *font = m_font.GetInternalFont( m_scaleY );

 
 

-    wxCHECK_RET( font, wxT("invalid font") );
-#endif
+    if (text.empty()) return;

 
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);
 
 
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);
 

-#ifdef __WXGTK20__

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

-#if wxUSE_UNICODE
-    const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
-#else
-    const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );
-    const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
-#endif
-    pango_layout_set_text( m_layout, (const char*) data, strlen( (const char*) data ));
+    bool underlined = m_font.Ok() && m_font.GetUnderlined();
+
+    const wxCharBuffer data = wxGTK_CONV( text );
+    if ( !data )
+        return;
+    const size_t datalen = strlen(data);
+    pango_layout_set_text( m_layout, data, datalen);
+
+    if (underlined)
+    {
+        PangoAttrList *attrs = pango_attr_list_new();
+        PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
+        a->start_index = 0;
+        a->end_index = datalen;
+        pango_attr_list_insert(attrs, a);
+        pango_layout_set_attributes(m_layout, attrs);
+        pango_attr_list_unref(attrs);
+    }

 
     int w,h;
 
     int w,h;

-    
-    if (fabs(m_scaleY - 1.0) < 0.00001)
+
+    if (fabs(m_scaleY - 1.0) > 0.00001)

     {
          // 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
          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 );

-         
+

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

-        
+

          pango_layout_get_pixel_size( m_layout, &w, &h );
          if ( m_backgroundMode == wxSOLID )
          {
          pango_layout_get_pixel_size( m_layout, &w, &h );
          if ( m_backgroundMode == wxSOLID )
          {


@@ -1498,13 +1449,13 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
             gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
             gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
          }
             gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
             gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
          }

-         
+

          // Draw layout.
          gdk_draw_layout( m_window, m_textGC, x, y, m_layout );
          // Draw layout.
          gdk_draw_layout( m_window, m_textGC, x, y, m_layout );

-         
+

          // reset unscaled size
          pango_font_description_set_size( m_fontdesc, oldSize );
          // reset unscaled size
          pango_font_description_set_size( m_fontdesc, oldSize );

-         
+

          // actually apply unscaled font
          pango_layout_set_font_description( m_layout, m_fontdesc );
     }
          // actually apply unscaled font
          pango_layout_set_font_description( m_layout, m_fontdesc );
     }


@@ -1520,32 +1471,15 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         // Draw layout.
         gdk_draw_layout( m_window, m_textGC, x, y, m_layout );
     }
         // Draw layout.
         gdk_draw_layout( m_window, m_textGC, x, y, m_layout );
     }

-    
-    wxCoord width = w;
-    wxCoord height = h;
-    
-#else // GTK+ 1.x
-    wxCoord width = gdk_string_width( font, text.mbc_str() );
-    wxCoord height = font->ascent + font->descent;

 
 

-    if ( m_backgroundMode == wxSOLID )
+    if (underlined)

     {
     {

-        gdk_gc_set_foreground( m_textGC, m_textBackgroundColour.GetColor() );
-        gdk_draw_rectangle( m_window, m_textGC, TRUE, x, y, width, height );
-        gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
+        // undo underline attributes setting:
+        pango_layout_set_attributes(m_layout, NULL);

     }
     }

-    gdk_draw_string( m_window, font, m_textGC, x, y + font->ascent, text.mbc_str() );

 
 

-    /* CMB 17/7/98: simple underline: ignores scaling and underlying
-       X font's XA_UNDERLINE_POSITION and XA_UNDERLINE_THICKNESS
-       properties (see wxXt implementation) */
-    if (m_font.GetUnderlined())
-    {
-        wxCoord ul_y = y + font->ascent;
-        if (font->descent > 0) ul_y++;
-        gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
-    }
-#endif // GTK+ 2.0/1.x
+    wxCoord width = w;
+    wxCoord height = h;

 
     width = wxCoord(width / m_scaleX);
     height = wxCoord(height / m_scaleY);
 
     width = wxCoord(width / m_scaleX);
     height = wxCoord(height / m_scaleY);


@@ -1553,38 +1487,39 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
     CalcBoundingBox (x, y);
 }
 
     CalcBoundingBox (x, y);
 }
 

+
+// TODO: There is an example of rotating text with GTK2 that would probably be
+// a better approach here:
+//           http://www.daa.com.au/pipermail/pygtk/2003-April/005052.html
+

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

-    if (angle == 0.0)
-    {
-        DrawText(text, x, y);
+    if (!m_window || text.empty())

         return;
         return;

-    }

 
     wxCHECK_RET( Ok(), wxT("invalid window dc") );
 
 
     wxCHECK_RET( Ok(), wxT("invalid window dc") );
 

-    if (!m_window) return;
-
-#ifdef __WXGTK20__
-    // implement later without GdkFont for GTK 2.0
-    return;
-#else
-    GdkFont *font = m_font.GetInternalFont( m_scaleY );
+    if ( wxIsNullDouble(angle) )
+    {
+        DrawText(text, x, y);
+        return;
+    }

 
 

-    wxCHECK_RET( font, wxT("invalid font") );
+    wxCoord w;
+    wxCoord h;

 
 

-    // the size of the text
-    wxCoord w = gdk_string_width( font, text.mbc_str() );
-    wxCoord h = font->ascent + font->descent;
+    // TODO: implement later without GdkFont for GTK 2.0
+    GetTextExtent(text, &w, &h, NULL,NULL, &m_font);

 
     // draw the string normally
     wxBitmap src(w, h);
     wxMemoryDC dc;
     dc.SelectObject(src);
     dc.SetFont(GetFont());
 
     // draw the string normally
     wxBitmap src(w, h);
     wxMemoryDC dc;
     dc.SelectObject(src);
     dc.SetFont(GetFont());

-    dc.SetBackground(*wxWHITE_BRUSH);
+    dc.SetBackground(*wxBLACK_BRUSH);

     dc.SetBrush(*wxBLACK_BRUSH);
     dc.Clear();
     dc.SetBrush(*wxBLACK_BRUSH);
     dc.Clear();

+    dc.SetTextForeground( *wxWHITE );

     dc.DrawText(text, 0, 0);
     dc.SelectObject(wxNullBitmap);
 
     dc.DrawText(text, 0, 0);
     dc.SelectObject(wxNullBitmap);
 


@@ -1608,47 +1543,40 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
             minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5),
             minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
 
             minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5),
             minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
 

-    // prepare to blit-with-rotate the bitmap to the DC
-    wxImage image = src.ConvertToImage();

 
 

-    GdkColor *colText = m_textForegroundColour.GetColor(),
-             *colBack = m_textBackgroundColour.GetColor();
+    wxImage image = src.ConvertToImage();

 
 

-    bool textColSet = TRUE;
+    image.ConvertColourToAlpha( m_textForegroundColour.Red(),
+                                m_textForegroundColour.Green(),
+                                m_textForegroundColour.Blue() );
+    image = image.Rotate( rad, wxPoint(0,0) );
+
+    int i_angle = (int) angle;
+    i_angle = i_angle % 360;
+    if (i_angle < 0)
+        i_angle += 360;
+    int xoffset = 0;
+    if ((i_angle >= 90.0) && (i_angle < 270.0))
+        xoffset = image.GetWidth();
+    int yoffset = 0;
+    if ((i_angle >= 0.0) && (i_angle < 180.0))
+        yoffset = image.GetHeight();
+
+    if ((i_angle >= 0) && (i_angle < 90))
+        yoffset -= (int)( cos(rad)*h );
+    if ((i_angle >= 90) && (i_angle < 180))
+        xoffset -= (int)( sin(rad)*h );
+    if ((i_angle >= 180) && (i_angle < 270))
+        yoffset -= (int)( cos(rad)*h );
+    if ((i_angle >= 270) && (i_angle < 360))
+        xoffset -= (int)( sin(rad)*h );
+
+    int i_x = x - xoffset;
+    int i_y = y - yoffset;
+
+    src = image;
+    DoDrawBitmap( src, i_x, i_y, true );

 
 

-    unsigned char *data = image.GetData();
-
-    // paint pixel by pixel
-    for ( wxCoord srcX = 0; srcX < w; srcX++ )
-    {
-        for ( wxCoord srcY = 0; srcY < h; srcY++ )
-        {
-            // transform source coords to dest coords
-            double r = sqrt((double)srcX*srcX + srcY*srcY);
-            double angleOrig = atan2((double)srcY, (double)srcX) - rad;
-            wxCoord dstX = (wxCoord)(r*cos(angleOrig) + 0.5),
-                    dstY = (wxCoord)(r*sin(angleOrig) + 0.5);
-
-            // black pixel?
-            bool textPixel = data[(srcY*w + srcX)*3] == 0;
-            if ( textPixel || (m_backgroundMode == wxSOLID) )
-            {
-                // change colour if needed
-                if ( textPixel != textColSet )
-                {
-                    gdk_gc_set_foreground( m_textGC, textPixel ? colText
-                                                               : colBack );
-
-                    textColSet = textPixel;
-                }
-
-                // don't use DrawPoint() because it uses the current pen
-                // colour, and we don't need it here
-                gdk_draw_point( m_window, m_textGC,
-                                XLOG2DEV(x) + dstX, YLOG2DEV(y) + dstY );
-            }
-        }
-    }

 
     // it would be better to draw with non underlined font and draw the line
     // manually here (it would be more straight...)
 
     // it would be better to draw with non underlined font and draw the line
     // manually here (it would be more straight...)


@@ -1661,13 +1589,9 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
     }
 #endif // 0
 
     }
 #endif // 0
 

-    // restore the font colour
-    gdk_gc_set_foreground( m_textGC, colText );
-

     // update the bounding box
     CalcBoundingBox(x + minX, y + minY);
     CalcBoundingBox(x + maxX, y + maxY);
     // update the bounding box
     CalcBoundingBox(x + minX, y + minY);
     CalcBoundingBox(x + maxX, y + maxY);

-#endif

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


@@ -1675,30 +1599,34 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
                                  wxCoord *descent, wxCoord *externalLeading,
                                  wxFont *theFont) const
 {
                                  wxCoord *descent, wxCoord *externalLeading,
                                  wxFont *theFont) const
 {

-    if (string.IsEmpty())
-    {
-        if (width) (*width) = 0;
-        if (height) (*height) = 0;
+    if ( width )
+        *width = 0;
+    if ( height )
+        *height = 0;
+    if ( descent )
+        *descent = 0;
+    if ( externalLeading )
+        *externalLeading = 0;
+
+    if (string.empty())

         return;
         return;

+
+    // ensure that theFont is always non-NULL
+    if ( !theFont || !theFont->Ok() )
+        theFont = wx_const_cast(wxFont *, &m_font);
+
+    // and use it if it's valid
+    if ( theFont->Ok() )
+    {
+        pango_layout_set_font_description
+        (
+            m_layout,
+            theFont->GetNativeFontInfo()->description
+        );

     }
     }

-    
-#ifdef __WXGTK20__
-    // Set new font description
-    if (theFont)
-        pango_layout_set_font_description( m_layout, theFont->GetNativeFontInfo()->description );
-        
-    // Set layout's text
-#if wxUSE_UNICODE
-    const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
-    const char *dataUTF8 = (const char *)data;
-#else
-    const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
-    if ( !wdata )
-        return;
-    const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
-    const char *dataUTF8 = (const char *)data;
-#endif

 
 

+    // Set layout's text
+    const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(string, *theFont);

     if ( !dataUTF8 )
     {
         // hardly ideal, but what else can we do if conversion failed?
     if ( !dataUTF8 )
     {
         // hardly ideal, but what else can we do if conversion failed?


@@ -1706,65 +1634,41 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
     }
 
     pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
     }
 
     pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );

- 
-    int w,h;
-    pango_layout_get_pixel_size( m_layout, &w, &h );
-    
-    if (width)
-        *width = (wxCoord) w; 
-    if (height)
-        *height = (wxCoord) h;
+

     if (descent)
     {
     if (descent)
     {

-        // Do something about metrics here. TODO.
-        *descent = 0;
+        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);
+
+        if (height)
+            *height = (wxCoord) h;
+    }
+    else
+    {
+        pango_layout_get_pixel_size( m_layout, width, height );

     }
     }

-    if (externalLeading)
-        *externalLeading = 0;  // ??
-    
+

     // Reset old font description
     if (theFont)
         pango_layout_set_font_description( m_layout, m_fontdesc );
     // Reset old font description
     if (theFont)
         pango_layout_set_font_description( m_layout, m_fontdesc );

-#else // GTK+ 1.x
-    wxFont fontToUse = m_font;
-    if (theFont) fontToUse = *theFont;
-    
-    GdkFont *font = fontToUse.GetInternalFont( m_scaleY );
-    if (width) (*width) = wxCoord(gdk_string_width( font, string.mbc_str() ) / m_scaleX);
-    if (height) (*height) = wxCoord((font->ascent + font->descent) / m_scaleY);
-    if (descent) (*descent) = wxCoord(font->descent / m_scaleY);
-    if (externalLeading) (*externalLeading) = 0;  // ??
-#endif // GTK+ 2/1

 }
 
 wxCoord wxWindowDC::GetCharWidth() const
 {
 }
 
 wxCoord wxWindowDC::GetCharWidth() const
 {

-#ifdef __WXGTK20__

     pango_layout_set_text( m_layout, "H", 1 );
     pango_layout_set_text( m_layout, "H", 1 );

-    int w,h;
-    pango_layout_get_pixel_size( m_layout, &w, &h );
+    int w;
+    pango_layout_get_pixel_size( m_layout, &w, NULL );

     return w;
     return w;

-#else
-    GdkFont *font = m_font.GetInternalFont( m_scaleY );
-    wxCHECK_MSG( font, -1, wxT("invalid font") );
-
-    return wxCoord(gdk_string_width( font, "H" ) / m_scaleX);
-#endif

 }
 
 wxCoord wxWindowDC::GetCharHeight() const
 {
 }
 
 wxCoord wxWindowDC::GetCharHeight() const
 {

-#ifdef __WXGTK20__
-    pango_layout_set_text( m_layout, "H", 1 );
-    int w,h;
-    pango_layout_get_pixel_size( m_layout, &w, &h );
-    return h;
-#else
-    GdkFont *font = m_font.GetInternalFont( m_scaleY );
-    wxCHECK_MSG( font, -1, wxT("invalid font") );
-
-    return wxCoord((font->ascent + font->descent) / m_scaleY);
-#endif
+    PangoFontMetrics *metrics = pango_context_get_metrics (m_context, m_fontdesc, NULL);
+    return PANGO_PIXELS (pango_font_metrics_get_descent (metrics) + pango_font_metrics_get_ascent (metrics));

 }
 
 void wxWindowDC::Clear()
 }
 
 void wxWindowDC::Clear()


@@ -1808,42 +1712,35 @@ void wxWindowDC::Clear()
 void wxWindowDC::SetFont( const wxFont &font )
 {
     m_font = font;
 void wxWindowDC::SetFont( const wxFont &font )
 {
     m_font = font;

-    
-#ifdef __WXGTK20__
+

     if (m_font.Ok())
     {
         if (m_fontdesc)
             pango_font_description_free( m_fontdesc );
     if (m_font.Ok())
     {
         if (m_fontdesc)
             pango_font_description_free( m_fontdesc );

-        
+

         m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
         m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );

-        
-   
+
+

         if (m_owner)
         {
             PangoContext *oldContext = m_context;
         if (m_owner)
         {
             PangoContext *oldContext = m_context;

-            
-            // We might want to use the X11 context for faster
-            // rendering on screen
-            if (m_font.GetNoAntiAliasing())
-                m_context = m_owner->GtkGetPangoX11Context();
-            else
-                m_context = m_owner->GtkGetPangoDefaultContext();
-                
+
+            m_context = m_owner->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,

-            // at least, and it doesn't hurt to do it. 
+            // at least, and it doesn't hurt to do it.

             if (oldContext != m_context)
             {
                 if (m_layout)
             if (oldContext != m_context)
             {
                 if (m_layout)

-                    g_object_unref( G_OBJECT( m_layout ) );
-                
+                    g_object_unref (m_layout);
+

                 m_layout = pango_layout_new( m_context );
             }
         }
                 m_layout = pango_layout_new( m_context );
             }
         }

-        
+

         pango_layout_set_font_description( m_layout, m_fontdesc );
     }
         pango_layout_set_font_description( m_layout, m_fontdesc );
     }

-#endif

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


@@ -1943,7 +1840,6 @@ void wxWindowDC::SetPen( const wxPen &pen )
         }
     }
 
         }
     }
 

-#if (GTK_MINOR_VERSION > 0) || (GTK_MAJOR_VERSION > 1)

     if (req_dash && req_nb_dash)
     {
         wxGTKDash *real_req_dash = new wxGTKDash[req_nb_dash];
     if (req_dash && req_nb_dash)
     {
         wxGTKDash *real_req_dash = new wxGTKDash[req_nb_dash];


@@ -1960,7 +1856,6 @@ void wxWindowDC::SetPen( const wxPen &pen )
             gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash );
         }
     }
             gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash );
         }
     }

-#endif // GTK+ > 1.0

 
     GdkCapStyle capStyle = GDK_CAP_ROUND;
     switch (m_pen.GetCap())
 
     GdkCapStyle capStyle = GDK_CAP_ROUND;
     switch (m_pen.GetCap())


@@ -2017,7 +1912,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
 
     if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->Ok()))
     {
 
     if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->Ok()))
     {

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

         {
             gdk_gc_set_fill( m_brushGC, GDK_TILED );
             gdk_gc_set_tile( m_brushGC, m_brush.GetStipple()->GetPixmap() );
         {
             gdk_gc_set_fill( m_brushGC, GDK_TILED );
             gdk_gc_set_tile( m_brushGC, m_brush.GetStipple()->GetPixmap() );


@@ -2025,7 +1920,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
         else
         {
             gdk_gc_set_fill( m_brushGC, GDK_STIPPLED );
         else
         {
             gdk_gc_set_fill( m_brushGC, GDK_STIPPLED );

-            gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetBitmap() );
+            gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetPixmap() );

         }
     }
 
         }
     }
 


@@ -2035,7 +1930,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
         gdk_gc_set_stipple( m_textGC, m_brush.GetStipple()->GetMask()->GetBitmap() );
     }
 
         gdk_gc_set_stipple( m_textGC, m_brush.GetStipple()->GetMask()->GetBitmap() );
     }
 

-    if (IS_HATCH(m_brush.GetStyle()))
+    if (m_brush.IsHatch())

     {
         gdk_gc_set_fill( m_brushGC, GDK_STIPPLED );
         int num = m_brush.GetStyle() - wxBDIAGONAL_HATCH;
     {
         gdk_gc_set_fill( m_brushGC, GDK_STIPPLED );
         int num = m_brush.GetStyle() - wxBDIAGONAL_HATCH;


@@ -2068,7 +1963,7 @@ void wxWindowDC::SetBackground( const wxBrush &brush )
 
     if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->Ok()))
     {
 
     if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->Ok()))
     {

-        if (m_backgroundBrush.GetStipple()->GetPixmap())
+        if (m_backgroundBrush.GetStipple()->GetDepth() != 1)

         {
             gdk_gc_set_fill( m_bgGC, GDK_TILED );
             gdk_gc_set_tile( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );
         {
             gdk_gc_set_fill( m_bgGC, GDK_TILED );
             gdk_gc_set_tile( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );


@@ -2076,11 +1971,11 @@ void wxWindowDC::SetBackground( const wxBrush &brush )
         else
         {
             gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );
         else
         {
             gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );

-            gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetBitmap() );
+            gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );

         }
     }
 
         }
     }
 

-    if (IS_HATCH(m_backgroundBrush.GetStyle()))
+    if (m_backgroundBrush.IsHatch())

     {
         gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );
         int num = m_backgroundBrush.GetStyle() - wxBDIAGONAL_HATCH;
     {
         gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );
         int num = m_backgroundBrush.GetStyle() - wxBDIAGONAL_HATCH;


@@ -2104,7 +1999,6 @@ void wxWindowDC::SetLogicalFunction( int function )
     {
         case wxXOR:          mode = GDK_XOR;           break;
         case wxINVERT:       mode = GDK_INVERT;        break;
     {
         case wxXOR:          mode = GDK_XOR;           break;
         case wxINVERT:       mode = GDK_INVERT;        break;

-#if (GTK_MINOR_VERSION > 0) || (GTK_MAJOR_VERSION > 1)

         case wxOR_REVERSE:   mode = GDK_OR_REVERSE;    break;
         case wxAND_REVERSE:  mode = GDK_AND_REVERSE;   break;
         case wxCLEAR:        mode = GDK_CLEAR;         break;
         case wxOR_REVERSE:   mode = GDK_OR_REVERSE;    break;
         case wxAND_REVERSE:  mode = GDK_AND_REVERSE;   break;
         case wxCLEAR:        mode = GDK_CLEAR;         break;


@@ -2121,7 +2015,6 @@ void wxWindowDC::SetLogicalFunction( int function )
 
         // unsupported by GTK
         case wxNOR:          mode = GDK_COPY;          break;
 
         // unsupported by GTK
         case wxNOR:          mode = GDK_COPY;          break;

-#endif // GTK+ > 1.0

         default:
            wxFAIL_MSG( wxT("unsupported logical function") );
            mode = GDK_COPY;
         default:
            wxFAIL_MSG( wxT("unsupported logical function") );
            mode = GDK_COPY;


@@ -2306,22 +2199,19 @@ void wxWindowDC::Destroy()
 
 void wxWindowDC::ComputeScaleAndOrigin()
 {
 
 void wxWindowDC::ComputeScaleAndOrigin()
 {

-    /* CMB: copy scale to see if it changes */
-    double origScaleX = m_scaleX;
-    double origScaleY = m_scaleY;
+    const wxRealPoint origScale(m_scaleX, m_scaleY);

 
     wxDC::ComputeScaleAndOrigin();
 
 
     wxDC::ComputeScaleAndOrigin();
 

-    /* CMB: if scale has changed call SetPen to recalulate the line width */
-    if ((m_scaleX != origScaleX || m_scaleY != origScaleY) &&
-        (m_pen.Ok()))
+    // if scale has changed call SetPen to recalulate the line width
+    if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.Ok() )

     {
     {

-      /* this is a bit artificial, but we need to force wxDC to think
-         the pen has changed */
-      wxPen pen = m_pen;
-      m_pen = wxNullPen;
-      SetPen( pen );
-  }
+        // this is a bit artificial, but we need to force wxDC to think the pen
+        // has changed
+        wxPen pen = m_pen;
+        m_pen = wxNullPen;
+        SetPen( pen );
+    }

 }
 
 // Resolution in pixels per logical inch
 }
 
 // Resolution in pixels per logical inch


@@ -2332,9 +2222,7 @@ wxSize wxWindowDC::GetPPI() const
 
 int wxWindowDC::GetDepth() const
 {
 
 int wxWindowDC::GetDepth() const
 {

-    wxFAIL_MSG(wxT("not implemented"));
-
-    return -1;
+    return gdk_drawable_get_depth(m_window);

 }
 
 
 }
 
 


@@ -2373,7 +2261,7 @@ wxPaintDC::wxPaintDC( wxWindow *win )
     wxSize sz = win->GetSize();
     m_paintClippingRegion = win->GetUpdateRegion();
     wxLimitRegionToSize(m_paintClippingRegion, sz);
     wxSize sz = win->GetSize();
     m_paintClippingRegion = win->GetUpdateRegion();
     wxLimitRegionToSize(m_paintClippingRegion, sz);

-    
+

     GdkRegion *region = m_paintClippingRegion.GetRegion();
     if ( region )
     {
     GdkRegion *region = m_paintClippingRegion.GetRegion();
     if ( region )
     {


@@ -2436,7 +2324,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
 bool wxDCModule::OnInit()
 {
     wxInitGCPool();
 bool wxDCModule::OnInit()
 {
     wxInitGCPool();

-    return TRUE;
+    return true;

 }
 
 void wxDCModule::OnExit()
 }
 
 void wxDCModule::OnExit()