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

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 :-)

3 files changed, 27 insertions, 11 deletions

diff --git a/modules/engines/pixbuf/ChangeLog b/modules/engines/pixbuf/ChangeLog
index 6b7737ba20..989b4a129b 100644
--- a/modules/engines/pixbuf/ChangeLog
+++ b/modules/engines/pixbuf/ChangeLog
@@ -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>
 
         * pixbuf.h: Fix trailing comma on enumeration. (#54071)
diff --git a/modules/engines/pixbuf/pixbuf-draw.c b/modules/engines/pixbuf/pixbuf-draw.c
index 1ffe35c942..b6642f9f22 100644
--- a/modules/engines/pixbuf/pixbuf-draw.c
+++ b/modules/engines/pixbuf/pixbuf-draw.c
@@ -634,7 +634,7 @@ draw_string (GtkStyle * style,
 	  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)
 	{
@@ -645,7 +645,7 @@ draw_string (GtkStyle * style,
   else
     {
       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);
     }
 }
diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c
index b4c12d3f59..6fbb92fb15 100644
--- a/modules/engines/pixbuf/pixbuf-rc-style.c
+++ b/modules/engines/pixbuf/pixbuf-rc-style.c
@@ -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_finalize     (GObject            *object);
 static guint     pixbuf_rc_style_parse        (GtkRcStyle         *rc_style,
+					       GtkSettings  *settings,
 					       GScanner           *scanner);
 static void      pixbuf_rc_style_merge        (GtkRcStyle         *dest,
 					       GtkRcStyle         *src);
@@ -170,7 +171,8 @@ pixbuf_rc_style_finalize (GObject *object)
 }
 
 static guint
-theme_parse_file(GScanner     *scanner,
+theme_parse_file(GtkSettings  *settings,
+		 GScanner     *scanner,
 		 ThemePixbuf **theme_pb)
 {
   guint token;
@@ -190,7 +192,7 @@ theme_parse_file(GScanner     *scanner,
   if (!*theme_pb)
     *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)
     {
       theme_pixbuf_set_filename (*theme_pb, pixmap);
@@ -547,7 +549,8 @@ theme_image_unref (ThemeImage *data)
 }
 
 static guint
-theme_parse_image(GScanner      *scanner,
+theme_parse_image(GtkSettings  *settings,
+		  GScanner      *scanner,
 		  PixbufRcStyle *pixbuf_style,
 		  ThemeImage   **data_return)
 {
@@ -609,7 +612,7 @@ theme_parse_image(GScanner      *scanner,
 	  token = theme_parse_orientation(scanner, data);
 	  break;
 	case TOKEN_FILE:
-	  token = theme_parse_file(scanner, &data->background);
+	  token = theme_parse_file(settings, scanner, &data->background);
 	  break;
 	case TOKEN_BORDER:
 	  token = theme_parse_border(scanner, &data->background);
@@ -618,25 +621,25 @@ theme_parse_image(GScanner      *scanner,
 	  token = theme_parse_stretch(scanner, &data->background);
 	  break;
 	case TOKEN_GAP_FILE:
-	  token = theme_parse_file(scanner, &data->gap);
+	  token = theme_parse_file(settings, scanner, &data->gap);
 	  break;
 	case TOKEN_GAP_BORDER:
 	  token = theme_parse_border(scanner, &data->gap);
 	  break;
 	case TOKEN_GAP_START_FILE:
-	  token = theme_parse_file(scanner, &data->gap_start);
+	  token = theme_parse_file(settings, scanner, &data->gap_start);
 	  break;
 	case TOKEN_GAP_START_BORDER:
 	  token = theme_parse_border(scanner, &data->gap_start);
 	  break;
 	case TOKEN_GAP_END_FILE:
-	  token = theme_parse_file(scanner, &data->gap_end);
+	  token = theme_parse_file(settings, scanner, &data->gap_end);
 	  break;
 	case TOKEN_GAP_END_BORDER:
 	  token = theme_parse_border(scanner, &data->gap_end);
 	  break;
 	case TOKEN_OVERLAY_FILE:
-	  token = theme_parse_file(scanner, &data->overlay);
+	  token = theme_parse_file(settings, scanner, &data->overlay);
 	  break;
 	case TOKEN_OVERLAY_BORDER:
 	  token = theme_parse_border(scanner, &data->overlay);
@@ -676,6 +679,7 @@ theme_parse_image(GScanner      *scanner,
 
 static guint
 pixbuf_rc_style_parse (GtkRcStyle *rc_style,
+		       GtkSettings  *settings,
 		       GScanner   *scanner)
 		     
 {
@@ -721,7 +725,7 @@ pixbuf_rc_style_parse (GtkRcStyle *rc_style,
 	{
 	case TOKEN_IMAGE:
 	  img = NULL;
-	  token = theme_parse_image(scanner, pixbuf_style, &img);
+	  token = theme_parse_image(settings, scanner, pixbuf_style, &img);
 	  break;
 	default:
 	  g_scanner_get_next_token(scanner);