2010-07-31 [holger] 3.7.6cvs26

	* src/gtk/gtkshruler.c
		Yet more GdkGC to Cairo porting

diff --git a/ChangeLog b/ChangeLog
index d5264b23b1ca50e47115ff810423ebbf5d73db58..086eabcc5aa1f37026cc1b8d516ec1371675da25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-31 [holger]    3.7.6cvs26
+
+       * src/gtk/gtkshruler.c
+               Yet more GdkGC to Cairo porting
+
 2010-07-30 [holger]    3.7.6cvs25
 
        * src/stock_pixmap.c

diff --git a/PATCHSETS b/PATCHSETS
index d0e0313b9b045d631968b7c9c0ec1f02919f4840..0c7b66052b12ef89df8058dbc9e8fa9dd8d882aa 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4021,3 +4021,4 @@
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/printing.c;  ) > 3.7.6cvs23.patchset
 ( cvs diff -u -r 1.2.2.29 -r 1.2.2.30 src/gtk/colorlabel.c;  ) > 3.7.6cvs24.patchset
 ( cvs diff -u -r 1.25.2.66 -r 1.25.2.67 src/stock_pixmap.c;  ) > 3.7.6cvs25.patchset
+( cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/gtk/gtkshruler.c;  ) > 3.7.6cvs26.patchset

diff --git a/configure.ac b/configure.ac
index 5d81f63d059974225585ce02b2d24857e910a72a..b34b3a636ece21d58657dac5b344670e972f2896 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=26
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkshruler.c b/src/gtk/gtkshruler.c
index 5d10f09b533eb9e5fc09cf6e41c70567f219bf83..66e548f6d7770206b3401bb9b6a0bb8743f70271 100644 (file)
--- a/src/gtk/gtkshruler.c
+++ b/src/gtk/gtkshruler.c
@@ -115,7 +115,7 @@ static void
 gtk_shruler_draw_ticks(GtkRuler *ruler)
 {
        GtkWidget *widget;
-       GdkGC *gc, *bg_gc;
+       cairo_t *cr;
        gint i;
        gint width, height;
        gint xthickness;
@@ -130,8 +130,10 @@ gtk_shruler_draw_ticks(GtkRuler *ruler)
 
        widget = GTK_WIDGET (ruler);
        
-       gc = widget->style->fg_gc[GTK_STATE_NORMAL];
-       bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL];
+       cr = gdk_cairo_create(ruler->backing_store);
+       cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
+       cairo_set_line_width(cr, 1.);
+       gdk_cairo_set_source_color(cr, &gtk_widget_get_style(widget)->text[GTK_STATE_NORMAL]);
 
        xthickness = widget->style->xthickness;
        ythickness = widget->style->ythickness;
@@ -154,9 +156,9 @@ gtk_shruler_draw_ticks(GtkRuler *ruler)
                if ( pos % 10 == 0 ) length = ( 2 * height / 3 );
                else if ( pos % 5 == 0 ) length = ( height / 3 );
                
-               gdk_draw_line(ruler->backing_store, gc,
-                             i, height + ythickness,
-                             i, height - length);                      
+               cairo_move_to(cr, i, height + ythickness);
+               cairo_line_to(cr, i, height - length);
+               cairo_stroke(cr);
                
                if ( pos % 10 == 0 ) {
                        gchar buf[8];
@@ -168,10 +170,12 @@ gtk_shruler_draw_ticks(GtkRuler *ruler)
                        layout = gtk_widget_create_pango_layout
                                (GTK_WIDGET(ruler), buf);
 
-                       gdk_draw_layout(ruler->backing_store, gc, i + 2,
-                                       0, layout);
+                       cairo_move_to(cr, i+2, 0);
+                       pango_cairo_show_layout(cr, layout);
 
                        g_object_unref(layout);
                }
        }
+
+       cairo_destroy(cr);
 }