← Back to branch summary

~ubuntu-branches/debian/squeeze/librsvg/squeeze

« back to all changes in this revision

Viewing changes to gtk-engine/svg-draw.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2010-05-01 14:23:09 UTC
  • mfrom: (1.1.22 upstream) (25.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100501142309-f0otyldu6gyratt9
Tags: 2.26.3-1
New upstream bugfix release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk-engine/svg-draw.c
104
104
  
105
105
  if ((width == -1) && (height == -1))
106
106
    {
107
 
      gdk_window_get_size(window, &width, &height);
 
107
      gdk_drawable_get_size(window, &width, &height);
108
108
      if (allow_setbg)
109
109
        setbg = TRUE;
110
110
    }
111
111
  else if (width == -1)
112
 
    gdk_window_get_size(window, &width, NULL);
 
112
    gdk_drawable_get_size(window, &width, NULL);
113
113
  else if (height == -1)
114
 
    gdk_window_get_size(window, NULL, &height);
 
114
    gdk_drawable_get_size(window, NULL, &height);
115
115
 
116
116
  if (!(match_data->flags & THEME_MATCH_ORIENTATION))
117
117
    {
167
167
  
168
168
  if ((width == -1) && (height == -1))
169
169
    {
170
 
      gdk_window_get_size(window, &width, &height);
 
170
      gdk_drawable_get_size(window, &width, &height);
171
171
      setbg = TRUE;
172
172
    }
173
173
  else if (width == -1)
174
 
    gdk_window_get_size(window, &width, NULL);
 
174
    gdk_drawable_get_size(window, &width, NULL);
175
175
  else if (height == -1)
176
 
    gdk_window_get_size(window, NULL, &height);
 
176
    gdk_drawable_get_size(window, NULL, &height);
177
177
 
178
178
  if (!(match_data->flags & THEME_MATCH_ORIENTATION))
179
179
    {
594
594
             gint y,
595
595
             const gchar * string)
596
596
{
 
597
  PangoLayout *layout = NULL;
 
598
 
597
599
  g_return_if_fail(style != NULL);
598
600
  g_return_if_fail(window != NULL);
599
601
 
 
602
  layout = gtk_widget_create_pango_layout (widget, string);
 
603
 
600
604
  if (state == GTK_STATE_INSENSITIVE)
601
605
    {
602
606
      if (area)
605
609
          gdk_gc_set_clip_rectangle(style->fg_gc[state], area);
606
610
        }
607
611
 
608
 
      gdk_draw_string(window, gtk_style_get_font (style), style->fg_gc[state], x, y, string);
 
612
      gdk_draw_layout(GDK_DRAWABLE (window), style->fg_gc[state], x, y, layout);
609
613
      
610
614
      if (area)
611
615
        {
616
620
  else
617
621
    {
618
622
      gdk_gc_set_clip_rectangle(style->fg_gc[state], area);
619
 
      gdk_draw_string(window, gtk_style_get_font (style), style->fg_gc[state], x, y, string);
 
623
      gdk_draw_layout(GDK_DRAWABLE (window), style->fg_gc[state], x, y, layout);
620
624
      gdk_gc_set_clip_rectangle(style->fg_gc[state], NULL);
621
625
    }
622
626
}