Correct a print format specifier mismatch in wxFileConfig::Parse().

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

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index d67e3cc0c004510f5993bede24f774bfae9259f9..5b5774bbab629853e5b20d174866314e36f6f783 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/dcclient.cpp
+// Name:        src/gtk1/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"
 


@@ -18,16 +14,18 @@
 #define XCopyPlane XCOPYPLANE
 #endif
 
 #define XCopyPlane XCOPYPLANE
 #endif
 

-#include "wx/dcclient.h"
-#include "wx/dcmemory.h"
-#include "wx/image.h"
-#include "wx/module.h"
-#include "wx/log.h"
-#include "wx/fontutil.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/math.h" // for floating-point functions
+    #include "wx/image.h"
+    #include "wx/module.h"
+#endif

 
 

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

 
 

-#include <math.h>               // for floating-point functions
+#include "wx/gtk1/win_gtk.h"
+#include "wx/gtk1/dcclient.h"
+#include "wx/gtk1/dcmemory.h"

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


@@ -92,29 +90,14 @@ 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__
-    gint src_width, src_height;
-    gdk_drawable_get_size(src, &src_width, &src_height);
-    if (width == -1) width = src_width;
-    if (height == -1) height = src_height;
+    wxCHECK_RET( drawable, wxT("NULL drawable in gdk_wx_draw_bitmap") );
+    wxCHECK_RET( src, wxT("NULL src in gdk_wx_draw_bitmap") );
+    wxCHECK_RET( gc, wxT("NULL gc in gdk_wx_draw_bitmap") );

 
 

-    XCopyPlane( GDK_WINDOW_XDISPLAY(drawable),
-                GDK_WINDOW_XID(src),
-                GDK_WINDOW_XID(drawable),
-                GDK_GC_XGC(gc),
-                xsrc, ysrc,
-                width, height,
-                0, 0,
-                1 );
-#else

     GdkWindowPrivate *drawable_private;
     GdkWindowPrivate *src_private;
     GdkGCPrivate *gc_private;
     GdkWindowPrivate *drawable_private;
     GdkWindowPrivate *src_private;
     GdkGCPrivate *gc_private;

-    
+

     drawable_private = (GdkWindowPrivate*) drawable;
     src_private = (GdkWindowPrivate*) src;
     if (drawable_private->destroyed || src_private->destroyed)
     drawable_private = (GdkWindowPrivate*) drawable;
     src_private = (GdkWindowPrivate*) src;
     if (drawable_private->destroyed || src_private->destroyed)


@@ -124,10 +107,10 @@ void gdk_wx_draw_bitmap(GdkDrawable  *drawable,
     gint src_height = src_private->height;
 
     gc_private = (GdkGCPrivate*) gc;
     gint src_height = src_private->height;
 
     gc_private = (GdkGCPrivate*) gc;

-    
+

     if (width == -1) width = src_width;
     if (height == -1) height = src_height;
     if (width == -1) width = src_width;
     if (height == -1) height = src_height;

-    
+

     XCopyPlane( drawable_private->xdisplay,
                 src_private->xwindow,
                 drawable_private->xwindow,
     XCopyPlane( drawable_private->xdisplay,
                 src_private->xwindow,
                 drawable_private->xwindow,


@@ -136,15 +119,12 @@ void gdk_wx_draw_bitmap(GdkDrawable  *drawable,
                 width, height,
                 xdest, ydest,
                 1 );
                 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 +160,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 +175,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));
 }


@@ -216,7 +196,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 +205,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,24 +224,24 @@ 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") );
 

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

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


@@ -270,7 +250,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;
         }
     }


@@ -279,40 +259,37 @@ static void wxFreePoolGC( GdkGC *gc )
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxWindowDC
+// wxWindowDCImpl

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

-IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
+IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxDC)

 
 

-wxWindowDC::wxWindowDC()
+wxWindowDCImpl::wxWindowDCImpl(wxDC *owner)
+              : wxGTKDCImpl(owner)

 {
 {

-    m_penGC = (GdkGC *) NULL;
-    m_brushGC = (GdkGC *) NULL;
-    m_textGC = (GdkGC *) NULL;
-    m_bgGC = (GdkGC *) NULL;
-    m_cmap = (GdkColormap *) NULL;
-    m_isMemDC = FALSE;
-    m_isScreenDC = FALSE;
-    m_owner = (wxWindow *)NULL;
-#ifdef __WXGTK20__
-    m_context = (PangoContext *)NULL;
-    m_layout = (PangoLayout *)NULL;
-    m_fontdesc = (PangoFontDescription *)NULL;
-#endif
+    m_penGC = NULL;
+    m_brushGC = NULL;
+    m_textGC = NULL;
+    m_bgGC = NULL;
+    m_cmap = NULL;
+    m_isMemDC = false;
+    m_isScreenDC = false;
+    m_owner = NULL;

 }
 
 }
 

-wxWindowDC::wxWindowDC( wxWindow *window )
+wxWindowDCImpl::wxWindowDCImpl(wxDC *owner, wxWindow *window)
+              : wxGTKDCImpl(owner)

 {
     wxASSERT_MSG( window, wxT("DC needs a window") );
 
 {
     wxASSERT_MSG( window, wxT("DC needs a window") );
 

-    m_penGC = (GdkGC *) NULL;
-    m_brushGC = (GdkGC *) NULL;
-    m_textGC = (GdkGC *) NULL;
-    m_bgGC = (GdkGC *) NULL;
-    m_cmap = (GdkColormap *) NULL;
-    m_owner = (wxWindow *)NULL;
-    m_isMemDC = FALSE;
-    m_isScreenDC = FALSE;
+    m_penGC = NULL;
+    m_brushGC = NULL;
+    m_textGC = NULL;
+    m_bgGC = NULL;
+    m_cmap = NULL;
+    m_owner = NULL;
+    m_isMemDC = false;
+    m_isScreenDC = false;

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


@@ -328,12 +305,6 @@ 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 );
-#endif
-

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


@@ -341,7 +312,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;
     }


@@ -360,21 +331,14 @@ wxWindowDC::wxWindowDC( wxWindow *window )
     m_owner = window;
 }
 
     m_owner = window;
 }
 

-wxWindowDC::~wxWindowDC()
+wxWindowDCImpl::~wxWindowDCImpl()

 {
     Destroy();
 {
     Destroy();

-    
-#ifdef __WXGTK20__
-    if (m_layout)
-        g_object_unref( G_OBJECT( m_layout ) );
-    if (m_fontdesc)
-        pango_font_description_free( m_fontdesc );
-#endif

 }
 
 }
 

-void wxWindowDC::SetUpDC()
+void wxWindowDCImpl::SetUpDC()

 {
 {

-    m_ok = TRUE;
+    m_ok = true;

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


@@ -385,8 +349,7 @@ void wxWindowDC::SetUpDC()
         m_textGC = wxGetPoolGC( m_window, wxTEXT_SCREEN );
         m_bgGC = wxGetPoolGC( m_window, wxBG_SCREEN );
     }
         m_textGC = wxGetPoolGC( m_window, wxTEXT_SCREEN );
         m_bgGC = wxGetPoolGC( m_window, wxBG_SCREEN );
     }

-    else
-    if (m_isMemDC && (((wxMemoryDC*)this)->m_selected.GetDepth() == 1))
+    else if (m_isMemDC && (((wxMemoryDCImpl*)this)->m_selected.GetDepth() == 1))

     {
         m_penGC = wxGetPoolGC( m_window, wxPEN_MONO );
         m_brushGC = wxGetPoolGC( m_window, wxBRUSH_MONO );
     {
         m_penGC = wxGetPoolGC( m_window, wxPEN_MONO );
         m_brushGC = wxGetPoolGC( m_window, wxBRUSH_MONO );


@@ -441,57 +404,57 @@ void wxWindowDC::SetUpDC()
     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 );
+    gdk_gc_set_clip_rectangle( m_penGC, NULL );
+    gdk_gc_set_clip_rectangle( m_brushGC, NULL );
+    gdk_gc_set_clip_rectangle( m_textGC, NULL );
+    gdk_gc_set_clip_rectangle( m_bgGC, NULL );

 
     if (!hatch_bitmap)
     {
         hatch_bitmap    = hatches;
 
     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 );
+        hatch_bitmap[0] = gdk_bitmap_create_from_data( NULL, bdiag_bits, bdiag_width, bdiag_height );
+        hatch_bitmap[1] = gdk_bitmap_create_from_data( NULL, cdiag_bits, cdiag_width, cdiag_height );
+        hatch_bitmap[2] = gdk_bitmap_create_from_data( NULL, fdiag_bits, fdiag_width, fdiag_height );
+        hatch_bitmap[3] = gdk_bitmap_create_from_data( NULL, cross_bits, cross_width, cross_height );
+        hatch_bitmap[4] = gdk_bitmap_create_from_data( NULL, horiz_bits, horiz_width, horiz_height );
+        hatch_bitmap[5] = gdk_bitmap_create_from_data( NULL, verti_bits, verti_width, verti_height );

     }
 }
 
     }
 }
 

-void wxWindowDC::DoGetSize( int* width, int* height ) const
+void wxWindowDCImpl::DoGetSize( int* width, int* height ) const

 {
 {

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

 
     m_owner->GetSize(width, height);
 }
 
 
     m_owner->GetSize(width, height);
 }
 

-extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
-                          const wxColour & col, int style);
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+                          const wxColour & col, wxFloodFillStyle style);

 
 

-bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
-                             const wxColour& col, int style)
+bool wxWindowDCImpl::DoFloodFill(wxCoord x, wxCoord y,
+                             const wxColour& col, wxFloodFillStyle style)

 {
 {

-    return wxDoFloodFill(this, x, y, col, style);
+    return wxDoFloodFill(GetOwner(), x, y, col, style);

 }
 
 }
 

-bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
+bool wxWindowDCImpl::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const

 {
     // Generic (and therefore rather inefficient) method.
     // Could be improved.
     wxMemoryDC memdc;
     wxBitmap bitmap(1, 1);
     memdc.SelectObject(bitmap);
 {
     // Generic (and therefore rather inefficient) method.
     // Could be improved.
     wxMemoryDC memdc;
     wxBitmap bitmap(1, 1);
     memdc.SelectObject(bitmap);

-    memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1);
+    memdc.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));
     memdc.SelectObject(wxNullBitmap);
 
     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 wxWindowDCImpl::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if (m_pen.GetStyle() != wxTRANSPARENT)
     {
 
     if (m_pen.GetStyle() != wxTRANSPARENT)
     {


@@ -503,9 +466,9 @@ void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
     }
 }
 
     }
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if (m_pen.GetStyle() != wxTRANSPARENT)
     {
 
     if (m_pen.GetStyle() != wxTRANSPARENT)
     {


@@ -522,10 +485,10 @@ void wxWindowDC::DoCrossHair( wxCoord x, wxCoord y )
     }
 }
 
     }
 }
 

-void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
+void wxWindowDCImpl::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,

                             wxCoord xc, wxCoord yc )
 {
                             wxCoord xc, wxCoord yc )
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     wxCoord xx1 = XLOG2DEV(x1);
     wxCoord yy1 = YLOG2DEV(y1);
 
     wxCoord xx1 = XLOG2DEV(x1);
     wxCoord yy1 = YLOG2DEV(y1);


@@ -544,10 +507,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
     {


@@ -614,9 +577,9 @@ void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
     CalcBoundingBox (x2, y2);
 }
 
     CalcBoundingBox (x2, y2);
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     wxCoord xx = XLOG2DEV(x);
     wxCoord yy = YLOG2DEV(y);
 
     wxCoord xx = XLOG2DEV(x);
     wxCoord yy = YLOG2DEV(y);


@@ -676,9 +639,9 @@ void wxWindowDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord
     CalcBoundingBox (x + width, y + height);
 }
 
     CalcBoundingBox (x + width, y + height);
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if ((m_pen.GetStyle() != wxTRANSPARENT) && m_window)
         gdk_draw_point( m_window, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );
 
     if ((m_pen.GetStyle() != wxTRANSPARENT) && m_window)
         gdk_draw_point( m_window, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );


@@ -686,114 +649,108 @@ void wxWindowDC::DoDrawPoint( wxCoord x, wxCoord y )
     CalcBoundingBox (x, y);
 }
 
     CalcBoundingBox (x, y);
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     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)
+
+    GdkPoint * const gpts = new GdkPoint[n];
+    if ( !gpts )

     {
         wxFAIL_MSG( wxT("Cannot allocate PolyLine") );
         return;
     }
 
     {
         wxFAIL_MSG( wxT("Cannot allocate PolyLine") );
         return;
     }
 

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

     {
     {

-        wxCoord x1 = XLOG2DEV(points[i].x + xoffset);
-        wxCoord y1 = YLOG2DEV(points[i].y + yoffset);
+        wxCoord x = points[i].x + xoffset,
+                y = points[i].y + yoffset;

 
 

-        CalcBoundingBox( x1 + xoffset, y1 + yoffset );
+        CalcBoundingBox(x + xoffset, y + yoffset);

 
 

-        gpts[i].x = x1;
-        gpts[i].y = y1;
+        gpts[i].x = XLOG2DEV(x);
+        gpts[i].y = YLOG2DEV(y);

     }
 
     }
 

-    if (m_window)
-        gdk_draw_lines( m_window, m_penGC, gpts, n);
+    gdk_draw_lines( m_window, m_penGC, gpts, n);

 
     delete[] gpts;
 }
 
 
     delete[] gpts;
 }
 

-void wxWindowDC::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( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

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

-    GdkPoint *gdkpoints = new GdkPoint[n+1];
-    int i;
-    for (i = 0 ; i < n ; i++)
+    GdkPoint * const gpts = new GdkPoint[n];
+
+    for (int i = 0 ; i < n ; i++)

     {
     {

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

 
 

-        CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset );
+        gpts[i].x = XLOG2DEV(x);
+        gpts[i].y = YLOG2DEV(y);

     }
 
     }
 

-    if (m_window)
+    if (m_brush.GetStyle() == wxSOLID)

     {
     {

-        if (m_brush.GetStyle() != wxTRANSPARENT)
+        gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+    }
+    else if (m_brush.GetStyle() != wxTRANSPARENT)
+    {
+        if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))

         {
         {

-            if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
-            {
-                gdk_gc_set_ts_origin( m_textGC,
-                                      m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
-                                      m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
-                gdk_draw_polygon( m_window, m_textGC, TRUE, gdkpoints, n );
-                gdk_gc_set_ts_origin( m_textGC, 0, 0 );
-            } else
-            if (IS_15_PIX_HATCH(m_brush.GetStyle()))
-            {
-                gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
-                gdk_draw_polygon( m_window, m_brushGC, TRUE, gdkpoints, n );
-                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
-            } else
-            if (IS_16_PIX_HATCH(m_brush.GetStyle()))
-            {
-                gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
-                gdk_draw_polygon( m_window, m_brushGC, TRUE, gdkpoints, n );
-                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
-            } else
-            if (m_brush.GetStyle() == wxSTIPPLE)
-            {
-                gdk_gc_set_ts_origin( m_brushGC,
-                                      m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
-                                      m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
-                gdk_draw_polygon( m_window, m_brushGC, TRUE, gdkpoints, n );
-                gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
-            }
-            else
-            {
-                gdk_draw_polygon( m_window, m_brushGC, TRUE, gdkpoints, n );
-            }
+            gdk_gc_set_ts_origin( m_textGC,
+                                  m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                  m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+            gdk_draw_polygon( m_window, m_textGC, TRUE, gpts, n );
+            gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+        } else
+        if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+        {
+            gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
+            gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+            gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+        } else
+        if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+        {
+            gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+            gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+            gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+        } else
+        if (m_brush.GetStyle() == wxSTIPPLE)
+        {
+            gdk_gc_set_ts_origin( m_brushGC,
+                                  m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+                                  m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+            gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+            gdk_gc_set_ts_origin( m_brushGC, 0, 0 );

         }
         }

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

         {
         {

-/*
-            for (i = 0 ; i < n ; i++)
-            {
-                gdk_draw_line( m_window, m_penGC,
-                               gdkpoints[i%n].x,
-                               gdkpoints[i%n].y,
-                               gdkpoints[(i+1)%n].x,
-                               gdkpoints[(i+1)%n].y);
-            }
-*/
-            gdk_draw_polygon( m_window, m_penGC, FALSE, gdkpoints, n );
-            
+            gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );

         }
     }
 
         }
     }
 

-    delete[] gdkpoints;
+    if (m_pen.GetStyle() != wxTRANSPARENT)
+    {
+        gdk_draw_polygon( m_window, m_penGC, FALSE, gpts, n );
+
+    }
+
+    delete[] gpts;

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     wxCoord xx = XLOG2DEV(x);
     wxCoord yy = YLOG2DEV(y);
 
     wxCoord xx = XLOG2DEV(x);
     wxCoord yy = YLOG2DEV(y);


@@ -853,9 +810,9 @@ void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord h
     CalcBoundingBox( x + width, y + height );
 }
 
     CalcBoundingBox( x + width, y + height );
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
 
 
     if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
 


@@ -873,7 +830,7 @@ void wxWindowDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wx
     // X drawing errors with small radii
     if (rr == 0)
     {
     // X drawing errors with small radii
     if (rr == 0)
     {

-        DrawRectangle( x, y, width, height );
+        DoDrawRectangle( x, y, width, height );

         return;
     }
 
         return;
     }
 


@@ -976,9 +933,9 @@ void wxWindowDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wx
     CalcBoundingBox( x + width, y + height );
 }
 
     CalcBoundingBox( x + width, y + height );
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     wxCoord xx = XLOG2DEV(x);
     wxCoord yy = YLOG2DEV(y);
 
     wxCoord xx = XLOG2DEV(x);
     wxCoord yy = YLOG2DEV(y);


@@ -1035,17 +992,17 @@ void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
     CalcBoundingBox( x + width, y + height );
 }
 
     CalcBoundingBox( x + width, y + height );
 }
 

-void wxWindowDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
+void wxWindowDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )

 {
     // VZ: egcs 1.0.3 refuses to compile this without cast, no idea why
 {
     // 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 wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,

                                wxCoord x, wxCoord y,
                                bool useMask )
 {
                                wxCoord x, wxCoord y,
                                bool useMask )
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

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


@@ -1075,17 +1032,23 @@ 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 );

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

     // apply mask if any
     // apply mask if any

-    GdkBitmap *mask = (GdkBitmap *) NULL;
+    GdkBitmap *mask = NULL;

     if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
 
     if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
 

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

     if (useMask && mask)
     {
         if (!m_currentClippingRegion.IsNull())
     if (useMask && mask)
     {
         if (!m_currentClippingRegion.IsNull())


@@ -1107,7 +1070,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
             gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
             gdk_gc_unref( gc );
         }
             gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
             gdk_gc_unref( gc );
         }

-        
+

         if (is_mono)
         {
             if (new_mask)
         if (is_mono)
         {
             if (new_mask)


@@ -1130,24 +1093,13 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     // drawing a mono-bitmap (XBitmap) we use the current text GC
     if (is_mono)
     {
     // 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 );
-        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 );
         gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), 0, 0, xx, yy, -1, -1 );

-#endif

     }
     else
     {
     }
     else
     {

-        gdk_draw_pixmap( m_window, m_penGC, use_bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
+        gdk_draw_pixmap(m_window, m_penGC,
+                        use_bitmap.GetPixmap(),
+                        0, 0, xx, yy, -1, -1);

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


@@ -1155,49 +1107,51 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     {
         if (is_mono)
         {
     {
         if (is_mono)
         {

-            gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL );
+            gdk_gc_set_clip_mask( m_textGC, NULL );

             gdk_gc_set_clip_origin( m_textGC, 0, 0 );
             if (!m_currentClippingRegion.IsNull())
                 gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
         }
         else
         {
             gdk_gc_set_clip_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_mask( m_penGC, NULL );

             gdk_gc_set_clip_origin( m_penGC, 0, 0 );
             if (!m_currentClippingRegion.IsNull())
                 gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
         }
     }
             gdk_gc_set_clip_origin( m_penGC, 0, 0 );
             if (!m_currentClippingRegion.IsNull())
                 gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
         }
     }

-    
+

     if (new_mask)
         gdk_bitmap_unref( new_mask );
 }
 
     if (new_mask)
         gdk_bitmap_unref( new_mask );
 }
 

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

 {
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid window dc") );
+    wxCHECK_MSG( IsOk(), 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);
+
+    wxWindowDCImpl *srcDC = wxDynamicCast(source->GetImpl(), wxWindowDCImpl);
+    wxCHECK_MSG( srcDC, false, "source must be a window DC" );

 
 

-    wxClientDC *srcDC = (wxClientDC*)source;
-    wxMemoryDC *memDC = (wxMemoryDC*)source;
+    // FIXME: this cast is not always valid, see the code using m_isMemDC
+    wxMemoryDCImpl *memDC = static_cast<wxMemoryDCImpl *>(srcDC);

 
 

-    bool use_bitmap_method = FALSE;
-    bool is_mono = FALSE;
+    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 +1160,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 +1175,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 +1192,11 @@ 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;
+            use_bitmap_method = true;

         }
         else
         {
         }
         else
         {

-            use_bitmap_method = FALSE;
+            use_bitmap_method = false;

         }
     }
 
         }
     }
 


@@ -1262,10 +1216,10 @@ 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;
+    wxRasterOperationMode old_logical_func = m_logicalFunction;

     SetLogicalFunction( logical_func );
 
     if (use_bitmap_method)
     SetLogicalFunction( logical_func );
 
     if (use_bitmap_method)


@@ -1282,7 +1236,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);


@@ -1294,7 +1248,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
         // Scale bitmap if required
         wxBitmap use_bitmap;
 
         // Scale bitmap if required
         wxBitmap use_bitmap;

-        if ((bm_width != bm_ww) || (bm_height != bm_hh))
+        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,7 +1256,7 @@ 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);
         }


@@ -1313,11 +1267,11 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         }
 
         // apply mask if any
         }
 
         // apply mask if any

-        GdkBitmap *mask = (GdkBitmap *) NULL;
+        GdkBitmap *mask = NULL;

         if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
 
         if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
 

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

         if (useMask && mask)
         {
             if (!m_currentClippingRegion.IsNull())
         if (useMask && mask)
         {
             if (!m_currentClippingRegion.IsNull())


@@ -1327,6 +1281,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 );


@@ -1344,20 +1299,28 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             if (is_mono)
             {
                 if (new_mask)
             if (is_mono)
             {
                 if (new_mask)

+                {

                     gdk_gc_set_clip_mask( m_textGC, new_mask );
                     gdk_gc_set_clip_mask( m_textGC, new_mask );

+                    gdk_gc_set_clip_origin( m_textGC, cx, cy );
+                }

                 else
                 else

+                {

                     gdk_gc_set_clip_mask( m_textGC, mask );
                     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_origin( m_textGC, cx-xsrcMask, cy-ysrcMask );
+                }

             }
             else
             {
                 if (new_mask)
             }
             else
             {
                 if (new_mask)

+                {

                     gdk_gc_set_clip_mask( m_penGC, new_mask );
                     gdk_gc_set_clip_mask( m_penGC, new_mask );

+                    gdk_gc_set_clip_origin( m_penGC, cx, cy );
+                }

                 else
                 else

+                {

                     gdk_gc_set_clip_mask( m_penGC, mask );
                     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( m_penGC, cx-xsrcMask, cy-ysrcMask );
+                }

             }
         }
 
             }
         }
 


@@ -1366,21 +1329,8 @@ 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() );
-            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 );
             // 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

         }
         else
         {
         }
         else
         {


@@ -1393,20 +1343,20 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         {
             if (is_mono)
             {
         {
             if (is_mono)
             {

-                gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL );
+                gdk_gc_set_clip_mask( m_textGC, NULL );

                 gdk_gc_set_clip_origin( m_textGC, 0, 0 );
                 if (!m_currentClippingRegion.IsNull())
                     gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
             }
             else
             {
                 gdk_gc_set_clip_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_mask( m_penGC, NULL );

                 gdk_gc_set_clip_origin( m_penGC, 0, 0 );
                 if (!m_currentClippingRegion.IsNull())
                     gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
             }
         }
                 gdk_gc_set_clip_origin( m_penGC, 0, 0 );
                 if (!m_currentClippingRegion.IsNull())
                     gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
             }
         }

-        
+

         if (new_mask)
             gdk_bitmap_unref( new_mask );
     }
         if (new_mask)
             gdk_bitmap_unref( new_mask );
     }


@@ -1419,8 +1369,8 @@ 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


@@ -1429,7 +1379,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         }
         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 );


@@ -1441,90 +1391,25 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
     }
 
     SetLogicalFunction( old_logical_func );
     }
 
     SetLogicalFunction( old_logical_func );

-    
-    return TRUE;
+
+    return true;

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if (!m_window) return;
 
     if (!m_window) return;

-    
+

     if (text.empty()) return;
 
     if (text.empty()) return;
 

-#ifndef __WXGTK20__

     GdkFont *font = m_font.GetInternalFont( m_scaleY );
 
     wxCHECK_RET( font, wxT("invalid font") );
     GdkFont *font = m_font.GetInternalFont( m_scaleY );
 
     wxCHECK_RET( font, wxT("invalid font") );

-#endif

 
     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") );
-
-#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 ));
-
-    int w,h;
-    
-    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.
-         
-         // 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 );
-        
-         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_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 );
-         
-         // 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_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 );
-    }
-    
-    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;
 
     wxCoord width = gdk_string_width( font, text.mbc_str() );
     wxCoord height = font->ascent + font->descent;
 


@@ -1545,7 +1430,6 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         if (font->descent > 0) ul_y++;
         gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
     }
         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

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


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

-void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )
+
+// TODO: There is an example of rotating text with GTK2 that would probably be
+// a better approach here:
+//           http://www.daa.com.au/pipermail/pygtk/2003-April/005052.html
+
+void wxWindowDCImpl::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )

 {
 {

-    if (angle == 0.0)
+    if ( wxIsNullDouble(angle) )

     {
     {

-        DrawText(text, x, y);
+        DoDrawText(text, x, y);

         return;
     }
 
         return;
     }
 

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if (!m_window) return;
 
 
     if (!m_window) return;
 

-#ifdef __WXGTK20__
-    // implement later without GdkFont for GTK 2.0
-    return;
-#else
+    wxCoord w;
+    wxCoord h;
+

     GdkFont *font = m_font.GetInternalFont( m_scaleY );
 
     wxCHECK_RET( font, wxT("invalid font") );
 
     // the size of the text
     GdkFont *font = m_font.GetInternalFont( m_scaleY );
 
     wxCHECK_RET( font, wxT("invalid font") );
 
     // the size of the text

-    wxCoord w = gdk_string_width( font, text.mbc_str() );
-    wxCoord h = font->ascent + font->descent;
+    w = gdk_string_width( font, text.mbc_str() );
+    h = font->ascent + font->descent;

 
     // draw the string normally
     wxBitmap src(w, h);
     wxMemoryDC dc;
     dc.SelectObject(src);
     dc.SetFont(GetFont());
 
     // 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 +1497,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();
-
-    bool textColSet = TRUE;
-
-    unsigned char *data = image.GetData();

 
 

-    // paint pixel by pixel
-    for ( wxCoord srcX = 0; srcX < w; srcX++ )
-    {
-        for ( wxCoord srcY = 0; srcY < h; srcY++ )
-        {
-            // transform source coords to dest coords
-            double r = sqrt((double)srcX*srcX + srcY*srcY);
-            double angleOrig = atan2((double)srcY, (double)srcX) - rad;
-            wxCoord dstX = (wxCoord)(r*cos(angleOrig) + 0.5),
-                    dstY = (wxCoord)(r*sin(angleOrig) + 0.5);
-
-            // black pixel?
-            bool textPixel = data[(srcY*w + srcX)*3] == 0;
-            if ( textPixel || (m_backgroundMode == wxSOLID) )
-            {
-                // change colour if needed
-                if ( textPixel != textColSet )
-                {
-                    gdk_gc_set_foreground( m_textGC, textPixel ? colText
-                                                               : colBack );
+    wxImage image = src.ConvertToImage();

 
 

-                    textColSet = textPixel;
-                }
+    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 );

 
 

-                // 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,102 +1543,65 @@ 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 wxWindowDCImpl::DoGetTextExtent(const wxString &string,

                                  wxCoord *width, wxCoord *height,
                                  wxCoord *descent, wxCoord *externalLeading,
                                  wxCoord *width, wxCoord *height,
                                  wxCoord *descent, wxCoord *externalLeading,

-                                 wxFont *theFont) const
+                                 const wxFont *theFont) const

 {
 {

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

     {
     {

-        if (width) (*width) = 0;
-        if (height) (*height) = 0;

         return;
     }
         return;
     }

-    
-#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 );
-    pango_layout_set_text( m_layout, (const char*) data, strlen( (const char*) data ));
-#else
-    const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
-    const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
-    pango_layout_set_text( m_layout, (const char*) data, strlen( (const char*) data ));
-#endif
- 
-    int w,h;
-    pango_layout_get_pixel_size( m_layout, &w, &h );
-    
-    if (width) (*width) = (wxCoord) w; 
-    if (height) (*height) = (wxCoord) h;
-    if (descent)
-    {
-        // Do something about metrics here. TODO.
-        (*descent) = 0;
-    }
-    if (externalLeading) (*externalLeading) = 0;  // ??
-    
-    // Reset old font description
-    if (theFont)
-        pango_layout_set_font_description( m_layout, m_fontdesc );
-#else
+

     wxFont fontToUse = m_font;
     wxFont fontToUse = m_font;

-    if (theFont) fontToUse = *theFont;
-    
+    if (theFont)
+        fontToUse = *theFont;
+

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

 }
 
 }
 

-wxCoord wxWindowDC::GetCharWidth() const
+wxCoord wxWindowDCImpl::GetCharWidth() const

 {
 {

-#ifdef __WXGTK20__
-    pango_layout_set_text( m_layout, "H", 1 );
-    int w,h;
-    pango_layout_get_pixel_size( m_layout, &w, &h );
-    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);
     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 wxWindowDCImpl::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);
     GdkFont *font = m_font.GetInternalFont( m_scaleY );
     wxCHECK_MSG( font, -1, wxT("invalid font") );
 
     return wxCoord((font->ascent + font->descent) / m_scaleY);

-#endif

 }
 
 }
 

-void wxWindowDC::Clear()
+void wxWindowDCImpl::Clear()

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if (!m_window) return;
 
 
     if (!m_window) return;
 


@@ -1792,50 +1637,14 @@ void wxWindowDC::Clear()
 #endif // 0/1
 }
 
 #endif // 0/1
 }
 

-void wxWindowDC::SetFont( const wxFont &font )
+void wxWindowDCImpl::SetFont( const wxFont &font )

 {
     m_font = font;
 {
     m_font = font;

-    
-#ifdef __WXGTK20__
-    if (m_font.Ok())
-    {
-        if (m_fontdesc)
-            pango_font_description_free( m_fontdesc );
-        
-        m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
-        
-   
-        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();
-                
-            // 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. 
-            if (oldContext != m_context)
-            {
-                if (m_layout)
-                    g_object_unref( G_OBJECT( m_layout ) );
-                
-                m_layout = pango_layout_new( m_context );
-            }
-        }
-        
-        pango_layout_set_font_description( m_layout, m_fontdesc );
-    }
-#endif

 }
 
 }
 

-void wxWindowDC::SetPen( const wxPen &pen )
+void wxWindowDCImpl::SetPen( const wxPen &pen )

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if (m_pen == pen) return;
 
 
     if (m_pen == pen) return;
 


@@ -1924,13 +1733,12 @@ void wxWindowDC::SetPen( const wxPen &pen )
         default:
         {
             lineStyle = GDK_LINE_SOLID;
         default:
         {
             lineStyle = GDK_LINE_SOLID;

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

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

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

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


@@ -1947,7 +1755,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())


@@ -1985,9 +1792,9 @@ void wxWindowDC::SetPen( const wxPen &pen )
     gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() );
 }
 
     gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() );
 }
 

-void wxWindowDC::SetBrush( const wxBrush &brush )
+void wxWindowDCImpl::SetBrush( const wxBrush &brush )

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if (m_brush == brush) return;
 
 
     if (m_brush == brush) return;
 


@@ -2022,7 +1829,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;


@@ -2030,12 +1837,12 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
     }
 }
 
     }
 }
 

-void wxWindowDC::SetBackground( const wxBrush &brush )
+void wxWindowDCImpl::SetBackground( const wxBrush &brush )

 {
    /* CMB 21/7/98: Added SetBackground. Sets background brush
     * for Clear() and bg colour for shapes filled with cross-hatch brush */
 
 {
    /* CMB 21/7/98: Added SetBackground. Sets background brush
     * for Clear() and bg colour for shapes filled with cross-hatch brush */
 

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if (m_backgroundBrush == brush) return;
 
 
     if (m_backgroundBrush == brush) return;
 


@@ -2067,7 +1874,7 @@ void wxWindowDC::SetBackground( const wxBrush &brush )
         }
     }
 
         }
     }
 

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


@@ -2075,9 +1882,9 @@ void wxWindowDC::SetBackground( const wxBrush &brush )
     }
 }
 
     }
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if (m_logicalFunction == function)
         return;
 
     if (m_logicalFunction == function)
         return;


@@ -2091,7 +1898,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;


@@ -2108,7 +1914,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;


@@ -2125,9 +1930,9 @@ void wxWindowDC::SetLogicalFunction( int function )
     gdk_gc_set_function( m_textGC, mode );
 }
 
     gdk_gc_set_function( m_textGC, mode );
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     // don't set m_textForegroundColour to an invalid colour as we'd crash
     // later then (we use m_textForegroundColour.GetColor() without checking
 
     // don't set m_textForegroundColour to an invalid colour as we'd crash
     // later then (we use m_textForegroundColour.GetColor() without checking


@@ -2144,9 +1949,9 @@ void wxWindowDC::SetTextForeground( const wxColour &col )
     }
 }
 
     }
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     // same as above
     if ( !col.Ok() || (m_textBackgroundColour == col) )
 
     // same as above
     if ( !col.Ok() || (m_textBackgroundColour == col) )


@@ -2161,9 +1966,9 @@ void wxWindowDC::SetTextBackground( const wxColour &col )
     }
 }
 
     }
 }
 

-void wxWindowDC::SetBackgroundMode( int mode )
+void wxWindowDCImpl::SetBackgroundMode( int mode )

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     m_backgroundMode = mode;
 
 
     m_backgroundMode = mode;
 


@@ -2179,14 +1984,14 @@ void wxWindowDC::SetBackgroundMode( int mode )
     }
 }
 
     }
 }
 

-void wxWindowDC::SetPalette( const wxPalette& WXUNUSED(palette) )
+void wxWindowDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) )

 {
 {

-    wxFAIL_MSG( wxT("wxWindowDC::SetPalette not implemented") );
+    wxFAIL_MSG( wxT("wxWindowDCImpl::SetPalette not implemented") );

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if (!m_window) return;
 
 
     if (!m_window) return;
 


@@ -2208,7 +2013,7 @@ void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoo
 
     wxCoord xx, yy, ww, hh;
     m_currentClippingRegion.GetBox( xx, yy, ww, hh );
 
     wxCoord xx, yy, ww, hh;
     m_currentClippingRegion.GetBox( xx, yy, ww, hh );

-    wxDC::DoSetClippingRegion( xx, yy, ww, hh );
+    wxGTKDCImpl::DoSetClippingRegion( xx, yy, ww, hh );

 
     gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
     gdk_gc_set_clip_region( m_brushGC, m_currentClippingRegion.GetRegion() );
 
     gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
     gdk_gc_set_clip_region( m_brushGC, m_currentClippingRegion.GetRegion() );


@@ -2216,9 +2021,9 @@ void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoo
     gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
 }
 
     gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
 }
 

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

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
     if (region.Empty())
     {
 
     if (region.Empty())
     {


@@ -2240,7 +2045,7 @@ void wxWindowDC::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 );

-    wxDC::DoSetClippingRegion( xx, yy, ww, hh );
+    wxGTKDCImpl::DoSetClippingRegion( xx, yy, ww, hh );

 
     gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
     gdk_gc_set_clip_region( m_brushGC, m_currentClippingRegion.GetRegion() );
 
     gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
     gdk_gc_set_clip_region( m_brushGC, m_currentClippingRegion.GetRegion() );


@@ -2248,11 +2053,11 @@ void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
     gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
 }
 
     gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
 }
 

-void wxWindowDC::DestroyClippingRegion()
+void wxWindowDCImpl::DestroyClippingRegion()

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid window dc") );

 
 

-    wxDC::DestroyClippingRegion();
+    wxGTKDCImpl::DestroyClippingRegion();

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


@@ -2265,10 +2070,10 @@ void wxWindowDC::DestroyClippingRegion()
 
     if (m_currentClippingRegion.IsEmpty())
     {
 
     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 );
+        gdk_gc_set_clip_rectangle( m_penGC, NULL );
+        gdk_gc_set_clip_rectangle( m_brushGC, NULL );
+        gdk_gc_set_clip_rectangle( m_textGC, NULL );
+        gdk_gc_set_clip_rectangle( m_bgGC, NULL );

     }
     else
     {
     }
     else
     {


@@ -2279,45 +2084,42 @@ void wxWindowDC::DestroyClippingRegion()
     }
 }
 
     }
 }
 

-void wxWindowDC::Destroy()
+void wxWindowDCImpl::Destroy()

 {
     if (m_penGC) wxFreePoolGC( m_penGC );
 {
     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 wxWindowDC::ComputeScaleAndOrigin()
+void wxWindowDCImpl::ComputeScaleAndOrigin()

 {
 {

-    /* CMB: copy scale to see if it changes */
-    double origScaleX = m_scaleX;
-    double origScaleY = m_scaleY;
-
-    wxDC::ComputeScaleAndOrigin();
-
-    /* CMB: if scale has changed call SetPen to recalulate the line width */
-    if ((m_scaleX != origScaleX || m_scaleY != origScaleY) &&
-        (m_pen.Ok()))
-    {
-      /* this is a bit artificial, but we need to force wxDC to think
-         the pen has changed */
-      wxPen pen = m_pen;
-      m_pen = wxNullPen;
-      SetPen( pen );
-  }
+    const wxRealPoint origScale(m_scaleX, m_scaleY);
+
+    wxGTKDCImpl::ComputeScaleAndOrigin();
+
+    // if scale has changed call SetPen to recalulate the line width
+    if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.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 );
+    }

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

-wxSize wxWindowDC::GetPPI() const
+wxSize wxWindowDCImpl::GetPPI() const

 {
     return wxSize( (int) (m_mm_to_pix_x * 25.4 + 0.5), (int) (m_mm_to_pix_y * 25.4 + 0.5));
 }
 
 {
     return wxSize( (int) (m_mm_to_pix_x * 25.4 + 0.5), (int) (m_mm_to_pix_y * 25.4 + 0.5));
 }
 

-int wxWindowDC::GetDepth() const
+int wxWindowDCImpl::GetDepth() const

 {
     wxFAIL_MSG(wxT("not implemented"));
 
 {
     wxFAIL_MSG(wxT("not implemented"));
 


@@ -2326,10 +2128,10 @@ int wxWindowDC::GetDepth() const
 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------

-// wxPaintDC
+// wxPaintDCImpl

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

-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
+IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl)

 
 // Limit the paint region to the window size. Sometimes
 // the paint region is too big, and this risks X11 errors
 
 // Limit the paint region to the window size. Sometimes
 // the paint region is too big, and this risks X11 errors


@@ -2350,8 +2152,8 @@ static void wxLimitRegionToSize(wxRegion& region, const wxSize& sz)
     }
 }
 
     }
 }
 

-wxPaintDC::wxPaintDC( wxWindow *win )
-         : wxClientDC( win )
+wxPaintDCImpl::wxPaintDCImpl(wxDC *owner, wxWindow *win)
+             : wxClientDCImpl(owner, win)

 {
 #if USE_PAINT_REGION
     if (!win->m_clipPaintRegion)
 {
 #if USE_PAINT_REGION
     if (!win->m_clipPaintRegion)


@@ -2360,7 +2162,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 )
     {


@@ -2379,15 +2181,15 @@ wxPaintDC::wxPaintDC( wxWindow *win )
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxClientDC
+// wxClientDCImpl

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

-IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)

 
 

-wxClientDC::wxClientDC( wxWindow *win )
-          : wxWindowDC( win )
+wxClientDCImpl::wxClientDCImpl(wxDC *owner, wxWindow *win)
+              : wxWindowDCImpl(owner, win)

 {
 {

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

 
 #ifdef __WXUNIVERSAL__
     wxPoint ptOrigin = win->GetClientAreaOrigin();
 
 #ifdef __WXUNIVERSAL__
     wxPoint ptOrigin = win->GetClientAreaOrigin();


@@ -2397,9 +2199,9 @@ wxClientDC::wxClientDC( wxWindow *win )
 #endif // __WXUNIVERSAL__
 }
 
 #endif // __WXUNIVERSAL__
 }
 

-void wxClientDC::DoGetSize(int *width, int *height) const
+void wxClientDCImpl::DoGetSize(int *width, int *height) const

 {
 {

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

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


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

-    return TRUE;
+    return true;

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