Halfway reasonable implementation of wxFont for wxCocoa.

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

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 7ae955a594b45084acb5ee60ebd700eecb00b222..0c63a7d84c39ea9b269843160d69da5c38ef3e17 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"
 


@@ -19,15 +15,18 @@
 #endif
 
 #include "wx/dcclient.h"
 #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"

 
 

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

 
 

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

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


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

-    g_return_if_fail (drawable != NULL);
-    g_return_if_fail (src != NULL);
-    g_return_if_fail (gc != NULL);
+    wxCHECK_RET( drawable, _T("NULL drawable in gdk_wx_draw_bitmap") );
+    wxCHECK_RET( src, _T("NULL src in gdk_wx_draw_bitmap") );
+    wxCHECK_RET( gc, _T("NULL gc in gdk_wx_draw_bitmap") );

 
 

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


@@ -136,15 +120,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,


@@ -294,11 +275,6 @@ 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;
-#endif

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


@@ -328,12 +304,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;
 


@@ -363,13 +333,6 @@ wxWindowDC::wxWindowDC( wxWindow *window )
 wxWindowDC::~wxWindowDC()
 {
     Destroy();
 wxWindowDC::~wxWindowDC()
 {
     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 wxWindowDC::SetUpDC()


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


@@ -693,8 +656,9 @@ 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)
+
+    GdkPoint * const gpts = new GdkPoint[n];
+    if ( !gpts )

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


@@ -702,17 +666,16 @@ void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord
 
     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;
 }


@@ -723,72 +686,66 @@ void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoor
 
     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 wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )


@@ -1080,13 +1037,11 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     if ((w != ww) || (h != hh))
         use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
 
     if ((w != ww) || (h != hh))
         use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
 

-#if !GTK_CHECK_VERSION(2,2,0)

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

-#endif

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


@@ -1138,38 +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
     {

-#if GTK_CHECK_VERSION(2,2,0)
-        if (use_bitmap.HasPixbuf())
-        {
-            gdk_draw_pixbuf(m_window, m_penGC,
-                            use_bitmap.GetPixbuf(),
-                            0, 0, xx, yy, -1, -1,
-                            GDK_RGB_DITHER_NORMAL, xx, yy);
-        }
-        else
-#endif
-        {
-            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


@@ -1219,7 +1149,6 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
     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;


@@ -1349,6 +1278,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 );


@@ -1366,20 +1296,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 );
+                }

             }
         }
 
             }
         }
 


@@ -1388,21 +1326,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
         {


@@ -1475,100 +1400,13 @@ 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") );
     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();
-
-#if wxUSE_UNICODE
-    const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
-#else
-    const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );
-    if ( !wdata )
-        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);
-
-    if (underlined)
-    {
-        PangoAttrList *attrs = pango_attr_list_new();
-        PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
-        a->start_index = 0;
-        a->end_index = datalen;
-        pango_attr_list_insert(attrs, a);
-        pango_layout_set_attributes(m_layout, attrs);
-        pango_attr_list_unref(attrs);
-    }
-
-    int w,h;
-
-    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 );
-    }
-
-    if (underlined)
-    {
-        // undo underline attributes setting:
-        pango_layout_set_attributes(m_layout, NULL);
-    }
-
-    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;
 


@@ -1589,7 +1427,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);


@@ -1604,7 +1441,7 @@ 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)
+    if ( wxIsNullDouble(angle) )

     {
         DrawText(text, x, y);
         return;
     {
         DrawText(text, x, y);
         return;


@@ -1617,11 +1454,6 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
     wxCoord w;
     wxCoord h;
 
     wxCoord w;
     wxCoord h;
 

-#ifdef  __WXGTK20__
-    // implement later without GdkFont for GTK 2.0
-    GetTextExtent(text, &w, &h, NULL,NULL, &m_font);
-
-#else

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


@@ -1629,7 +1461,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
     // the size of the text
     w = gdk_string_width( font, text.mbc_str() );
     h = font->ascent + font->descent;
     // 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;


@@ -1672,6 +1504,8 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 
     int i_angle = (int) angle;
     i_angle = i_angle % 360;
 
     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 xoffset = 0;
     if ((i_angle >= 90.0) && (i_angle < 270.0))
         xoffset = image.GetWidth();


@@ -1714,7 +1548,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 void wxWindowDC::DoGetTextExtent(const wxString &string,
                                  wxCoord *width, wxCoord *height,
                                  wxCoord *descent, wxCoord *externalLeading,
 void wxWindowDC::DoGetTextExtent(const wxString &string,
                                  wxCoord *width, wxCoord *height,
                                  wxCoord *descent, wxCoord *externalLeading,

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

 {
     if ( width )
         *width = 0;
 {
     if ( width )
         *width = 0;


@@ -1730,54 +1564,6 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
         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 );
-    const char *dataUTF8 = (const char *)data;
-#else
-    const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
-    if ( !wdata )
-    {
-        if (width) (*width) = 0;
-        if (height) (*height) = 0;
-        return;
-    }
-    const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
-    const char *dataUTF8 = (const char *)data;
-#endif
-
-    if ( !dataUTF8 )
-    {
-        // hardly ideal, but what else can we do if conversion failed?
-        return;
-    }
-
-    pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
-
-    int w,h;
-    pango_layout_get_pixel_size( m_layout, &w, &h );
-
-    if (width)
-        *width = (wxCoord) w;
-    if (height)
-        *height = (wxCoord) h;
-    if (descent)
-    {
-        PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
-        int baseline = pango_layout_iter_get_baseline(iter);
-        pango_layout_iter_free(iter);
-        *descent = h - PANGO_PIXELS(baseline);
-    }
-
-    // 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;
     wxFont fontToUse = m_font;
     if (theFont)
         fontToUse = *theFont;


@@ -1792,37 +1578,22 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
         *height = wxCoord((font->ascent + font->descent) / m_scaleY);
     if (descent)
         *descent = wxCoord(font->descent / m_scaleY);
         *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,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 wxWindowDC::GetCharHeight() const
 {

-#ifdef __WXGTK20__
-    pango_layout_set_text( m_layout, "H", 1 );
-    int w,h;
-    pango_layout_get_pixel_size( m_layout, &w, &h );
-    return h;
-#else

     GdkFont *font = m_font.GetInternalFont( m_scaleY );
     wxCHECK_MSG( font, -1, wxT("invalid font") );
 
     return wxCoord((font->ascent + font->descent) / m_scaleY);
     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 wxWindowDC::Clear()


@@ -1866,42 +1637,6 @@ void wxWindowDC::Clear()
 void wxWindowDC::SetFont( const wxFont &font )
 {
     m_font = font;
 void wxWindowDC::SetFont( const wxFont &font )
 {
     m_font = font;

-
-#ifdef __WXGTK20__
-    if (m_font.Ok())
-    {
-        if (m_fontdesc)
-            pango_font_description_free( m_fontdesc );
-
-        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 wxWindowDC::SetPen( const wxPen &pen )


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

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

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


@@ -2018,7 +1752,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())


@@ -2162,7 +1895,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;


@@ -2179,7 +1911,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;


@@ -2364,22 +2095,19 @@ void wxWindowDC::Destroy()
 
 void wxWindowDC::ComputeScaleAndOrigin()
 {
 
 void wxWindowDC::ComputeScaleAndOrigin()
 {

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

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

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

     {
     {

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

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