projects
/
claws.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2011-10-07 [colin] 3.7.10cvs23
[claws.git]
/
src
/
gtk
/
gtkshruler.c
diff --git
a/src/gtk/gtkshruler.c
b/src/gtk/gtkshruler.c
index 21b5877a5401957f8ac917fa0b235e006a33d8e0..aaeb0fd639e2ac202fcc77041cd4a1ba1e41046e 100644
(file)
--- a/
src/gtk/gtkshruler.c
+++ b/
src/gtk/gtkshruler.c
@@
-1,6
+1,6
@@
/* GtkSHRuler
*
/* GtkSHRuler
*
- * Copyright (C) 2000-20
05
Alfons Hoogervorst & The Claws Mail Team
+ * Copyright (C) 2000-20
11
Alfons Hoogervorst & The Claws Mail Team
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@
-32,6
+32,9
@@
#include <gtk/gtk.h>
#include "gtkshruler.h"
#include "utils.h"
#include <gtk/gtk.h>
#include "gtkshruler.h"
#include "utils.h"
+#include "gtkutils.h"
+
+#if !GTK_CHECK_VERSION(2,24,0)
#define RULER_HEIGHT 14
#define MINIMUM_INCR 5
#define RULER_HEIGHT 14
#define MINIMUM_INCR 5
@@
-114,7
+117,7
@@
static void
gtk_shruler_draw_ticks(GtkRuler *ruler)
{
GtkWidget *widget;
gtk_shruler_draw_ticks(GtkRuler *ruler)
{
GtkWidget *widget;
-
GdkGC *gc, *bg_gc
;
+
cairo_t *cr
;
gint i;
gint width, height;
gint xthickness;
gint i;
gint width, height;
gint xthickness;
@@
-124,13
+127,15
@@
gtk_shruler_draw_ticks(GtkRuler *ruler)
cm_return_if_fail (ruler != NULL);
cm_return_if_fail (GTK_IS_HRULER (ruler));
cm_return_if_fail (ruler != NULL);
cm_return_if_fail (GTK_IS_HRULER (ruler));
- if (!
GTK_WIDGET_DRAWABLE (ruler
))
+ if (!
gtkut_widget_is_drawable (GTK_WIDGET(ruler)
))
return;
widget = GTK_WIDGET (ruler);
return;
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, >k_widget_get_style(widget)->text[GTK_STATE_NORMAL]);
xthickness = widget->style->xthickness;
ythickness = widget->style->ythickness;
xthickness = widget->style->xthickness;
ythickness = widget->style->ythickness;
@@
-153,9
+158,9
@@
gtk_shruler_draw_ticks(GtkRuler *ruler)
if ( pos % 10 == 0 ) length = ( 2 * height / 3 );
else if ( pos % 5 == 0 ) length = ( height / 3 );
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];
if ( pos % 10 == 0 ) {
gchar buf[8];
@@
-167,10
+172,13
@@
gtk_shruler_draw_ticks(GtkRuler *ruler)
layout = gtk_widget_create_pango_layout
(GTK_WIDGET(ruler), buf);
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);
}
}
g_object_unref(layout);
}
}
+
+ cairo_destroy(cr);
}
}
+#endif