X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e98dabce4e47fe0441aa1b695fd7e1d4146c68e..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/gtk/dcclient.cpp?ds=sidebyside diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index c427dfa08c..35b0fd4ff6 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -25,6 +25,7 @@ #include "wx/gtk/private.h" #include "wx/gtk/private/object.h" +#include "wx/private/textmeasure.h" //----------------------------------------------------------------------------- // local defines @@ -696,7 +697,7 @@ void wxWindowDCImpl::DoDrawPoint( wxCoord x, wxCoord y ) CalcBoundingBox (x, y); } -void wxWindowDCImpl::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset ) +void wxWindowDCImpl::DoDrawLines( int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset ) { wxCHECK_RET( IsOk(), wxT("invalid window dc") ); @@ -710,29 +711,32 @@ void wxWindowDCImpl::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCo 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* gpts = reinterpret_cast(points); + const GdkPoint* gpts = reinterpret_cast(points); + GdkPoint* gpts_alloc = NULL; if (doScale) - gpts = new GdkPoint[n]; + { + gpts_alloc = new GdkPoint[n]; + gpts = gpts_alloc; + } 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); + gpts_alloc[i].x = XLOG2DEV(points[i].x + xoffset); + gpts_alloc[i].y = YLOG2DEV(points[i].y + yoffset); } CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset); } if (m_gdkwindow) - gdk_draw_lines( m_gdkwindow, m_penGC, gpts, n); + gdk_draw_lines( m_gdkwindow, m_penGC, (GdkPoint*) gpts, n); - if (doScale) - delete[] gpts; + delete[] gpts_alloc; } -void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[], +void wxWindowDCImpl::DoDrawPolygon( int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode WXUNUSED(fillStyle) ) { @@ -745,18 +749,22 @@ void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[], 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(points); + const GdkPoint* gdkpoints = reinterpret_cast(points); + GdkPoint* gdkpoints_alloc = NULL; if (doScale) - gdkpoints = new GdkPoint[n]; + { + gdkpoints_alloc = new GdkPoint[n]; + gdkpoints = gdkpoints_alloc; + } int i; for (i = 0 ; i < n ; i++) { if (doScale) { - gdkpoints[i].x = XLOG2DEV(points[i].x + xoffset); - gdkpoints[i].y = YLOG2DEV(points[i].y + yoffset); + gdkpoints_alloc[i].x = XLOG2DEV(points[i].x + xoffset); + gdkpoints_alloc[i].y = YLOG2DEV(points[i].y + yoffset); } CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset); } @@ -769,7 +777,7 @@ void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[], bool originChanged; DrawingSetup(gc, originChanged); - gdk_draw_polygon(m_gdkwindow, gc, true, gdkpoints, n); + gdk_draw_polygon(m_gdkwindow, gc, true, (GdkPoint*) gdkpoints, n); if (originChanged) gdk_gc_set_ts_origin(gc, 0, 0); @@ -787,13 +795,12 @@ void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[], gdkpoints[(i+1)%n].y); } */ - gdk_draw_polygon( m_gdkwindow, m_penGC, FALSE, gdkpoints, n ); + gdk_draw_polygon( m_gdkwindow, m_penGC, FALSE, (GdkPoint*) gdkpoints, n ); } } - if (doScale) - delete[] gdkpoints; + delete[] gdkpoints_alloc; } void wxWindowDCImpl::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) @@ -989,7 +996,7 @@ void wxWindowDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) DoDrawBitmap( (const wxBitmap&)icon, x, y, true ); } -// scale a pixbuf, return new pixbuf, unref old one +// scale a pixbuf static GdkPixbuf* Scale(GdkPixbuf* pixbuf, int dst_w, int dst_h, double sx, double sy) { @@ -997,20 +1004,21 @@ Scale(GdkPixbuf* pixbuf, int dst_w, int dst_h, double sx, double sy) GDK_COLORSPACE_RGB, gdk_pixbuf_get_has_alpha(pixbuf), 8, dst_w, dst_h); gdk_pixbuf_scale(pixbuf, pixbuf_scaled, 0, 0, dst_w, dst_h, 0, 0, sx, sy, GDK_INTERP_NEAREST); - g_object_unref(pixbuf); return pixbuf_scaled; } -// scale part of a pixmap using pixbuf scaling, return pixbuf +// scale part of a pixmap using pixbuf scaling static GdkPixbuf* Scale(GdkPixmap* pixmap, int x, int y, int w, int h, int dst_w, int dst_h, double sx, double sy) { GdkPixbuf* pixbuf = gdk_pixbuf_get_from_drawable( NULL, pixmap, NULL, x, y, 0, 0, w, h); - return Scale(pixbuf, dst_w, dst_h, sx, sy); + GdkPixbuf* pixbuf2 = Scale(pixbuf, dst_w, dst_h, sx, sy); + g_object_unref(pixbuf); + return pixbuf2; } -// scale part of a mask pixmap, return new mask, unref old one +// scale part of a mask pixmap static GdkPixmap* ScaleMask(GdkPixmap* mask, int x, int y, int w, int h, int dst_w, int dst_h, double sx, double sy) { @@ -1034,12 +1042,10 @@ ScaleMask(GdkPixmap* mask, int x, int y, int w, int h, int dst_w, int dst_h, dou g_object_unref(pixbuf); GdkPixmap* pixmap = gdk_bitmap_create_from_data(mask, data, dst_w, dst_h); delete[] data; - g_object_unref(mask); return pixmap; } // Make a new mask from part of a mask and a clip region. -// Return new mask, unref old one. static GdkPixmap* ClipMask(GdkPixmap* mask, GdkRegion* clipRegion, int x, int y, int dst_x, int dst_y, int w, int h) { @@ -1054,7 +1060,6 @@ ClipMask(GdkPixmap* mask, GdkRegion* clipRegion, int x, int y, int dst_x, int ds // draw old mask onto new one, with clip gdk_draw_drawable(pixmap, gc, mask, x, y, 0, 0, w, h); g_object_unref(gc); - g_object_unref(mask); return pixmap; } @@ -1125,18 +1130,25 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap, { wxMask* m = bitmap.GetMask(); if (m) - mask = m->GetBitmap(); + mask = *m; } + + GdkPixmap* mask_new = NULL; if (mask) { - g_object_ref(mask); if (isScaled) + { mask = ScaleMask(mask, 0, 0, w, h, ww, hh, m_scaleX, m_scaleY); + mask_new = mask; + } if (overlap == wxPartRegion) { // need a new mask that also masks the clipped area, // because gc can't have both a mask and a clip region mask = ClipMask(mask, clipRegion, 0, 0, xx, yy, ww, hh); + if (mask_new) + g_object_unref(mask_new); + mask_new = mask; } gdk_gc_set_clip_mask(use_gc, mask); gdk_gc_set_clip_origin(use_gc, xx, yy); @@ -1144,24 +1156,22 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap, // determine whether to use pixmap or pixbuf GdkPixmap* pixmap = NULL; + GdkPixmap* pixmap_new = NULL; GdkPixbuf* pixbuf = NULL; + GdkPixbuf* pixbuf_new = NULL; if (bitmap.HasPixmap()) pixmap = bitmap.GetPixmap(); if (pixmap && gdk_drawable_get_depth(pixmap) == 1) { - // convert mono pixmap to color using text fg/bg colors - pixmap = MonoToColor(pixmap, 0, 0, w, h); + if (gdk_drawable_get_depth(m_gdkwindow) != 1) + { + // convert mono pixmap to color using text fg/bg colors + pixmap = MonoToColor(pixmap, 0, 0, w, h); + pixmap_new = pixmap; + } } else if (hasAlpha || pixmap == NULL) - { - pixmap = NULL; pixbuf = bitmap.GetPixbuf(); - g_object_ref(pixbuf); - } - else - { - g_object_ref(pixmap); - } if (isScaled) { @@ -1169,25 +1179,34 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap, pixbuf = Scale(pixbuf, ww, hh, m_scaleX, m_scaleY); else pixbuf = Scale(pixmap, 0, 0, w, h, ww, hh, m_scaleX, m_scaleY); + + pixbuf_new = pixbuf; } if (pixbuf) { gdk_draw_pixbuf(m_gdkwindow, use_gc, pixbuf, 0, 0, xx, yy, ww, hh, GDK_RGB_DITHER_NORMAL, 0, 0); - g_object_unref(pixbuf); } else { gdk_draw_drawable(m_gdkwindow, use_gc, pixmap, 0, 0, xx, yy, ww, hh); } - if (pixmap) - g_object_unref(pixmap); + if (pixbuf_new) + g_object_unref(pixbuf_new); + if (pixmap_new) + g_object_unref(pixmap_new); if (mask) { - g_object_unref(mask); gdk_gc_set_clip_region(use_gc, clipRegion); + + // Notice that we can only release the mask now, we can't do it before + // the calls to gdk_draw_xxx() above as they crash with X error with + // GTK+ up to 2.20.1 (i.e. it works with 2.20 but is known to not work + // with 2.16.1 and below). + if (mask_new) + g_object_unref(mask_new); } } @@ -1217,7 +1236,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, { wxMask* m = bitmap.GetMask(); if (m) - mask = m->GetBitmap(); + mask = *m; } } else @@ -1297,7 +1316,6 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, if (mask) { - g_object_ref(mask); int srcMask_x = src_x; int srcMask_y = src_y; if (xsrcMask != -1 || ysrcMask != -1) @@ -1305,10 +1323,12 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, srcMask_x = source->LogicalToDeviceX(xsrcMask); srcMask_y = source->LogicalToDeviceY(ysrcMask); } + GdkPixmap* mask_new = NULL; if (isScaled) { mask = ScaleMask(mask, srcMask_x, srcMask_y, src_w, src_h, dst_w, dst_h, scale_x, scale_y); + mask_new = mask; srcMask_x = 0; srcMask_y = 0; } @@ -1318,15 +1338,21 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, // because gc can't have both a mask and a clip region mask = ClipMask(mask, clipRegion, srcMask_x, srcMask_y, dst_x, dst_y, dst_w, dst_h); + if (mask_new) + g_object_unref(mask_new); + mask_new = mask; srcMask_x = 0; srcMask_y = 0; } gdk_gc_set_clip_mask(use_gc, mask); gdk_gc_set_clip_origin(use_gc, dst_x - srcMask_x, dst_y - srcMask_y); + if (mask_new) + g_object_unref(mask_new); } GdkPixmap* pixmap = NULL; - if (gdk_drawable_get_depth(srcDrawable) == 1) + if (gdk_drawable_get_depth(srcDrawable) == 1 && + (gdk_drawable_get_depth(m_gdkwindow) != 1 || isScaled)) { // Convert mono pixmap to color using text fg/bg colors. // Scaling/drawing is simpler if this is done first. @@ -1362,10 +1388,8 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, if (pixmap) g_object_unref(pixmap); if (mask) - { - g_object_unref(mask); gdk_gc_set_clip_region(use_gc, clipRegion); - } + return true; } @@ -1451,188 +1475,80 @@ void wxWindowDCImpl::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord wxCHECK_RET( IsOk(), wxT("invalid window dc") ); -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) - { - x = XLOG2DEV(x); - y = YLOG2DEV(y); - - pango_layout_set_text(m_layout, wxGTK_CONV(text), -1); - const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout); - int oldSize = 0; - const bool isScaled = fabs(m_scaleY - 1.0) > 0.00001; - if (isScaled) - { - //TODO: when Pango >= 1.6 is required, use pango_matrix_scale() - // If there is a user or actually any scale applied to - // the device context, scale the font. + x = XLOG2DEV(x); + y = YLOG2DEV(y); - // scale font description - oldSize = pango_font_description_get_size(m_fontdesc); - pango_font_description_set_size(m_fontdesc, int(oldSize * m_scaleY)); + pango_layout_set_text(m_layout, wxGTK_CONV(text), -1); + const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout); + int oldSize = 0; + const bool isScaled = fabs(m_scaleY - 1.0) > 0.00001; + if (isScaled) + { + //TODO: when Pango >= 1.6 is required, use pango_matrix_scale() + // If there is a user or actually any scale applied to + // the device context, scale the font. - // actually apply scaled font - pango_layout_set_font_description( m_layout, m_fontdesc ); - } + // scale font description + oldSize = pango_font_description_get_size(m_fontdesc); + pango_font_description_set_size(m_fontdesc, int(oldSize * m_scaleY)); - int w, h; - pango_layout_get_pixel_size(m_layout, &w, &h); - - const GdkColor* bg_col = NULL; - if (m_backgroundMode == wxBRUSHSTYLE_SOLID) - bg_col = m_textBackgroundColour.GetColor(); - - // rotate the text - PangoMatrix matrix = PANGO_MATRIX_INIT; - pango_matrix_rotate (&matrix, angle); - pango_context_set_matrix (m_context, &matrix); - pango_layout_context_changed (m_layout); - - // To be compatible with MSW, the rotation axis must be in the old - // top-left corner. - // Calculate the vertices of the rotated rectangle containing the text, - // relative to the old top-left vertex. - // We could use the matrix for this, but it's simpler with trignonometry. - double rad = DegToRad(angle); - // the rectangle vertices are counted clockwise with the first one - // being at (0, 0) - double x2 = w * cos(rad); - double y2 = -w * sin(rad); // y axis points to the bottom, hence minus - double x4 = h * sin(rad); - double y4 = h * cos(rad); - double x3 = x4 + x2; - double y3 = y4 + y2; - // Then we calculate max and min of the rotated rectangle. - wxCoord maxX = (wxCoord)(dmax(dmax(0, x2), dmax(x3, x4)) + 0.5), - maxY = (wxCoord)(dmax(dmax(0, y2), dmax(y3, y4)) + 0.5), - minX = (wxCoord)(dmin(dmin(0, x2), dmin(x3, x4)) - 0.5), - minY = (wxCoord)(dmin(dmin(0, y2), dmin(y3, y4)) - 0.5); - - gdk_draw_layout_with_colors(m_gdkwindow, m_textGC, x+minX, y+minY, - m_layout, NULL, bg_col); - - if (setAttrs) - pango_layout_set_attributes(m_layout, NULL); - - // clean up the transformation matrix - pango_context_set_matrix(m_context, NULL); + // actually apply scaled font + pango_layout_set_font_description( m_layout, m_fontdesc ); + } - if (isScaled) - { - // reset unscaled size - pango_font_description_set_size( m_fontdesc, oldSize ); + int w, h; + pango_layout_get_pixel_size(m_layout, &w, &h); - // actually apply unscaled font - pango_layout_set_font_description( m_layout, m_fontdesc ); - } + const GdkColor* bg_col = NULL; + if (m_backgroundMode == wxBRUSHSTYLE_SOLID) + bg_col = m_textBackgroundColour.GetColor(); - CalcBoundingBox(x+minX, y+minY); - CalcBoundingBox(x+maxX, y+maxY); - } - else -#endif //__WXGTK26__ - { -#if wxUSE_IMAGE - if ( wxIsNullDouble(angle) ) - { - DoDrawText(text, x, y); - return; - } + // rotate the text + PangoMatrix matrix = PANGO_MATRIX_INIT; + pango_matrix_rotate (&matrix, angle); + pango_context_set_matrix (m_context, &matrix); + pango_layout_context_changed (m_layout); + + // To be compatible with MSW, the rotation axis must be in the old + // top-left corner. + // Calculate the vertices of the rotated rectangle containing the text, + // relative to the old top-left vertex. + // We could use the matrix for this, but it's simpler with trignonometry. + double rad = DegToRad(angle); + // the rectangle vertices are counted clockwise with the first one + // being at (0, 0) + double x2 = w * cos(rad); + double y2 = -w * sin(rad); // y axis points to the bottom, hence minus + double x4 = h * sin(rad); + double y4 = h * cos(rad); + double x3 = x4 + x2; + double y3 = y4 + y2; + // Then we calculate max and min of the rotated rectangle. + wxCoord maxX = (wxCoord)(dmax(dmax(0, x2), dmax(x3, x4)) + 0.5), + maxY = (wxCoord)(dmax(dmax(0, y2), dmax(y3, y4)) + 0.5), + minX = (wxCoord)(dmin(dmin(0, x2), dmin(x3, x4)) - 0.5), + minY = (wxCoord)(dmin(dmin(0, y2), dmin(y3, y4)) - 0.5); + + gdk_draw_layout_with_colors(m_gdkwindow, m_textGC, x+minX, y+minY, + m_layout, NULL, bg_col); - wxCoord w; - wxCoord h; + if (setAttrs) + pango_layout_set_attributes(m_layout, NULL); - // TODO: implement later without GdkFont for GTK 2.0 - DoGetTextExtent(text, &w, &h, NULL,NULL, &m_font); + // clean up the transformation matrix + pango_context_set_matrix(m_context, NULL); - // draw the string normally - wxBitmap src(w, h); - wxMemoryDC dc; - dc.SelectObject(src); - dc.SetFont(GetFont()); - dc.SetBackground(*wxBLACK_BRUSH); - dc.SetBrush(*wxBLACK_BRUSH); - dc.Clear(); - dc.SetTextForeground( *wxWHITE ); - dc.DrawText(text, 0, 0); - dc.SelectObject(wxNullBitmap); + if (isScaled) + { + // reset unscaled size + pango_font_description_set_size( m_fontdesc, oldSize ); - // Calculate the size of the rotated bounding box. - double rad = DegToRad(angle); - double dx = cos(rad), - dy = sin(rad); - - // the rectngle vertices are counted clockwise with the first one being at - // (0, 0) (or, rather, at (x, y)) - double x2 = w*dx, - y2 = -w*dy; // y axis points to the bottom, hence minus - double x4 = h*dy, - y4 = h*dx; - double x3 = x4 + x2, - y3 = y4 + y2; - - // calc max and min - wxCoord maxX = (wxCoord)(dmax(x2, dmax(x3, x4)) + 0.5), - maxY = (wxCoord)(dmax(y2, dmax(y3, y4)) + 0.5), - minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5), - minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5); - - - wxImage image = src.ConvertToImage(); - - image.ConvertColourToAlpha( m_textForegroundColour.Red(), - m_textForegroundColour.Green(), - m_textForegroundColour.Blue() ); - image = image.Rotate( rad, wxPoint(0,0) ); - - int i_angle = (int) angle; - i_angle = i_angle % 360; - if (i_angle < 0) - i_angle += 360; - int xoffset = 0; - if ((i_angle >= 90.0) && (i_angle < 270.0)) - xoffset = image.GetWidth(); - int yoffset = 0; - if ((i_angle >= 0.0) && (i_angle < 180.0)) - yoffset = image.GetHeight(); - - if ((i_angle >= 0) && (i_angle < 90)) - yoffset -= (int)( cos(rad)*h ); - if ((i_angle >= 90) && (i_angle < 180)) - xoffset -= (int)( sin(rad)*h ); - if ((i_angle >= 180) && (i_angle < 270)) - yoffset -= (int)( cos(rad)*h ); - if ((i_angle >= 270) && (i_angle < 360)) - xoffset -= (int)( sin(rad)*h ); - - int i_x = x - xoffset; - int i_y = y - yoffset; - - src = image; - DoDrawBitmap( src, i_x, i_y, true ); - - - // it would be better to draw with non underlined font and draw the line - // manually here (it would be more straight...) -#if 0 - if ( m_font.GetUnderlined() ) - { - gdk_draw_line( m_gdkwindow, m_textGC, - XLOG2DEV(x + x4), YLOG2DEV(y + y4 + font->descent), - XLOG2DEV(x + x3), YLOG2DEV(y + y3 + font->descent)); - } -#endif // 0 - - // update the bounding box - CalcBoundingBox(x + minX, y + minY); - CalcBoundingBox(x + maxX, y + maxY); -#else // !wxUSE_IMAGE - wxUnusedVar(text); - wxUnusedVar(x); - wxUnusedVar(y); - wxUnusedVar(angle); -#endif // wxUSE_IMAGE/!wxUSE_IMAGE + // actually apply unscaled font + pango_layout_set_font_description( m_layout, m_fontdesc ); } + + CalcBoundingBox(x+minX, y+minY); + CalcBoundingBox(x+maxX, y+maxY); } void wxWindowDCImpl::DoGetTextExtent(const wxString &string, @@ -1640,100 +1556,27 @@ void wxWindowDCImpl::DoGetTextExtent(const wxString &string, wxCoord *descent, wxCoord *externalLeading, const wxFont *theFont) const { - if ( width ) - *width = 0; - if ( height ) - *height = 0; - if ( descent ) - *descent = 0; - if ( externalLeading ) - *externalLeading = 0; - - if (string.empty()) - return; - - // ensure that theFont is always non-NULL + // ensure we work with a valid font + const wxFont *fontToUse; if ( !theFont || !theFont->IsOk() ) - theFont = &m_font; - - // and use it if it's valid - if ( theFont->IsOk() ) - { - 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? - return; - } - - pango_layout_set_text(m_layout, dataUTF8, -1); + fontToUse = &m_font; + else + fontToUse = theFont; - int h; - pango_layout_get_pixel_size(m_layout, width, &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); - } - if (height) - *height = h; + wxCHECK_RET( fontToUse->IsOk(), wxT("invalid font") ); - // Reset old font description - if (theFont->IsOk()) - pango_layout_set_font_description( m_layout, m_fontdesc ); + wxTextMeasure txm(GetOwner(), fontToUse); + txm.GetTextExtent(string, width, height, descent, externalLeading); } bool wxWindowDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const { - const size_t len = text.length(); - widths.Empty(); - widths.Add(0, len); + wxCHECK_MSG( m_font.IsOk(), false, wxT("Invalid font") ); - 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, -1); - - // 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; + wxTextMeasure txm(GetOwner(), &m_font); + return txm.GetPartialTextExtents(text, widths, m_scaleX); } @@ -1961,7 +1804,7 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush ) if ((m_brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask())) { gdk_gc_set_fill( m_textGC, GDK_OPAQUE_STIPPLED); - gdk_gc_set_stipple( m_textGC, m_brush.GetStipple()->GetMask()->GetBitmap() ); + gdk_gc_set_stipple( m_textGC, *m_brush.GetStipple()->GetMask() ); } if (m_brush.IsHatch()) @@ -2283,7 +2126,7 @@ void wxClientDCImpl::DoGetSize(int *width, int *height) const { wxCHECK_RET( m_window, wxT("GetSize() doesn't work without window") ); - m_window->GetClientSize( width, height ); + m_window->GetClientSize(width, height); } //-----------------------------------------------------------------------------