Preserve original menu label for later retrieval

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 285fb6aade78b56190f569cbd79b144cf2d3cb97..f192e6e05caefabd729f48f35e666ad8025b6f53 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -252,9 +252,13 @@ static void wxFreePoolGC( GdkGC *gc )
 // wxWindowDC
 //-----------------------------------------------------------------------------
 
 // wxWindowDC
 //-----------------------------------------------------------------------------
 

+#if wxUSE_NEW_DC
+IMPLEMENT_DYNAMIC_CLASS(wxGTKWindowImplDC, wxGTKImplDC)
+#else

 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)

+#endif

 
 

-wxWindowDC::wxWindowDC()
+wxGTKWindowImplDC::wxGTKWindowImplDC()

 {
     m_penGC = (GdkGC *) NULL;
     m_brushGC = (GdkGC *) NULL;
 {
     m_penGC = (GdkGC *) NULL;
     m_brushGC = (GdkGC *) NULL;


@@ -269,7 +273,7 @@ wxWindowDC::wxWindowDC()
     m_fontdesc = (PangoFontDescription *)NULL;
 }
 
     m_fontdesc = (PangoFontDescription *)NULL;
 }
 

-wxWindowDC::wxWindowDC( wxWindow *window )
+wxGTKWindowImplDC::wxGTKWindowImplDC( wxWindow *window )

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


@@ -324,7 +328,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
        standard (as e.g. wxStatusBar) */
 
     m_owner = window;
        standard (as e.g. wxStatusBar) */
 
     m_owner = window;

-    
+

     if (m_owner && m_owner->m_wxwindow && (m_owner->GetLayoutDirection() == wxLayout_RightToLeft))
     {
         // reverse sense
     if (m_owner && m_owner->m_wxwindow && (m_owner->GetLayoutDirection() == wxLayout_RightToLeft))
     {
         // reverse sense


@@ -335,7 +339,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
     }
 }
 
     }
 }
 

-wxWindowDC::~wxWindowDC()
+wxGTKWindowImplDC::~wxGTKWindowImplDC()

 {
     Destroy();
 
 {
     Destroy();
 


@@ -345,7 +349,7 @@ wxWindowDC::~wxWindowDC()
         pango_font_description_free( m_fontdesc );
 }
 
         pango_font_description_free( m_fontdesc );
 }
 

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

 {
     m_ok = true;
 
 {
     m_ok = true;
 


@@ -392,6 +396,8 @@ void wxWindowDC::SetUpDC()
 
     gdk_gc_set_fill( m_textGC, GDK_SOLID );
 
 
     gdk_gc_set_fill( m_textGC, GDK_SOLID );
 

+    gdk_gc_set_colormap( m_textGC, m_cmap );
+

     /* m_penGC */
     m_pen.GetColour().CalcPixel( m_cmap );
     gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() );
     /* m_penGC */
     m_pen.GetColour().CalcPixel( m_cmap );
     gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() );


@@ -435,24 +441,29 @@ void wxWindowDC::SetUpDC()
     }
 }
 
     }
 }
 

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

 {
     wxCHECK_RET( m_owner, _T("GetSize() doesn't work without window") );
 
     m_owner->GetSize(width, height);
 }
 
 {
     wxCHECK_RET( m_owner, _T("GetSize() doesn't work without window") );
 
     m_owner->GetSize(width, height);
 }
 

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

                              const wxColour& col, int style)
 {
                              const wxColour& col, int style)
 {

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

     return wxDoFloodFill(this, x, y, col, style);
     return wxDoFloodFill(this, x, y, col, style);

+#else
+    return false;
+#endif

 }
 
 }
 

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

 {
 {

+#if wxUSE_IMAGE

     // Generic (and therefore rather inefficient) method.
     // Could be improved.
     wxMemoryDC memdc;
     // Generic (and therefore rather inefficient) method.
     // Could be improved.
     wxMemoryDC memdc;


@@ -464,9 +475,12 @@ bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
     wxImage image = bitmap.ConvertToImage();
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
     return true;
     wxImage image = bitmap.ConvertToImage();
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
     return true;

+#else // !wxUSE_IMAGE
+    return false;
+#endif // wxUSE_IMAGE/!wxUSE_IMAGE

 }
 
 }
 

-void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
+void wxGTKWindowImplDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )

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


@@ -480,7 +494,7 @@ void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
     }
 }
 
     }
 }
 

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

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


@@ -499,7 +513,7 @@ void wxWindowDC::DoCrossHair( wxCoord x, wxCoord y )
     }
 }
 
     }
 }
 

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

                             wxCoord xc, wxCoord yc )
 {
     wxCHECK_RET( Ok(), wxT("invalid window dc") );
                             wxCoord xc, wxCoord yc )
 {
     wxCHECK_RET( Ok(), wxT("invalid window dc") );


@@ -594,7 +608,7 @@ 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 wxGTKWindowImplDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double sa, double ea )

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


@@ -656,7 +670,7 @@ 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 wxGTKWindowImplDC::DoDrawPoint( wxCoord x, wxCoord y )

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


@@ -666,7 +680,7 @@ 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 wxGTKWindowImplDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset )

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


@@ -700,7 +714,7 @@ void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord
         delete[] gpts;
 }
 
         delete[] gpts;
 }
 

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

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


@@ -786,7 +800,7 @@ void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoor
         delete[] gdkpoints;
 }
 
         delete[] gdkpoints;
 }
 

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

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


@@ -860,7 +874,7 @@ void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord h
                     gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-2, hh-2 );
                     gdk_draw_rectangle( m_window, m_penGC, FALSE, xx-1, yy-1, ww, hh );
                 }
                     gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-2, hh-2 );
                     gdk_draw_rectangle( m_window, m_penGC, FALSE, xx-1, yy-1, ww, hh );
                 }

-                
+

                 // reset
                 gdk_gc_set_line_attributes( m_penGC, 2, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
             }
                 // reset
                 gdk_gc_set_line_attributes( m_penGC, 2, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
             }


@@ -877,7 +891,7 @@ 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 wxGTKWindowImplDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )

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


@@ -1000,7 +1014,7 @@ 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 wxGTKWindowImplDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

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


@@ -1059,13 +1073,13 @@ 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 wxGTKWindowImplDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )

 {
     // VZ: egcs 1.0.3 refuses to compile this without cast, no idea why
     DoDrawBitmap( (const wxBitmap&)icon, x, y, true );
 }
 
 {
     // VZ: egcs 1.0.3 refuses to compile this without cast, no idea why
     DoDrawBitmap( (const wxBitmap&)icon, x, y, true );
 }
 

-void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
+void wxGTKWindowImplDC::DoDrawBitmap( const wxBitmap &bitmap,

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


@@ -1081,10 +1095,10 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
 
     int w = bitmap.GetWidth();
     int h = bitmap.GetHeight();
 
     int w = bitmap.GetWidth();
     int h = bitmap.GetHeight();

-    
+

     if (m_owner && m_owner->GetLayoutDirection() == wxLayout_RightToLeft)
         xx -= w;
     if (m_owner && m_owner->GetLayoutDirection() == wxLayout_RightToLeft)
         xx -= w;

-        
+

     CalcBoundingBox( x, y );
     CalcBoundingBox( x + w, y + h );
 
     CalcBoundingBox( x, y );
     CalcBoundingBox( x + w, y + h );
 


@@ -1107,13 +1121,12 @@ 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:
     // 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
+    if (gtk_check_version(2,2,0))
+        use_bitmap.GetPixmap();

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


@@ -1197,7 +1210,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     }
 }
 
     }
 }
 

-bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
+bool wxGTKWindowImplDC::DoBlit( wxCoord xdest, wxCoord ydest,

                          wxCoord width, wxCoord height,
                          wxDC *source,
                          wxCoord xsrc, wxCoord ysrc,
                          wxCoord width, wxCoord height,
                          wxDC *source,
                          wxCoord xsrc, wxCoord ysrc,


@@ -1215,8 +1228,14 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
     xsrc = source->LogicalToDeviceX(xsrc);
     ysrc = source->LogicalToDeviceY(ysrc);
 
     xsrc = source->LogicalToDeviceX(xsrc);
     ysrc = source->LogicalToDeviceY(ysrc);
 

-    wxClientDC *srcDC = (wxClientDC*)source;
-    wxMemoryDC *memDC = (wxMemoryDC*)source;
+    wxBitmap selected;
+    wxMemoryDC *memDC = wxDynamicCast(source, wxMemoryDC);
+    if ( memDC )
+    {
+        selected = memDC->GetSelectedBitmap();
+        if ( !selected.IsOk() )
+            return false;
+    }

 
     bool use_bitmap_method = false;
     bool is_mono = false;
 
     bool use_bitmap_method = false;
     bool is_mono = false;


@@ -1227,11 +1246,9 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         ysrcMask = ysrc;
     }
 
         ysrcMask = ysrc;
     }
 

-    if (srcDC->m_isMemDC)
+    if (selected.Ok())

     {
     {

-        if (!memDC->m_selected.Ok()) return false;
-
-        is_mono = (memDC->m_selected.GetDepth() == 1);
+        is_mono = (selected.GetDepth() == 1);

 
         // we use the "XCopyArea" way to copy a memory dc into
         // a different window if the memory dc BOTH
 
         // we use the "XCopyArea" way to copy a memory dc into
         // a different window if the memory dc BOTH


@@ -1239,7 +1256,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         // b) it is clipped
         // c) is not 1-bit
 
         // b) it is clipped
         // c) is not 1-bit
 

-        if (useMask && (memDC->m_selected.GetMask()))
+        if (useMask && (selected.GetMask()))

         {
             // we HAVE TO use the direct way for memory dcs
             // that have mask since the XCopyArea doesn't know
         {
             // we HAVE TO use the direct way for memory dcs
             // that have mask since the XCopyArea doesn't know


@@ -1254,8 +1271,8 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             use_bitmap_method = true;
         }
         else if ((xsrc == 0) && (ysrc == 0) &&
             use_bitmap_method = true;
         }
         else if ((xsrc == 0) && (ysrc == 0) &&

-                 (width == memDC->m_selected.GetWidth()) &&
-                 (height == memDC->m_selected.GetHeight()))
+                 (width == selected.GetWidth()) &&
+                 (height == selected.GetHeight()))

         {
             // we SHOULD use the direct way if all of the bitmap
             // in the memory dc is copied in which case XCopyArea
         {
             // we SHOULD use the direct way if all of the bitmap
             // in the memory dc is copied in which case XCopyArea


@@ -1290,8 +1307,8 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
     if (use_bitmap_method)
     {
         // scale/translate bitmap size
     if (use_bitmap_method)
     {
         // scale/translate bitmap size

-        wxCoord bm_width = memDC->m_selected.GetWidth();
-        wxCoord bm_height = memDC->m_selected.GetHeight();
+        wxCoord bm_width = selected.GetWidth();
+        wxCoord bm_height = selected.GetHeight();

 
         // Get clip coords for the bitmap. If we don't
         // use wxBitmap::Rescale(), which can clip the
 
         // Get clip coords for the bitmap. If we don't
         // use wxBitmap::Rescale(), which can clip the


@@ -1312,18 +1329,19 @@ 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 = memDC->m_selected;
-        if ((memDC->m_selected.GetWidth()!= bm_ww) || ( memDC->m_selected.GetHeight()!= bm_hh))
+        wxBitmap use_bitmap = selected;
+        if ((selected.GetWidth()!= bm_ww) || ( selected.GetHeight()!= bm_hh))

         {
             // This indicates that the blitting code below will get
             // a clipped bitmap and therefore needs to move the origin
             // accordingly
             wxRegion tmp( xx,yy,ww,hh );
         {
             // This indicates that the blitting code below will get
             // a clipped bitmap and therefore needs to move the origin
             // accordingly
             wxRegion tmp( xx,yy,ww,hh );

-            tmp.Intersect( m_currentClippingRegion );
+            if (!m_currentClippingRegion.IsNull())
+                tmp.Intersect( m_currentClippingRegion );

             tmp.GetBox(cx,cy,cw,ch);
 
             // Scale and clipped bitmap
             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);
+            use_bitmap = selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);

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


@@ -1403,7 +1421,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
     }
     else // use_bitmap_method
     {
     }
     else // use_bitmap_method
     {

-        if ((width != ww) || (height != hh))
+        if (selected.Ok() && ((width != ww) || (height != hh)))

         {
             // get clip coords
             wxRegion tmp( xx,yy,ww,hh );
         {
             // get clip coords
             wxRegion tmp( xx,yy,ww,hh );


@@ -1412,7 +1430,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             tmp.GetBox(cx,cy,cw,ch);
 
             // rescale bitmap
             tmp.GetBox(cx,cy,cw,ch);
 
             // rescale bitmap

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

 
             // draw scaled bitmap
             // was: gdk_draw_drawable( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
 
             // draw scaled bitmap
             // was: gdk_draw_drawable( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );


@@ -1422,10 +1440,14 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         {
             // No scaling and not a memory dc with a mask either
 
         {
             // No scaling and not a memory dc with a mask either
 

+            GdkWindow* window = source->GetGDKWindow();
+            if ( !window )
+                return false;
+

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

-                               srcDC->GetWindow(),
+                               window,

                                xsrc, ysrc, xx, yy,
                                width, height );
             gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
                                xsrc, ysrc, xx, yy,
                                width, height );
             gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );


@@ -1437,7 +1459,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
     return true;
 }
 
     return true;
 }
 

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

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


@@ -1461,11 +1483,11 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         return;
     size_t datalen = strlen(data);
 
         return;
     size_t datalen = strlen(data);
 

-    // TODO: as soon as Pango provides a function to check at runtime its
-    //       version, we can use it to disable the underline hack for
-    //       Pango >= 1.16 as the "underline of leading/trailing spaces"
-    //       has been fixed there
-    bool needshack = underlined;
+    // in Pango >= 1.16 the "underline of leading/trailing spaces" bug
+    // has been fixed and thus the hack implemented below should never be used
+    static bool pangoOk = !wx_pango_version_check(1, 16, 0);
+
+    bool needshack = underlined && !pangoOk;

     char *hackstring = NULL;
 
     if (needshack)
     char *hackstring = NULL;
 
     if (needshack)


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

-        
+

         // Draw layout.
         if (m_owner && m_owner->GetLayoutDirection() == wxLayout_RightToLeft)
             gdk_draw_layout( m_window, m_textGC, x-w, y, m_layout );
         // Draw layout.
         if (m_owner && m_owner->GetLayoutDirection() == wxLayout_RightToLeft)
             gdk_draw_layout( m_window, m_textGC, x-w, y, m_layout );


@@ -1603,8 +1625,9 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
 // a better approach here:
 //           http://www.daa.com.au/pipermail/pygtk/2003-April/005052.html
 
 // a better approach here:
 //           http://www.daa.com.au/pipermail/pygtk/2003-April/005052.html
 

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

 {
 {

+#if wxUSE_IMAGE

     if (!m_window || text.empty())
         return;
 
     if (!m_window || text.empty())
         return;
 


@@ -1703,12 +1726,13 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
     // 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 // wxUSE_IMAGE

 }
 
 }
 

-void wxWindowDC::DoGetTextExtent(const wxString &string,
+void wxGTKWindowImplDC::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 ( width )
         *width = 0;
 {
     if ( width )
         *width = 0;


@@ -1764,11 +1788,55 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
     }
 
     // Reset old font description
     }
 
     // Reset old font description

-    if (theFont)
+    if (theFont->IsOk())

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

-wxCoord wxWindowDC::GetCharWidth() const
+
+bool wxGTKWindowImplDC::DoGetPartialTextExtents(const wxString& text,
+                                         wxArrayInt& widths) const
+{
+    const size_t len = text.length();
+    widths.Empty();
+    widths.Add(0, len);
+
+    if (text.empty())
+        return true;
+
+    // Set layout's text
+    const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(text, m_font);
+    if ( !dataUTF8 )
+    {
+        // hardly ideal, but what else can we do if conversion failed?
+        wxLogLastError(wxT("DoGetPartialTextExtents"));
+        return false;
+    }
+
+    pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
+
+    // Calculate the position of each character based on the widths of
+    // the previous characters
+
+    // Code borrowed from Scintilla's PlatGTK
+    PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
+    PangoRectangle pos;
+    pango_layout_iter_get_cluster_extents(iter, NULL, &pos);
+    size_t i = 0;
+    while (pango_layout_iter_next_cluster(iter))
+    {
+        pango_layout_iter_get_cluster_extents(iter, NULL, &pos);
+        int position = PANGO_PIXELS(pos.x);
+        widths[i++] = position;
+    }
+    while (i < len)
+        widths[i++] = PANGO_PIXELS(pos.x + pos.width);
+    pango_layout_iter_free(iter);
+
+    return true;
+}
+
+
+wxCoord wxGTKWindowImplDC::GetCharWidth() const

 {
     pango_layout_set_text( m_layout, "H", 1 );
     int w;
 {
     pango_layout_set_text( m_layout, "H", 1 );
     int w;


@@ -1776,13 +1844,18 @@ wxCoord wxWindowDC::GetCharWidth() const
     return w;
 }
 
     return w;
 }
 

-wxCoord wxWindowDC::GetCharHeight() const
+wxCoord wxGTKWindowImplDC::GetCharHeight() const

 {
     PangoFontMetrics *metrics = pango_context_get_metrics (m_context, m_fontdesc, pango_context_get_language(m_context));
 {
     PangoFontMetrics *metrics = pango_context_get_metrics (m_context, m_fontdesc, pango_context_get_language(m_context));

-    return PANGO_PIXELS (pango_font_metrics_get_descent (metrics) + pango_font_metrics_get_ascent (metrics));
+    wxCHECK_MSG( metrics, -1, _T("failed to get pango font metrics") );
+
+    wxCoord h = PANGO_PIXELS (pango_font_metrics_get_descent (metrics) +
+                pango_font_metrics_get_ascent (metrics));
+    pango_font_metrics_unref (metrics);
+    return h;

 }
 
 }
 

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

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


@@ -1820,7 +1893,7 @@ void wxWindowDC::Clear()
 #endif // 0/1
 }
 
 #endif // 0/1
 }
 

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

 {
     m_font = font;
 
 {
     m_font = font;
 


@@ -1854,7 +1927,7 @@ void wxWindowDC::SetFont( const wxFont &font )
     }
 }
 
     }
 }
 

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

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


@@ -2004,7 +2077,7 @@ 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 wxGTKWindowImplDC::SetBrush( const wxBrush &brush )

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


@@ -2049,7 +2122,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
     }
 }
 
     }
 }
 

-void wxWindowDC::SetBackground( const wxBrush &brush )
+void wxGTKWindowImplDC::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 */


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

-void wxWindowDC::SetLogicalFunction( int function )
+void wxGTKWindowImplDC::SetLogicalFunction( int function )

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


@@ -2142,7 +2215,7 @@ 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 wxGTKWindowImplDC::SetTextForeground( const wxColour &col )

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


@@ -2161,7 +2234,7 @@ void wxWindowDC::SetTextForeground( const wxColour &col )
     }
 }
 
     }
 }
 

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

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


@@ -2178,7 +2251,7 @@ void wxWindowDC::SetTextBackground( const wxColour &col )
     }
 }
 
     }
 }
 

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

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


@@ -2196,12 +2269,12 @@ void wxWindowDC::SetBackgroundMode( int mode )
     }
 }
 
     }
 }
 

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

 {
 {

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

 }
 
 }
 

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

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


@@ -2238,7 +2311,7 @@ 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 wxGTKWindowImplDC::DoSetClippingRegionAsRegion( const wxRegion &region  )

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


@@ -2270,7 +2343,7 @@ 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 wxGTKWindowImplDC::DestroyClippingRegion()

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


@@ -2301,7 +2374,7 @@ void wxWindowDC::DestroyClippingRegion()
     }
 }
 
     }
 }
 

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

 {
     if (m_penGC) wxFreePoolGC( m_penGC );
     m_penGC = (GdkGC*) NULL;
 {
     if (m_penGC) wxFreePoolGC( m_penGC );
     m_penGC = (GdkGC*) NULL;


@@ -2313,26 +2386,26 @@ void wxWindowDC::Destroy()
     m_bgGC = (GdkGC*) NULL;
 }
 
     m_bgGC = (GdkGC*) NULL;
 }
 

-void wxWindowDC::SetDeviceOrigin( wxCoord x, wxCoord y )
+void wxGTKWindowImplDC::SetDeviceOrigin( wxCoord x, wxCoord y )

 {
     m_deviceOriginX = x;
     m_deviceOriginY = y;
 {
     m_deviceOriginX = x;
     m_deviceOriginY = y;

-    
+

     ComputeScaleAndOrigin();
 }
 
     ComputeScaleAndOrigin();
 }
 

-void wxWindowDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
+void wxGTKWindowImplDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )

 {
     m_signX = (xLeftRight ?  1 : -1);
     m_signY = (yBottomUp  ? -1 :  1);
 {
     m_signX = (xLeftRight ?  1 : -1);
     m_signY = (yBottomUp  ? -1 :  1);

-    
+

     if (m_owner && m_owner->m_wxwindow && (m_owner->GetLayoutDirection() == wxLayout_RightToLeft))
     if (m_owner && m_owner->m_wxwindow && (m_owner->GetLayoutDirection() == wxLayout_RightToLeft))

-        m_signX = -m_signX;        
-        
+        m_signX = -m_signX;
+

     ComputeScaleAndOrigin();
 }
 
     ComputeScaleAndOrigin();
 }
 

-void wxWindowDC::ComputeScaleAndOrigin()
+void wxGTKWindowImplDC::ComputeScaleAndOrigin()

 {
     const wxRealPoint origScale(m_scaleX, m_scaleY);
 
 {
     const wxRealPoint origScale(m_scaleX, m_scaleY);
 


@@ -2350,12 +2423,12 @@ void wxWindowDC::ComputeScaleAndOrigin()
 }
 
 // Resolution in pixels per logical inch
 }
 
 // Resolution in pixels per logical inch

-wxSize wxWindowDC::GetPPI() const
+wxSize wxGTKWindowImplDC::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 wxGTKWindowImplDC::GetDepth() const

 {
     return gdk_drawable_get_depth(m_window);
 }
 {
     return gdk_drawable_get_depth(m_window);
 }


@@ -2365,7 +2438,11 @@ int wxWindowDC::GetDepth() const
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
 // wxPaintDC
 //-----------------------------------------------------------------------------
 

+#if wxUSE_NEW_DC
+IMPLEMENT_DYNAMIC_CLASS(wxGTKPaintImplDC, wxGTKClientImplDC)
+#else

 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)

+#endif

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


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

-wxPaintDC::wxPaintDC( wxWindow *win )
-         : wxClientDC( win )
+wxGTKPaintImplDC::wxGTKPaintImplDC( wxWindow *win )
+         : wxGTKClientImplDC( win )

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


@@ -2418,12 +2495,16 @@ wxPaintDC::wxPaintDC( wxWindow *win )
 // wxClientDC
 //-----------------------------------------------------------------------------
 
 // wxClientDC
 //-----------------------------------------------------------------------------
 

+#if wxUSE_NEW_DC
+IMPLEMENT_DYNAMIC_CLASS(wxGTKClientImplDC, wxGTKWindowImplDC)
+#else

 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)

+#endif

 
 

-wxClientDC::wxClientDC( wxWindow *win )
-          : wxWindowDC( win )
+wxGTKClientImplDC::wxGTKClientImplDC( wxWindow *win )
+          : wxGTKWindowImplDC( win )

 {
 {

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

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


@@ -2433,7 +2514,7 @@ wxClientDC::wxClientDC( wxWindow *win )
 #endif // __WXUNIVERSAL__
 }
 
 #endif // __WXUNIVERSAL__
 }
 

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

 {
     wxCHECK_RET( m_owner, _T("GetSize() doesn't work without window") );
 
 {
     wxCHECK_RET( m_owner, _T("GetSize() doesn't work without window") );