From 5ccbf7c7345fd68b128ab13b5a74663345785727 Mon Sep 17 00:00:00 2001
From: BST 2000 Andy Thomas <alt@gimp.org>
Date: Wed, 20 Sep 2000 21:52:39 +0000
Subject: [PATCH] plug-ins/gfig/gfig.c

Wed Sep 20 22:40:25 BST 2000 Andy Thomas <alt@gimp.org>

	* plug-ins/gfig/gfig.c

	Fixed problems since the interface to gimp-drawable-fill() has
	changed. Also fixed some GTK warnings when GFig objects were
	loaded.
---
 ChangeLog            |  8 ++++++++
 plug-ins/gfig/gfig.c | 16 ++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6acec3d956..7a11ff9784 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Sep 20 22:40:25 BST 2000 Andy Thomas <alt@gimp.org>
+
+	* plug-ins/gfig/gfig.c
+	
+	Fixed problems since the interface to gimp-drawable-fill() has 
+	changed. Also fixed some GTK warnings when GFig objects were
+	loaded.
+
 2000-09-20  Kevin Turner  <acapnotic@users.sourceforge.net>
 
 	* plug-ins/pygimp/plug-ins/pdbbrowse.py (pars): Oops.  When we did
diff --git a/plug-ins/gfig/gfig.c b/plug-ins/gfig/gfig.c
index 82555d071d..87363b5756 100644
--- a/plug-ins/gfig/gfig.c
+++ b/plug-ins/gfig/gfig.c
@@ -260,8 +260,8 @@ typedef enum
 
 typedef enum
 {
-  SINGLE_LAYER = 0,
-  ORIGINAL_LAYER,
+  ORIGINAL_LAYER = 0,
+  SINGLE_LAYER,
   MULTI_LAYER
 } DrawonLayers;
 
@@ -269,6 +269,7 @@ typedef enum
 {
   LAYER_TRANS_BG = 0,
   LAYER_BG_BG,
+  LAYER_FG_BG,
   LAYER_WHITE_BG,
   LAYER_COPY_BG
 } LayersBGType;
@@ -2764,6 +2765,7 @@ paint_page (void)
 			   _("Multiple"), (gpointer) MULTI_LAYER, NULL,
 
 			   NULL);
+
   gimp_help_set_help_data (page_menu_layers,
 			_("Draw all objects on one layer (original or new) "
 			  "or one object per layer"), NULL);
@@ -2821,6 +2823,7 @@ paint_page (void)
 
 			   _("Transparent"), (gpointer) LAYER_TRANS_BG, NULL,
 			   _("Background"),  (gpointer) LAYER_BG_BG, NULL,
+			   _("Foreground"),  (gpointer) LAYER_FG_BG, NULL,
 			   _("White"),       (gpointer) LAYER_WHITE_BG, NULL,
 			   _("Copy"),        (gpointer) LAYER_COPY_BG, NULL,
 
@@ -3276,6 +3279,8 @@ options_page (void)
 			     _("Grid Type:"), 1.0, 0.5,
 			     menu, 1, TRUE);
 
+  gfig_opt_widget.gridtypemenu = menu;
+
   menu =
     gimp_option_menu_new2 (FALSE, gridtype_menu_callback,
 			   (gpointer) GRID_RENDER_MENU, 0,
@@ -4629,13 +4634,16 @@ paint_layer_new (gchar *new_name)
   switch (selvals.onlayerbg)
     {
     case LAYER_TRANS_BG:
-      fill_type = 2;
+      fill_type = 3;
       break;
     case LAYER_BG_BG:
+      fill_type = 1;
+      break;
+    case LAYER_FG_BG:
       fill_type = 0;
       break;
     case LAYER_WHITE_BG:
-      fill_type = 1;
+      fill_type = 2;
       break;
     case LAYER_COPY_BG:
     default: