comparison gtk3/dw.c @ 1149:cf934fd39d03

Implemented dw_pixmap_set_font() on GTK2 and incorporated the same GTK3 fontname fixes to avoid clobbering the default font.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 11 Sep 2011 22:19:01 +0000
parents 439f276042cc
children 58b5374355ab
comparison
equal deleted inserted replaced
1148:439f276042cc 1149:cf934fd39d03
6851 if((tmpname = (char *)g_object_get_data(G_OBJECT(handle), "_dw_fontname"))) 6851 if((tmpname = (char *)g_object_get_data(G_OBJECT(handle), "_dw_fontname")))
6852 fontname = tmpname; 6852 fontname = tmpname;
6853 } 6853 }
6854 else if(pixmap) 6854 else if(pixmap)
6855 { 6855 {
6856 char *tmpname;
6857
6858 if(pixmap->font) 6856 if(pixmap->font)
6859 fontname = pixmap->font; 6857 fontname = pixmap->font;
6860 else if(pixmap->handle && (tmpname = (char *)g_object_get_data(G_OBJECT(pixmap->handle), "_dw_fontname"))) 6858 else if(pixmap->handle && (tmpname = (char *)g_object_get_data(G_OBJECT(pixmap->handle), "_dw_fontname")))
6861 fontname = tmpname; 6859 fontname = tmpname;
6862 cr = cairo_create(pixmap->image); 6860 cr = cairo_create(pixmap->image);