AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkRcStyle::parse has a GtkSettings parameter now. Pass it through

Browse Source 
2001-09-21  Hans Breuer  <hans@breuer.org>

	* src/pixbuf-rc-style-c :  GtkRcStyle::parse has a GtkSettings
	parameter now. Pass it through theme_parse_file () to use it
	gtk_rc_find_pixmap_in_path ()

	* src/pixbuf-draw.c : the font field from GtkStyle is private
	now, use accessor gtk_style_get_font ()

	* makefile.msc : compile on win32, use it if you have a _real_
	fast computer or want to see gtk in slow motion :-)
This commit is contained in:
Hans Breuer 2001-09-21 22:33:48 +00:00 committed by Hans Breuer
parent f3a65f61a9
commit ed7aefc36a
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/engines/pixbuf/ChangeLog
View File

@ -1,3 +1,15 @@
2001-09-21 Hans Breuer <hans@breuer.org>
* src/pixbuf-rc-style-c : GtkRcStyle::parse has a GtkSettings
parameter now. Pass it through theme_parse_file () to use it
gtk_rc_find_pixmap_in_path ()
* src/pixbuf-draw.c : the font field from GtkStyle is private
now, use accessor gtk_style_get_font ()
* makefile.msc : compile on win32, use it if you have a _real_
fast computer or want to see gtk in slow motion :-)
Thu May 3 05:36:06 2001 Owen Taylor <otaylor@redhat.com> Thu May 3 05:36:06 2001 Owen Taylor <otaylor@redhat.com>
* pixbuf.h: Fix trailing comma on enumeration. (#54071) * pixbuf.h: Fix trailing comma on enumeration. (#54071)

4
modules/engines/pixbuf/pixbuf-draw.c
View File

@ -634,7 +634,7 @@ draw_string (GtkStyle * style,
gdk_gc_set_clip_rectangle(style->fg_gc[state], area); gdk_gc_set_clip_rectangle(style->fg_gc[state], area);
} }
gdk_draw_string(window, style->font, style->fg_gc[state], x, y, string); gdk_draw_string(window, gtk_style_get_font (style), style->fg_gc[state], x, y, string);
if (area) if (area)
{ {
@ -645,7 +645,7 @@ draw_string (GtkStyle * style,
else else
{ {
gdk_gc_set_clip_rectangle(style->fg_gc[state], area); gdk_gc_set_clip_rectangle(style->fg_gc[state], area);
gdk_draw_string(window, style->font, style->fg_gc[state], x, y, string); gdk_draw_string(window, gtk_style_get_font (style), style->fg_gc[state], x, y, string);
gdk_gc_set_clip_rectangle(style->fg_gc[state], NULL); gdk_gc_set_clip_rectangle(style->fg_gc[state], NULL);
} }
} }

22
modules/engines/pixbuf/pixbuf-rc-style.c
View File

@ -28,6 +28,7 @@ static void pixbuf_rc_style_init (PixbufRcStyle *style);
static void pixbuf_rc_style_class_init (PixbufRcStyleClass *klass); static void pixbuf_rc_style_class_init (PixbufRcStyleClass *klass);
static void pixbuf_rc_style_finalize (GObject *object); static void pixbuf_rc_style_finalize (GObject *object);
static guint pixbuf_rc_style_parse (GtkRcStyle *rc_style, static guint pixbuf_rc_style_parse (GtkRcStyle *rc_style,
GtkSettings *settings,
GScanner *scanner); GScanner *scanner);
static void pixbuf_rc_style_merge (GtkRcStyle *dest, static void pixbuf_rc_style_merge (GtkRcStyle *dest,
GtkRcStyle *src); GtkRcStyle *src);
@ -170,7 +171,8 @@ pixbuf_rc_style_finalize (GObject *object)
} }
static guint static guint
theme_parse_file(GScanner *scanner, theme_parse_file(GtkSettings *settings,
GScanner *scanner,
ThemePixbuf **theme_pb) ThemePixbuf **theme_pb)
{ {
guint token; guint token;
@ -190,7 +192,7 @@ theme_parse_file(GScanner *scanner,
if (!*theme_pb) if (!*theme_pb)
*theme_pb = theme_pixbuf_new (); *theme_pb = theme_pixbuf_new ();
pixmap = gtk_rc_find_pixmap_in_path(scanner, scanner->value.v_string); pixmap = gtk_rc_find_pixmap_in_path(settings, scanner, scanner->value.v_string);
if (pixmap) if (pixmap)
{ {
theme_pixbuf_set_filename (*theme_pb, pixmap); theme_pixbuf_set_filename (*theme_pb, pixmap);
@ -547,7 +549,8 @@ theme_image_unref (ThemeImage *data)
} }
static guint static guint
theme_parse_image(GScanner *scanner, theme_parse_image(GtkSettings *settings,
GScanner *scanner,
PixbufRcStyle *pixbuf_style, PixbufRcStyle *pixbuf_style,
ThemeImage **data_return) ThemeImage **data_return)
{ {
@ -609,7 +612,7 @@ theme_parse_image(GScanner *scanner,
token = theme_parse_orientation(scanner, data); token = theme_parse_orientation(scanner, data);
break; break;
case TOKEN_FILE: case TOKEN_FILE:
token = theme_parse_file(scanner, &data->background); token = theme_parse_file(settings, scanner, &data->background);
break; break;
case TOKEN_BORDER: case TOKEN_BORDER:
token = theme_parse_border(scanner, &data->background); token = theme_parse_border(scanner, &data->background);
@ -618,25 +621,25 @@ theme_parse_image(GScanner *scanner,
token = theme_parse_stretch(scanner, &data->background); token = theme_parse_stretch(scanner, &data->background);
break; break;
case TOKEN_GAP_FILE: case TOKEN_GAP_FILE:
token = theme_parse_file(scanner, &data->gap); token = theme_parse_file(settings, scanner, &data->gap);
break; break;
case TOKEN_GAP_BORDER: case TOKEN_GAP_BORDER:
token = theme_parse_border(scanner, &data->gap); token = theme_parse_border(scanner, &data->gap);
break; break;
case TOKEN_GAP_START_FILE: case TOKEN_GAP_START_FILE:
token = theme_parse_file(scanner, &data->gap_start); token = theme_parse_file(settings, scanner, &data->gap_start);
break; break;
case TOKEN_GAP_START_BORDER: case TOKEN_GAP_START_BORDER:
token = theme_parse_border(scanner, &data->gap_start); token = theme_parse_border(scanner, &data->gap_start);
break; break;
case TOKEN_GAP_END_FILE: case TOKEN_GAP_END_FILE:
token = theme_parse_file(scanner, &data->gap_end); token = theme_parse_file(settings, scanner, &data->gap_end);
break; break;
case TOKEN_GAP_END_BORDER: case TOKEN_GAP_END_BORDER:
token = theme_parse_border(scanner, &data->gap_end); token = theme_parse_border(scanner, &data->gap_end);
break; break;
case TOKEN_OVERLAY_FILE: case TOKEN_OVERLAY_FILE:
token = theme_parse_file(scanner, &data->overlay); token = theme_parse_file(settings, scanner, &data->overlay);
break; break;
case TOKEN_OVERLAY_BORDER: case TOKEN_OVERLAY_BORDER:
token = theme_parse_border(scanner, &data->overlay); token = theme_parse_border(scanner, &data->overlay);
@ -676,6 +679,7 @@ theme_parse_image(GScanner *scanner,
static guint static guint
pixbuf_rc_style_parse (GtkRcStyle *rc_style, pixbuf_rc_style_parse (GtkRcStyle *rc_style,
GtkSettings *settings,
GScanner *scanner) GScanner *scanner)
{ {
@ -721,7 +725,7 @@ pixbuf_rc_style_parse (GtkRcStyle *rc_style,
{ {
case TOKEN_IMAGE: case TOKEN_IMAGE:
img = NULL; img = NULL;
token = theme_parse_image(scanner, pixbuf_style, &img); token = theme_parse_image(settings, scanner, pixbuf_style, &img);
break; break;
default: default:
g_scanner_get_next_token(scanner); g_scanner_get_next_token(scanner);