Commited Bryan Petty's blind fix patch.

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 353ecd4501165dccf1ba71baac65ca25b5257c07..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$


@@ -15,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 "wx/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


@@ -78,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,7 +95,6 @@ void gdk_wx_draw_bitmap(GdkDrawable  *drawable,
     wxCHECK_RET( src, _T("NULL src in gdk_wx_draw_bitmap") );
     wxCHECK_RET( gc, _T("NULL gc 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") );
 

-#ifdef __WXGTK20__

     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;


@@ -106,33 +108,6 @@ 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

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


@@ -199,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);


@@ -288,11 +263,9 @@ wxWindowDC::wxWindowDC()
     m_isMemDC = false;
     m_isScreenDC = false;
     m_owner = (wxWindow *)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;
     m_context = (PangoContext *)NULL;
     m_layout = (PangoLayout *)NULL;
     m_fontdesc = (PangoFontDescription *)NULL;

-#endif

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


@@ -322,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;


@@ -358,12 +329,10 @@ wxWindowDC::~wxWindowDC()
 {
     Destroy();
 
 {
     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()


@@ -398,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 );


@@ -538,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
     {


@@ -687,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) )


@@ -717,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)


@@ -782,7 +769,8 @@ void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoor
         }
     }
 
         }
     }
 

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


@@ -1043,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);


@@ -1084,11 +1072,14 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
 
     // 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())
         {


@@ -1107,52 +1098,35 @@ 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 );
+            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 );
-            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 );
-        }
+        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_wx_draw_bitmap( bitmap2, gc, use_bitmap.GetPixmap(), 0, 0, 0, 0, -1, -1 );

 
 

-        gdk_draw_drawable( m_window, m_textGC, bitmap, 0, 0, xx, yy, -1, -1 );
+        gdk_draw_drawable(m_window, use_gc, bitmap2, 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
+        g_object_unref (bitmap2);
+        g_object_unref (gc);

     }
     else
     {
 #if GTK_CHECK_VERSION(2,2,0)
         if (!gtk_check_version(2,2,0) && use_bitmap.HasPixbuf())
         {
     }
     else
     {
 #if GTK_CHECK_VERSION(2,2,0)
         if (!gtk_check_version(2,2,0) && use_bitmap.HasPixbuf())
         {

-            gdk_draw_pixbuf(m_window, m_penGC,
+            gdk_draw_pixbuf(m_window, use_gc,

                             use_bitmap.GetPixbuf(),
                             0, 0, xx, yy, -1, -1,
                             GDK_RGB_DITHER_NORMAL, xx, yy);
                             use_bitmap.GetPixbuf(),
                             0, 0, xx, yy, -1, -1,
                             GDK_RGB_DITHER_NORMAL, xx, yy);


@@ -1160,33 +1134,22 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
         else
 #endif
         {
         else
 #endif
         {

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

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

     }
     }

-
-    if (new_mask)
-        gdk_bitmap_unref( new_mask );

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


@@ -1204,8 +1167,8 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
     if (!m_window) return false;
 
     // transform the source DC coords to the device ones
     if (!m_window) return false;
 
     // 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;


@@ -1255,10 +1218,6 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             // the area to be scaled
             use_bitmap_method = true;
         }
             // the area to be scaled
             use_bitmap_method = true;
         }

-        else
-        {
-            use_bitmap_method = false;
-        }

     }
 
     CalcBoundingBox( xdest, ydest );
     }
 
     CalcBoundingBox( xdest, ydest );


@@ -1308,7 +1267,7 @@ 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;
+        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
         if ((memDC->m_selected.GetWidth()!= bm_ww) || ( memDC->m_selected.GetHeight()!= bm_hh))
         {
             // This indicates that the blitting code below will get


@@ -1321,19 +1280,17 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             // 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())
             {


@@ -1354,35 +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 );
-                    gdk_gc_set_clip_origin( m_textGC, cx, cy );
-                }
-                else
-                {
-                    gdk_gc_set_clip_mask( m_textGC, mask );
-                    gdk_gc_set_clip_origin( m_textGC, cx-xsrcMask, cy-ysrcMask );
-                }
-            }
+            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 );
-                    gdk_gc_set_clip_origin( m_penGC, cx, cy );
-                }
-                else
-                {
-                    gdk_gc_set_clip_mask( m_penGC, mask );
-                    gdk_gc_set_clip_origin( m_penGC, cx-xsrcMask, cy-ysrcMask );
-                }
-            }
+                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


@@ -1390,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_wx_draw_bitmap( bitmap, gc, use_bitmap.GetPixmap(), 0, 0, 0, 0, -1, -1 );

 
 

-            gdk_draw_drawable( m_window, m_textGC, bitmap, xsrc, ysrc, cx, cy, cw, ch );
+            gdk_draw_drawable(m_window, use_gc, 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
+            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
     {


@@ -1448,8 +1370,8 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             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
         {


@@ -1457,9 +1379,10 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
             // 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 );
         }
     }
             gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
         }
     }


@@ -1477,32 +1400,20 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
 
     if (text.empty()) return;
 
 
     if (text.empty()) return;
 

-#ifndef __WXGTK20__
-    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") );
 
     bool underlined = m_font.Ok() && m_font.GetUnderlined();
 
     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") );
 
     bool underlined = m_font.Ok() && m_font.GetUnderlined();
 

-#if wxUSE_UNICODE
-    const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
-#else
-    const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );
-    if ( !wdata )
+    const wxCharBuffer data = wxGTK_CONV( text );
+    if ( !data )

         return;
         return;

-    const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
-#endif
-    size_t datalen = strlen((const char*)data);
-    pango_layout_set_text( m_layout, (const char*) data, datalen);
+    const size_t datalen = strlen(data);
+    pango_layout_set_text( m_layout, data, datalen);

 
     if (underlined)
     {
 
     if (underlined)
     {


@@ -1570,29 +1481,6 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
     wxCoord width = w;
     wxCoord height = h;
 
     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 )
-    {
-        gdk_gc_set_foreground( m_textGC, m_textBackgroundColour.GetColor() );
-        gdk_draw_rectangle( m_window, m_textGC, TRUE, x, y, width, height );
-        gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
-    }
-    gdk_draw_string( m_window, font, m_textGC, x, y + font->ascent, text.mbc_str() );
-
-    /* CMB 17/7/98: simple underline: ignores scaling and underlying
-       X font's XA_UNDERLINE_POSITION and XA_UNDERLINE_THICKNESS
-       properties (see wxXt implementation) */
-    if (m_font.GetUnderlined())
-    {
-        wxCoord ul_y = y + font->ascent;
-        if (font->descent > 0) ul_y++;
-        gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
-    }
-#endif // GTK+ 2.0/1.x
-

     width = wxCoord(width / m_scaleX);
     height = wxCoord(height / m_scaleY);
     CalcBoundingBox (x + width, y + height);
     width = wxCoord(width / m_scaleX);
     height = wxCoord(height / m_scaleY);
     CalcBoundingBox (x + width, y + height);


@@ -1606,32 +1494,23 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
 
 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;
+    if ( wxIsNullDouble(angle) )
+    {
+        DrawText(text, x, y);
+        return;
+    }

 
     wxCoord w;
     wxCoord h;
 
 
     wxCoord w;
     wxCoord h;
 

-#ifdef  __WXGTK20__
-    // implement later without GdkFont for GTK 2.0
+    // TODO: implement later without GdkFont for GTK 2.0

     GetTextExtent(text, &w, &h, NULL,NULL, &m_font);
 
     GetTextExtent(text, &w, &h, NULL,NULL, &m_font);
 

-#else
-    GdkFont *font = m_font.GetInternalFont( m_scaleY );
-
-    wxCHECK_RET( font, wxT("invalid font") );
-
-    // the size of the text
-    w = gdk_string_width( font, text.mbc_str() );
-    h = font->ascent + font->descent;
-#endif

     // draw the string normally
     wxBitmap src(w, h);
     wxMemoryDC dc;
     // draw the string normally
     wxBitmap src(w, h);
     wxMemoryDC dc;


@@ -1730,28 +1609,24 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
         *externalLeading = 0;
 
     if (string.empty())
         *externalLeading = 0;
 
     if (string.empty())

-    {

         return;
         return;

-    }

 
 

-#ifdef __WXGTK20__
-    // Set new font description
-    if (theFont)
-        pango_layout_set_font_description( m_layout, theFont->GetNativeFontInfo()->description );
+    // ensure that theFont is always non-NULL
+    if ( !theFont || !theFont->Ok() )
+        theFont = wx_const_cast(wxFont *, &m_font);

 
 

-    // 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
+    // and use it if it's valid
+    if ( theFont->Ok() )
+    {
+        pango_layout_set_font_description
+        (
+            m_layout,
+            theFont->GetNativeFontInfo()->description
+        );
+    }

 
 

+    // 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?


@@ -1780,52 +1655,20 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
     // 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 ( !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);
-#endif // GTK+ 2/1

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

-#ifdef __WXGTK20__

     pango_layout_set_text( m_layout, "H", 1 );
     int w;
     pango_layout_get_pixel_size( m_layout, &w, NULL );
     return w;
     pango_layout_set_text( m_layout, "H", 1 );
     int w;
     pango_layout_get_pixel_size( m_layout, &w, NULL );
     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 h;
-    pango_layout_get_pixel_size( m_layout, NULL, &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()


@@ -1870,7 +1713,6 @@ void wxWindowDC::SetFont( const wxFont &font )
 {
     m_font = font;
 
 {
     m_font = font;
 

-#ifdef __WXGTK20__

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


@@ -1883,14 +1725,6 @@ void wxWindowDC::SetFont( const wxFont &font )
         {
             PangoContext *oldContext = m_context;
 
         {
             PangoContext *oldContext = m_context;
 

-            // We might want to use the X11 context for faster
-            // rendering on screen.
-            // MR: Lets not want to do this, as this introduces libpangox dependancy.
-#if 0
-            if (m_font.GetNoAntiAliasing())
-                m_context = m_owner->GtkGetPangoX11Context();
-            else
-#endif

             m_context = m_owner->GtkGetPangoDefaultContext();
 
             // If we switch back/forth between different contexts
             m_context = m_owner->GtkGetPangoDefaultContext();
 
             // If we switch back/forth between different contexts


@@ -1899,7 +1733,7 @@ void wxWindowDC::SetFont( const wxFont &font )
             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 );
             }


@@ -1907,7 +1741,6 @@ void wxWindowDC::SetFont( const wxFont &font )
 
         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 )


@@ -2079,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() );


@@ -2087,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() );

         }
     }
 
         }
     }
 


@@ -2130,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() );


@@ -2138,7 +1971,7 @@ 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() );

         }
     }
 
         }
     }
 


@@ -2366,18 +2199,15 @@ 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 */
+        // 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 );
         wxPen pen = m_pen;
         m_pen = wxNullPen;
         SetPen( pen );


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

-#ifdef __WXGTK20__

     return gdk_drawable_get_depth(m_window);
     return gdk_drawable_get_depth(m_window);

-#else
-    wxFAIL_MSG(wxT("not implemented"));
-
-    return -1;
-#endif

 }
 
 
 }